Date: Tue, 20 Feb 2024 22:14:49 +0100 From: Daniel Engberg <daniel.engberg.lists@pyret.net> To: Piotr Kubaj <pkubaj@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: cfbb908ce243 - main - games/gemrb: fix crash and improve port Message-ID: <fb298333fa4ea553ca386ebf83de0d09@mail.infomaniak.com> In-Reply-To: <202402202056.41KKuVP7044357@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On 2024-02-20T21:56:31.000+01:00, Piotr Kubaj <pkubaj@FreeBSD.org> wrote: > The branch main has been updated by pkubaj: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=cfbb908ce243d1bd9e2aedea968e330a214b1d21 > > commit cfbb908ce243d1bd9e2aedea968e330a214b1d21 > > Author: bsdcode <bsdcode@disroot.org> > > AuthorDate: 2024-02-20 11:54:28 +0000 > > Commit: Piotr Kubaj <pkubaj@FreeBSD.org> > > CommitDate: 2024-02-20 20:56:07 +0000 > > games/gemrb: fix crash and improve port > > > > - use GCC (https://github.com/gemrb/gemrb/issues/1786) > > - add optional OpenGL and SDL2_mixer support > > - add disabled pixelscaling to screensize option > > - change GemRB.cfg into a proper conffile > > (remove from pkg-plist and annotate GemRB.cfg.sample with @sample) > > - fix and modernize pkg-message > > - use distfiles form GitHub instead of SourceForge > > - make PNG, OGG, TTF and OpenAL support optional > > - make optional demo assets also optional in the port > > - use compiler:c++11-lang > > - remove gnome and localbase uses > > - remove DOC_DIR and MAN_DIR from CMAKE_ARGS > > - set CMake options explicitly > > - use CMake options helpers for boolean options > > - organize options into AUDIO, RESOURCE and VIDEO groups > > > > git rm games/gemrb/files/patch-gemrb_plugins_TTFImporter_CMakeLists.txt > > git add games/gemrb/files/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt > > --- > > games/gemrb/Makefile | 91 +++++++++++++++++----- > > games/gemrb/distinfo | 8 +- > > ...patch-gemrb_plugins_TTFImporter_CMakeLists.txt} | 0 > > games/gemrb/files/pkg-message.in [http://pkg-message.in] | 24 ++++-- > > games/gemrb/pkg-plist | 16 ++-- > > 5 files changed, 100 insertions(+), 39 deletions(-) > > diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile > > index 14d06b5e9359..e78c7b2ec233 100644 > > --- a/games/gemrb/Makefile > > +++ b/games/gemrb/Makefile > > @@ -1,8 +1,8 @@ > > -PORTNAME= gemrb > > -PORTVERSION= 0.9.2 > > -CATEGORIES= games emulators > > -MASTER_SITES= SF/${PORTNAME}/Releases/${PORTVERSION} > > -DISTNAME= ${PORTNAME}-${PORTVERSION}-sources > > +PORTNAME= gemrb > > +DISTVERSIONPREFIX= v > > +DISTVERSION= 0.9.2 > > +PORTREVISION= 1 > > +CATEGORIES= games emulators > > > > MAINTAINER= pkubaj@FreeBSD.org > > COMMENT= GemRB (Game engine made with preRendered Background) > > @@ -11,27 +11,76 @@ WWW= https://www.gemrb.org/ > > LICENSE= GPLv2+ > > LICENSE_FILE= ${WRKSRC}/COPYING > > > > -LIB_DEPENDS= libpng.so:graphics/png [http://libpng.so:graphics/png] \ > > - libvorbis.so:audio/libvorbis [http://libvorbis.so:audio/libvorbis] \ > > - libfreetype.so:print/freetype2 [http://libfreetype.so:print/freetype2] > > - > > -USES= cmake compiler:c11 gnome iconv localbase openal:al,alut \ > > - python sdl shebangfix > > +USES= cmake compiler:c++11-lang iconv python sdl shebangfix > > SHEBANG_FILES= admin/extend2da.py [http://extend2da.py] > > -USE_SDL= sdl2 > > +USE_GCC= yes # https://github.com/gemrb/gemrb/issues/1786 > > +USE_GITHUB= yes > > USE_LDCONFIG= yes > > +USE_SDL= sdl2 > > + > > +CMAKE_ARGS= -DCMAKE_BUILD_TYPE=Release \ > > + -DHAVE_LDEXPF=1 \ > > + -DLAYOUT=fhs \ > > + -DPYTHON_VERSION=Auto \ > > + -DSANITIZE=None \ > > + -DSDL_BACKEND=SDL2 > > +CMAKE_OFF= DISABLE_WERROR \ > > + INSOURCEBUILD \ > > + STATIC_LINK \ > > + USE_LIBVLC \ > > + USE_SDL_CONTROLLER_API > > + > > +SUB_FILES= pkg-message > > + > > +OPTIONS_DEFINE= DOCS > > +OPTIONS_DEFAULT= DEMO FREETYPE OPENAL OPENGL PNG SDLMIXER VORBIS > > + > > +OPTIONS_GROUP= AUDIO RESOURCE VIDEO > > +OPTIONS_GROUP_AUDIO= OPENAL SDLMIXER > > +OPTIONS_GROUP_RESOURCE= DEMO FREETYPE PNG VORBIS > > +OPTIONS_GROUP_VIDEO= OPENGL RESIND > > + > > +OPTIONS_SUB= yes > > > > -OPTIONS_DEFINE= DOCS > > -OPTIONS_SUB= yes > > +DEMO_DESC= Optional demo assets > > +DEMO_GH_ACCOUNT= gemrb:demo > > +DEMO_GH_PROJECT= gemrb-assets:demo > > +DEMO_GH_TAGNAME= 5b5dcde:demo > > > > -CMAKE_ARGS= -DDOC_DIR="${DOCSDIR}" \ > > - -DMAN_DIR="${PREFIX}/share/man/man6/" \ > > - -DSDL_BACKEND=SDL2 \ > > - -DUSE_OPENAL=ON \ > > - -DUSE_LIBVLC=OFF \ > > - -DHAVE_LDEXPF=1 > > +FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 [http://libfreetype.so:print/freetype2] > > +FREETYPE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt > > +FREETYPE_CMAKE_BOOL= USE_FREETYPE > > + > > +OPENAL_USES= openal:al,alut > > +OPENAL_CMAKE_BOOL= USE_OPENAL > > + > > +OPENGL_USES= gl > > +OPENGL_USE= gl=egl > > +OPENGL_CMAKE_ON= -DOPENGL_BACKEND=OpenGL > > +OPENGL_CMAKE_OFF= -DOPENGL_BACKEND=None > > + > > +PNG_LIB_DEPENDS= libpng.so:graphics/png [http://libpng.so:graphics/png] > > +PNG_CMAKE_BOOL= USE_PNG > > + > > +RESIND_DESC= Scale to screensize with pixelscaling > > +RESIND_CMAKE_BOOL= SDL_RESOLUTION_INDEPENDANCE > > + > > +SDLMIXER_DESC= Audio support via SDL_mixer > > +SDLMIXER_USE= sdl=mixer2 > > +SDLMIXER_CMAKE_BOOL= USE_SDLMIXER > > + > > +VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis [http://libvorbis.so:audio/libvorbis] > > +VORBIS_CMAKE_BOOL= USE_VORBIS > > > > PLIST_SUB= PORTVERSION=${PORTVERSION} > > -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} > > + > > +post-extract-DEMO-on: > > + ${MKDIR} ${WRKSRC}/demo/music/mx0100 > > + ${INSTALL_DATA} ${WRKSRC_demo}/demo/audio/whispers-seamless.ogg ${WRKSRC}/demo/music/mx0100/mx0100a.ogg > > + ${MKDIR} ${WRKSRC}/demo/music/theme > > + ${INSTALL_DATA} ${WRKSRC_demo}/demo/audio/themea.ogg ${WRKSRC}/demo/music/theme > > + > > +post-install: > > + ${RM} ${STAGEDIR}${ETCDIR}/GemRB.cfg > > > > .include <bsd.port.mk> [http://bsd.port.mk>]; > > diff --git a/games/gemrb/distinfo b/games/gemrb/distinfo > > index 0ae3e5741971..a80d2e1ab4dc 100644 > > --- a/games/gemrb/distinfo > > +++ b/games/gemrb/distinfo > > @@ -1,3 +1,5 @@ > > -TIMESTAMP = 1705483350 > > -SHA256 (gemrb-0.9.2-sources.tar.gz) = 5206d7e3fee45d21030caac92bc799b12ec011f90e59d7408c4b0eb4a8330d40 > > -SIZE (gemrb-0.9.2-sources.tar.gz) = 16123769 > > +TIMESTAMP = 1708291230 > > +SHA256 (gemrb-gemrb-v0.9.2_GH0.tar.gz) = ea614c067483606dab680ab18cd50527f56803bd46e0888e3c786eec05d3bb7d > > +SIZE (gemrb-gemrb-v0.9.2_GH0.tar.gz) = 14327547 > > +SHA256 (gemrb-gemrb-assets-5b5dcde_GH0.tar.gz) = 3e180e3ae063651bfabaab5795a946183212fd451986e3f4cac9203278283d23 > > +SIZE (gemrb-gemrb-assets-5b5dcde_GH0.tar.gz) = 11161448 > > diff --git a/games/gemrb/files/patch-gemrb_plugins_TTFImporter_CMakeLists.txt b/games/gemrb/files/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt > > similarity index 100% > > rename from games/gemrb/files/patch-gemrb_plugins_TTFImporter_CMakeLists.txt > > rename to games/gemrb/files/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt > > diff --git a/games/gemrb/files/pkg-message.in [http://pkg-message.in] b/games/gemrb/files/pkg-message.in [http://pkg-message.in] > > index c58d42d857b1..26668d0faccb 100644 > > --- a/games/gemrb/files/pkg-message.in [http://pkg-message.in] > > +++ b/games/gemrb/files/pkg-message.in [http://pkg-message.in] > > @@ -1,14 +1,24 @@ > > [ > > { type: install > > message: <<EOM > > -To use GemRB, you must copy the Chitin.key from your respective Infinity Engine > > -game CD to the GemRB directory. If you do not copy this file, GemRB will not > > -work. Additionally, %%ETCDIR%%/GemRB.cfg needs to be edited to point to the > > -Infinity Engine game installation directory. Games can be installed with > > -emulators/wine-devel, archivers/unshield, or the custom GemRB game installer: > > -http://git.njw.name/cgit/cgit.cgi/gemrb-gameinstallers/ > > +You will need one of the original Infinity Engine games or the free Baldur's Gate II > > +demo. GemRB does not support the Enhanced Edition versions of the games. GemRB comes > > +with its own short demo. > > > > -Please see http://www.gemrb.org/ for additional help and instructions. > > +GemRB needs access to game files. You have several options to provide the files: > > + - copy from a Windows system > > + - install with emulators/wine > > + - extract with archivers/unshield and archivers/cabextract > > + (https://github.com/gemrb/gemrb/wiki/Unshield:-alternative-game-install-method) > > + - use the custom GemRB games installers > > + (http://git.njw.name/cgit/cgit.cgi/gemrb-gameinstallers) > > + > > +Additionally, %%ETCDIR%%/GemRB.cfg needs to be edited to point to the Infinity > > +Engine game installation directory, i.e. the directory where you provide the game > > +files from above. If it doesn't point to a valid game directory then GemRB will > > +start its demo instead. > > + > > +Please see https://www.gemrb.org for additional help and instructions. > > EOM > > } > > ] > > diff --git a/games/gemrb/pkg-plist b/games/gemrb/pkg-plist > > index 7d6817e6b2b8..11d19f0345db 100644 > > --- a/games/gemrb/pkg-plist > > +++ b/games/gemrb/pkg-plist > > @@ -1,8 +1,7 @@ > > bin/extend2da.py [http://extend2da.py] > > bin/gemrb > > -%%ETCDIR%%/GemRB.cfg > > %%ETCDIR%%/GemRB.cfg.noinstall.sample > > -%%ETCDIR%%/GemRB.cfg.sample > > +@sample %%ETCDIR%%/GemRB.cfg.sample > > lib/gemrb/libgemrb_core.so [http://core.so] > > lib/gemrb/libgemrb_core.so [http://core.so].%%PORTVERSION%% > > lib/gemrb/plugins/2DAImporter.so [http://2DAImporter.so] > > @@ -31,20 +30,21 @@ lib/gemrb/plugins/MUSImporter.so [http://MUSImporter.so] > > lib/gemrb/plugins/MVEPlayer.so [http://MVEPlayer.so] > > lib/gemrb/plugins/NullSound.so [http://NullSound.so] > > lib/gemrb/plugins/NullSource.so [http://NullSource.so] > > -lib/gemrb/plugins/OGGReader.so [http://OGGReader.so] > > -lib/gemrb/plugins/OpenALAudio.so [http://OpenALAudio.so] > > +%%VORBIS%%lib/gemrb/plugins/OGGReader.so [http://OGGReader.so] > > +%%OPENAL%%lib/gemrb/plugins/OpenALAudio.so [http://OpenALAudio.so] > > lib/gemrb/plugins/PLTImporter.so [http://PLTImporter.so] > > -lib/gemrb/plugins/PNGImporter.so [http://PNGImporter.so] > > +%%PNG%%lib/gemrb/plugins/PNGImporter.so [http://PNGImporter.so] > > lib/gemrb/plugins/PROImporter.so [http://PROImporter.so] > > lib/gemrb/plugins/PSTOpcodes.so [http://PSTOpcodes.so] > > lib/gemrb/plugins/PVRZImporter.so [http://PVRZImporter.so] > > lib/gemrb/plugins/SAVImporter.so [http://SAVImporter.so] > > +%%SDLMIXER%%lib/gemrb/plugins/SDLAudio.so [http://SDLAudio.so] > > lib/gemrb/plugins/SDLVideo.so [http://SDLVideo.so] > > lib/gemrb/plugins/SPLImporter.so [http://SPLImporter.so] > > lib/gemrb/plugins/STOImporter.so [http://STOImporter.so] > > lib/gemrb/plugins/TISImporter.so [http://TISImporter.so] > > lib/gemrb/plugins/TLKImporter.so [http://TLKImporter.so] > > -lib/gemrb/plugins/TTFImporter.so [http://TTFImporter.so] > > +%%FREETYPE%%lib/gemrb/plugins/TTFImporter.so [http://TTFImporter.so] > > lib/gemrb/plugins/WAVReader.so [http://WAVReader.so] > > lib/gemrb/plugins/WEDImporter.so [http://WEDImporter.so] > > lib/gemrb/plugins/WMPImporter.so [http://WMPImporter.so] > > @@ -336,9 +336,9 @@ share/applications/gemrb.desktop > > %%DATADIR%%/demo/gem-demo.ini > > %%DATADIR%%/demo/keymap.ini > > %%DATADIR%%/demo/music/mx0100.mus > > -%%DATADIR%%/demo/music/mx0100/mx0100a.ogg > > +%%DEMO%%%%DATADIR%%/demo/music/mx0100/mx0100a.ogg > > %%DATADIR%%/demo/music/theme.mus > > -%%DATADIR%%/demo/music/theme/themea.ogg > > +%%DEMO%%%%DATADIR%%/demo/music/theme/themea.ogg > > %%DATADIR%%/demo/override/AMB_D18.ogg > > %%DATADIR%%/demo/override/AR0100.WED [http://AR0100.WED] > > %%DATADIR%%/demo/override/AR0100HT.BMP Hi, What's the reasoning behind moving away from a static release archive? This is opposite of how we want to fetch sources. See also the warning section in Porters Handbook: https://docs.freebsd.org/en/books/porters-handbook/book/#makefile-master_sites-github Why is CMAKE_BUILD_TYPE defined? https://cgit.freebsd.org/ports/tree/Mk/Uses/cmake.mk#n97 Best regards, Daniel [-- Attachment #2 --] <div>On 2024-02-20T21:56:31.000+01:00, Piotr Kubaj <pkubaj@FreeBSD.org> wrote:<br></div><div class="ik_mail_quote answerContentMessage"><blockquote class="ws-ng-quote"><pre style="white-space: normal;"><div>The branch main has been updated by pkubaj:<br></div><div><br></div><div>URL: <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="https://cgit.FreeBSD.org/ports/commit/?id=cfbb908ce243d1bd9e2aedea968e330a214b1d21" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=cfbb908ce243d1bd9e2aedea968e330a214b1d21</a><br></div><div><br></div><div>commit cfbb908ce243d1bd9e2aedea968e330a214b1d21<br></div><div>Author: bsdcode <<a class="defaultMailLink" href="mailto:bsdcode@disroot.org">bsdcode@disroot.org</a>><br></div><div>AuthorDate: 2024-02-20 11:54:28 +0000<br></div><div>Commit: Piotr Kubaj <<a class="defaultMailLink" href="mailto:pkubaj@FreeBSD.org">pkubaj@FreeBSD.org</a>><br></div><div>CommitDate: 2024-02-20 20:56:07 +0000<br></div><div><br></div><div> games/gemrb: fix crash and improve port<br></div><div> <br></div><div> - use GCC (<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="https://github.com/gemrb/gemrb/issues/1786" target="_blank">https://github.com/gemrb/gemrb/issues/1786</a>)<br></div><div>; - add optional OpenGL and SDL2_mixer support<br></div><div> - add disabled pixelscaling to screensize option<br></div><div> - change GemRB.cfg into a proper conffile<br></div><div> (remove from pkg-plist and annotate GemRB.cfg.sample with @sample)<br></div><div> - fix and modernize pkg-message<br></div><div> - use distfiles form GitHub instead of SourceForge<br></div><div> - make PNG, OGG, TTF and OpenAL support optional<br></div><div> - make optional demo assets also optional in the port<br></div><div> - use compiler:c++11-lang<br></div><div> - remove gnome and localbase uses<br></div><div> - remove DOC_DIR and MAN_DIR from CMAKE_ARGS<br></div><div> - set CMake options explicitly<br></div><div> - use CMake options helpers for boolean options<br></div><div> - organize options into AUDIO, RESOURCE and VIDEO groups<br></div><div> <br></div><div> git rm games/gemrb/files/patch-gemrb_plugins_TTFImporter_CMakeLists.txt<br></div><div> git add games/gemrb/files/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt<br></div><div>---<br></div><div> games/gemrb/Makefile | 91 +++++++++++++++++-----<br></div><div> games/gemrb/distinfo | 8 +-<br></div><div> ...patch-gemrb_plugins_TTFImporter_CMakeLists.txt} | 0<br></div><div> games/gemrb/files/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://pkg-message.in" target="_blank">pkg-message.in</a> | 24 ++++--<br></div><div> games/gemrb/pkg-plist | 16 ++--<br></div><div> 5 files changed, 100 insertions(+), 39 deletions(-)<br></div><div><br></div><div>diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile<br></div><div>index 14d06b5e9359..e78c7b2ec233 100644<br></div><div>--- a/games/gemrb/Makefile<br></div><div>+++ b/games/gemrb/Makefile<br></div><div>@@ -1,8 +1,8 @@<br></div><div>-PORTNAME= gemrb<br></div><div>-PORTVERSION= 0.9.2<br></div><div>-CATEGORIES= games emulators<br></div><div>-MASTER_SITES= SF/${PORTNAME}/Releases/${PORTVERSION}<br></div><div>-DISTNAME= ${PORTNAME}-${PORTVERSION}-sources<br></div><div>+PORTNAME= gemrb<br></div><div>+DISTVERSIONPREFIX= v<br></div><div>+DISTVERSION= 0.9.2<br></div><div>+PORTREVISION= 1<br></div><div>+CATEGORIES= games emulators<br></div><div> <br></div><div> MAINTAINER= <a class="defaultMailLink" href="mailto:pkubaj@FreeBSD.org">pkubaj@FreeBSD.org</a><br></div><div> COMMENT= GemRB (Game engine made with preRendered Background)<br></div><div>@@ -11,27 +11,76 @@ WWW= <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="https://www.gemrb.org/" target="_blank">https://www.gemrb.org/</a><br></div><div>; LICENSE= GPLv2+<br></div><div> LICENSE_FILE= ${WRKSRC}/COPYING<br></div><div> <br></div><div>-LIB_DEPENDS= <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://libpng.so:graphics/png" target="_blank">libpng.so:graphics/png</a> \<br></div><div>- <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://libvorbis.so:audio/libvorbis" target="_blank">libvorbis.so:audio/libvorbis</a> \<br></div><div>- <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://libfreetype.so:print/freetype2" target="_blank">libfreetype.so:print/freetype2</a><br></div><div>-<br></div><div>-USES= cmake compiler:c11 gnome iconv localbase openal:al,alut \<br></div><div>- python sdl shebangfix<br></div><div>+USES= cmake compiler:c++11-lang iconv python sdl shebangfix<br></div><div> SHEBANG_FILES= admin/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://extend2da.py" target="_blank">extend2da.py</a><br></div><div>-USE_SDL= sdl2<br></div><div>+USE_GCC= yes # <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="https://github.com/gemrb/gemrb/issues/1786" target="_blank">https://github.com/gemrb/gemrb/issues/1786</a><br></div><div>+USE_GITHUB= yes<br></div><div> USE_LDCONFIG= yes<br></div><div>+USE_SDL= sdl2<br></div><div>+<br></div><div>+CMAKE_ARGS= -DCMAKE_BUILD_TYPE=Release \<br></div><div>+ -DHAVE_LDEXPF=1 \<br></div><div>+ -DLAYOUT=fhs \<br></div><div>+ -DPYTHON_VERSION=Auto \<br></div><div>+ -DSANITIZE=None \<br></div><div>+ -DSDL_BACKEND=SDL2<br></div><div>+CMAKE_OFF= DISABLE_WERROR \<br></div><div>+ INSOURCEBUILD \<br></div><div>+ STATIC_LINK \<br></div><div>+ USE_LIBVLC \<br></div><div>+ USE_SDL_CONTROLLER_API<br></div><div>+<br></div><div>+SUB_FILES= pkg-message<br></div><div>+<br></div><div>+OPTIONS_DEFINE= DOCS<br></div><div>+OPTIONS_DEFAULT= DEMO FREETYPE OPENAL OPENGL PNG SDLMIXER VORBIS<br></div><div>+<br></div><div>+OPTIONS_GROUP= AUDIO RESOURCE VIDEO<br></div><div>+OPTIONS_GROUP_AUDIO= OPENAL SDLMIXER<br></div><div>+OPTIONS_GROUP_RESOURCE= DEMO FREETYPE PNG VORBIS<br></div><div>+OPTIONS_GROUP_VIDEO= OPENGL RESIND<br></div><div>+<br></div><div>+OPTIONS_SUB= yes<br></div><div> <br></div><div>-OPTIONS_DEFINE= DOCS<br></div><div>-OPTIONS_SUB= yes<br></div><div>+DEMO_DESC= Optional demo assets<br></div><div>+DEMO_GH_ACCOUNT= gemrb:demo<br></div><div>+DEMO_GH_PROJECT= gemrb-assets:demo<br></div><div>+DEMO_GH_TAGNAME= 5b5dcde:demo<br></div><div> <br></div><div>-CMAKE_ARGS= -DDOC_DIR="${DOCSDIR}" \<br></div><div>- -DMAN_DIR="${PREFIX}/share/man/man6/" \<br></div><div>- -DSDL_BACKEND=SDL2 \<br></div><div>- -DUSE_OPENAL=ON \<br></div><div>- -DUSE_LIBVLC=OFF \<br></div><div>- -DHAVE_LDEXPF=1<br></div><div>+FREETYPE_LIB_DEPENDS= <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://libfreetype.so:print/freetype2" target="_blank">libfreetype.so:print/freetype2</a><br></div><div>+FREETYPE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt<br></div><div>+FREETYPE_CMAKE_BOOL= USE_FREETYPE<br></div><div>+<br></div><div>+OPENAL_USES= openal:al,alut<br></div><div>+OPENAL_CMAKE_BOOL= USE_OPENAL<br></div><div>+<br></div><div>+OPENGL_USES= gl<br></div><div>+OPENGL_USE= gl=egl<br></div><div>+OPENGL_CMAKE_ON= -DOPENGL_BACKEND=OpenGL<br></div><div>+OPENGL_CMAKE_OFF= -DOPENGL_BACKEND=None<br></div><div>+<br></div><div>+PNG_LIB_DEPENDS= <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://libpng.so:graphics/png" target="_blank">libpng.so:graphics/png</a><br></div><div>+PNG_CMAKE_BOOL= USE_PNG<br></div><div>+<br></div><div>+RESIND_DESC= Scale to screensize with pixelscaling<br></div><div>+RESIND_CMAKE_BOOL= SDL_RESOLUTION_INDEPENDANCE<br></div><div>+<br></div><div>+SDLMIXER_DESC= Audio support via SDL_mixer<br></div><div>+SDLMIXER_USE= sdl=mixer2<br></div><div>+SDLMIXER_CMAKE_BOOL= USE_SDLMIXER<br></div><div>+<br></div><div>+VORBIS_LIB_DEPENDS= <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://libvorbis.so:audio/libvorbis" target="_blank">libvorbis.so:audio/libvorbis</a><br></div><div>+VORBIS_CMAKE_BOOL= USE_VORBIS<br></div><div> <br></div><div> PLIST_SUB= PORTVERSION=${PORTVERSION}<br></div><div>-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}<br></div><div>+<br></div><div>+post-extract-DEMO-on:<br></div><div>+ ${MKDIR} ${WRKSRC}/demo/music/mx0100<br></div><div>+ ${INSTALL_DATA} ${WRKSRC_demo}/demo/audio/whispers-seamless.ogg ${WRKSRC}/demo/music/mx0100/mx0100a.ogg<br></div><div>+ ${MKDIR} ${WRKSRC}/demo/music/theme<br></div><div>+ ${INSTALL_DATA} ${WRKSRC_demo}/demo/audio/themea.ogg ${WRKSRC}/demo/music/theme<br></div><div>+<br></div><div>+post-install:<br></div><div>+ ${RM} ${STAGEDIR}${ETCDIR}/GemRB.cfg<br></div><div> <br></div><div> .include <<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://bsd.port.mk>" target="_blank">bsd.port.mk></a>;<br></div><div>diff --git a/games/gemrb/distinfo b/games/gemrb/distinfo<br></div><div>index 0ae3e5741971..a80d2e1ab4dc 100644<br></div><div>--- a/games/gemrb/distinfo<br></div><div>+++ b/games/gemrb/distinfo<br></div><div>@@ -1,3 +1,5 @@<br></div><div>-TIMESTAMP = 1705483350<br></div><div>-SHA256 (gemrb-0.9.2-sources.tar.gz) = 5206d7e3fee45d21030caac92bc799b12ec011f90e59d7408c4b0eb4a8330d40<br></div><div>-SIZE (gemrb-0.9.2-sources.tar.gz) = 16123769<br></div><div>+TIMESTAMP = 1708291230<br></div><div>+SHA256 (gemrb-gemrb-v0.9.2_GH0.tar.gz) = ea614c067483606dab680ab18cd50527f56803bd46e0888e3c786eec05d3bb7d<br></div><div>+SIZE (gemrb-gemrb-v0.9.2_GH0.tar.gz) = 14327547<br></div><div>+SHA256 (gemrb-gemrb-assets-5b5dcde_GH0.tar.gz) = 3e180e3ae063651bfabaab5795a946183212fd451986e3f4cac9203278283d23<br></div><div>+SIZE (gemrb-gemrb-assets-5b5dcde_GH0.tar.gz) = 11161448<br></div><div>diff --git a/games/gemrb/files/patch-gemrb_plugins_TTFImporter_CMakeLists.txt b/games/gemrb/files/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt<br></div><div>similarity index 100%<br></div><div>rename from games/gemrb/files/patch-gemrb_plugins_TTFImporter_CMakeLists.txt<br></div><div>rename to games/gemrb/files/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt<br></div><div>diff --git a/games/gemrb/files/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://pkg-message.in" target="_blank">pkg-message.in</a> b/games/gemrb/files/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://pkg-message.in" target="_blank">pkg-message.in</a><br></div><div>index c58d42d857b1..26668d0faccb 100644<br></div><div>--- a/games/gemrb/files/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://pkg-message.in" target="_blank">pkg-message.in</a><br></div><div>+++ b/games/gemrb/files/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://pkg-message.in" target="_blank">pkg-message.in</a><br></div><div>@@ -1,14 +1,24 @@<br></div><div> [<br></div><div> { type: install<br></div><div> message: <<EOM<br></div><div>-To use GemRB, you must copy the Chitin.key from your respective Infinity Engine<br></div><div>-game CD to the GemRB directory. If you do not copy this file, GemRB will not<br></div><div>-work. Additionally, %%ETCDIR%%/GemRB.cfg needs to be edited to point to the<br></div><div>-Infinity Engine game installation directory. Games can be installed with<br></div><div>-emulators/wine-devel, archivers/unshield, or the custom GemRB game installer:<br></div><div>-<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://git.njw.name/cgit/cgit.cgi/gemrb-gameinstallers/" target="_blank">http://git.njw.name/cgit/cgit.cgi/gemrb-gameinstallers/</a><br></div><div>+You will need one of the original Infinity Engine games or the free Baldur's Gate II<br></div><div>+demo. GemRB does not support the Enhanced Edition versions of the games. GemRB comes<br></div><div>+with its own short demo.<br></div><div> <br></div><div>-Please see <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://www.gemrb.org/" target="_blank">http://www.gemrb.org/</a>; for additional help and instructions.<br></div><div>+GemRB needs access to game files. You have several options to provide the files:<br></div><div>+ - copy from a Windows system<br></div><div>+ - install with emulators/wine<br></div><div>+ - extract with archivers/unshield and archivers/cabextract<br></div><div>+ (<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="https://github.com/gemrb/gemrb/wiki/Unshield:-alternative-game-install-method" target="_blank">https://github.com/gemrb/gemrb/wiki/Unshield:-alternative-game-install-method</a>)<br></div><div>+ - use the custom GemRB games installers<br></div><div>+ (<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://git.njw.name/cgit/cgit.cgi/gemrb-gameinstallers" target="_blank">http://git.njw.name/cgit/cgit.cgi/gemrb-gameinstallers</a>)<br></div><div>+<br></div><div>+Additionally, %%ETCDIR%%/GemRB.cfg needs to be edited to point to the Infinity<br></div><div>+Engine game installation directory, i.e. the directory where you provide the game<br></div><div>+files from above. If it doesn't point to a valid game directory then GemRB will<br></div><div>+start its demo instead.<br></div><div>+<br></div><div>+Please see <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="https://www.gemrb.org" target="_blank">https://www.gemrb.org</a>; for additional help and instructions.<br></div><div> EOM<br></div><div> }<br></div><div> ]<br></div><div>diff --git a/games/gemrb/pkg-plist b/games/gemrb/pkg-plist<br></div><div>index 7d6817e6b2b8..11d19f0345db 100644<br></div><div>--- a/games/gemrb/pkg-plist<br></div><div>+++ b/games/gemrb/pkg-plist<br></div><div>@@ -1,8 +1,7 @@<br></div><div> bin/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://extend2da.py" target="_blank">extend2da.py</a><br></div><div> bin/gemrb<br></div><div>-%%ETCDIR%%/GemRB.cfg<br></div><div> %%ETCDIR%%/GemRB.cfg.noinstall.sample<br></div><div>-%%ETCDIR%%/GemRB.cfg.sample<br></div><div>+@sample %%ETCDIR%%/GemRB.cfg.sample<br></div><div> lib/gemrb/libgemrb_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://core.so" target="_blank">core.so</a><br></div><div> lib/gemrb/libgemrb_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://core.so" target="_blank">core.so</a>.%%PORTVERSION%%<br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://2DAImporter.so" target="_blank">2DAImporter.so</a><br></div><div>@@ -31,20 +30,21 @@ lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://MUSImporter.so" target="_blank">MUSImporter.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://MVEPlayer.so" target="_blank">MVEPlayer.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://NullSound.so" target="_blank">NullSound.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://NullSource.so" target="_blank">NullSource.so</a><br></div><div>-lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://OGGReader.so" target="_blank">OGGReader.so</a><br></div><div>-lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://OpenALAudio.so" target="_blank">OpenALAudio.so</a><br></div><div>+%%VORBIS%%lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://OGGReader.so" target="_blank">OGGReader.so</a><br></div><div>+%%OPENAL%%lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://OpenALAudio.so" target="_blank">OpenALAudio.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://PLTImporter.so" target="_blank">PLTImporter.so</a><br></div><div>-lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://PNGImporter.so" target="_blank">PNGImporter.so</a><br></div><div>+%%PNG%%lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://PNGImporter.so" target="_blank">PNGImporter.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://PROImporter.so" target="_blank">PROImporter.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://PSTOpcodes.so" target="_blank">PSTOpcodes.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://PVRZImporter.so" target="_blank">PVRZImporter.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://SAVImporter.so" target="_blank">SAVImporter.so</a><br></div><div>+%%SDLMIXER%%lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://SDLAudio.so" target="_blank">SDLAudio.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://SDLVideo.so" target="_blank">SDLVideo.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://SPLImporter.so" target="_blank">SPLImporter.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://STOImporter.so" target="_blank">STOImporter.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://TISImporter.so" target="_blank">TISImporter.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://TLKImporter.so" target="_blank">TLKImporter.so</a><br></div><div>-lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://TTFImporter.so" target="_blank">TTFImporter.so</a><br></div><div>+%%FREETYPE%%lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://TTFImporter.so" target="_blank">TTFImporter.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://WAVReader.so" target="_blank">WAVReader.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://WEDImporter.so" target="_blank">WEDImporter.so</a><br></div><div> lib/gemrb/plugins/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://WMPImporter.so" target="_blank">WMPImporter.so</a><br></div><div>@@ -336,9 +336,9 @@ share/applications/gemrb.desktop<br></div><div> %%DATADIR%%/demo/gem-demo.ini<br></div><div> %%DATADIR%%/demo/keymap.ini<br></div><div> %%DATADIR%%/demo/music/mx0100.mus<br></div><div>-%%DATADIR%%/demo/music/mx0100/mx0100a.ogg<br></div><div>+%%DEMO%%%%DATADIR%%/demo/music/mx0100/mx0100a.ogg<br></div><div> %%DATADIR%%/demo/music/theme.mus<br></div><div>-%%DATADIR%%/demo/music/theme/themea.ogg<br></div><div>+%%DEMO%%%%DATADIR%%/demo/music/theme/themea.ogg<br></div><div> %%DATADIR%%/demo/override/AMB_D18.ogg<br></div><div> %%DATADIR%%/demo/override/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://AR0100.WED" target="_blank">AR0100.WED</a><br></div><div> %%DATADIR%%/demo/override/AR0100HT.BMP<br></div></pre></blockquote></div><div>Hi,<br></div><div><br></div><div>What's the reasoning behind moving away from a static release archive? This is opposite of how we want to fetch sources. See also the warning section in Porters Handbook:<br></div><div><a href="https://docs.freebsd.org/en/books/porters-handbook/book/#makefile-master_sites-github" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">https://docs.freebsd.org/en/books/porters-handbook/book/#makefile-master_sites-github</a><br></div><div><br></div><div>Why is CMAKE_BUILD_TYPE defined?</div><div><a href="https://cgit.freebsd.org/ports/tree/Mk/Uses/cmake.mk#n97" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">https://cgit.freebsd.org/ports/tree/Mk/Uses/cmake.mk#n97</a><br></div><div><br></div><div>Best regards,<br></div><div>Daniel<br></div><div><br></div><div ><div><br></div></div><div><br></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?fb298333fa4ea553ca386ebf83de0d09>