On Sun, Jul 26, 2026 at 07:50:26PM +0200, Rafael Sadowski wrote: > On Sun Jul 26, 2026 at 04:37:18PM +0100, Tom Murphy wrote: > > Hi, > > > > Here is an update for games/yquake2. Some changes to the port: > > > > 1. Uses CMAKE to build now > > 2. Builds vs SDL3 by default > > > > Both of these changes were done by upstream. I've tested yquake2 > > and it plays very smoothly on my 8th Gen. Intel. > > > > Thanks, > > Tom > > > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/games/yquake2/Makefile,v > > diff -u -p -r1.33 Makefile > > --- Makefile 15 Sep 2025 16:44:58 -0000 1.33 > > +++ Makefile 26 Jul 2026 15:32:55 -0000 > > @@ -1,6 +1,6 @@ > > COMMENT= Yamagi Quake II > > N= yquake2 > > -V= 8.60 > > +V= 8.70 > > PKGNAME= ${N}-${V} > > DISTNAME= quake2-${V} > > CATEGORIES= games > > @@ -17,12 +17,14 @@ COMPILER= base-clang ports-gcc > > COMPILER_LANGS= c > > > > # curl and openal are dlopen()'d > > -WANTLIB += GL SDL2 c curl execinfo m openal > > +WANTLIB += GL SDL3 c curl execinfo m openal > > + > > +MODULES = devel/cmake > > > > # Libraries loaded with dlopen(3) > > # Extra: curl.26 openal.4 > > LIB_DEPENDS= audio/openal \ > > - devel/sdl2 \ > > + devel/sdl3 \ > > net/curl > > > > MAKE_ENV+= VERBOSE=1 > > ... I don't think you need MAKE_ENV, MAKE_FLAGS and USE_GMAKE after > switching to cmake. Do you really need do-install anymore? > > > Index: distinfo > > =================================================================== > > RCS file: /cvs/ports/games/yquake2/distinfo,v > > diff -u -p -r1.15 distinfo > > --- distinfo 15 Sep 2025 16:44:58 -0000 1.15 > > +++ distinfo 26 Jul 2026 15:32:55 -0000 > > @@ -1,2 +1,2 @@ > > -SHA256 (quake2-8.60.tar.xz) = j2hHN6UqdcCgxGXsJual0P3B1JU5LqgwFa7YRWP5Pg8= > > -SIZE (quake2-8.60.tar.xz) = 2222192 > > +SHA256 (quake2-8.70.tar.xz) = N+QUPk02LXuTunqNLDapRfvK6CrvOGUSAyIAIzsXUMg= > > +SIZE (quake2-8.70.tar.xz) = 2231636 > > Hi, Having looked at the previous source code and this one. I can confirm that the CMakeLists.txt is deprecated and the port's code doesn't actually use CMake, so I went back to the original port and updated from there. I could not get the port to compile properly under SDL3, but SDL2 works. There is some mismatch between pkg-config and the linked libraries that I have not been able to figure out. The port runs just fine on SDL2. Updated diff is below. If this port does actually need SDL3, what's the next steps? Add SDL2 and SDL3 FLAVORs? Thanks, Tom Index: Makefile =================================================================== RCS file: /cvs/ports/games/yquake2/Makefile,v diff -u -p -r1.33 Makefile --- Makefile 15 Sep 2025 16:44:58 -0000 1.33 +++ Makefile 26 Aug 2026 14:25:51 -0000 @@ -1,6 +1,6 @@ COMMENT= Yamagi Quake II N= yquake2 -V= 8.60 +V= 8.70 PKGNAME= ${N}-${V} DISTNAME= quake2-${V} CATEGORIES= games @@ -28,7 +28,8 @@ LIB_DEPENDS= audio/openal \ MAKE_ENV+= VERBOSE=1 USE_GMAKE= Yes -MAKE_FLAGS = config WITH_SYSTEMWIDE=yes WITH_SYSTEMDIR=${PREFIX}/share/${N} +MAKE_FLAGS = config WITH_SDL3=no WITH_SYSTEMWIDE=yes \ + WITH_SYSTEMDIR=${PREFIX}/share/${N} do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/${N} Index: distinfo =================================================================== RCS file: /cvs/ports/games/yquake2/distinfo,v diff -u -p -r1.15 distinfo --- distinfo 15 Sep 2025 16:44:58 -0000 1.15 +++ distinfo 26 Aug 2026 14:25:51 -0000 @@ -1,2 +1,2 @@ -SHA256 (quake2-8.60.tar.xz) = j2hHN6UqdcCgxGXsJual0P3B1JU5LqgwFa7YRWP5Pg8= -SIZE (quake2-8.60.tar.xz) = 2222192 +SHA256 (quake2-8.70.tar.xz) = N+QUPk02LXuTunqNLDapRfvK6CrvOGUSAyIAIzsXUMg= +SIZE (quake2-8.70.tar.xz) = 2231636 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/yquake2/pkg/PLIST,v diff -u -p -r1.8 PLIST --- pkg/PLIST 8 Nov 2022 11:14:48 -0000 1.8 +++ pkg/PLIST 26 Aug 2026 14:25:51 -0000 @@ -4,9 +4,6 @@ bin/quake2 lib/yquake2/ share/doc/pkg-readmes/${PKGSTEM} -share/yquake2/ -share/yquake2/baseq2/ -@so share/yquake2/baseq2/game.so @mode 750 @owner _yquake2 @group _yquake2 @@ -14,6 +11,9 @@ share/yquake2/baseq2/ @mode @owner @group +share/yquake2/ +share/yquake2/baseq2/ +@so share/yquake2/baseq2/game.so @bin share/yquake2/q2ded @bin share/yquake2/quake2 @so share/yquake2/ref_gl1.so
No comments:
Post a Comment