Attachment 213612 Details for Bug 245770 – The new port

The new port

yquake2.shar (text/plain), 5.65 KB, created by shamaz.mazum on 2020-04-20 18:55:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: shamaz.mazum

Created: 2020-04-20 18:55:41 UTC

Size: 5.65 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	yquake2
>#	yquake2/files
>#	yquake2/files/patch-CMakeLists.txt
>#	yquake2/files/patch-src_client_vid.c
>#	yquake2/files/patch-src_common_filesystem.c
>#	yquake2/pkg-plist
>#	yquake2/pkg-descr
>#	yquake2/distinfo
>#	yquake2/Makefile
>#
>echo c - yquake2
>mkdir -p yquake2 > /dev/null 2>&1
>echo c - yquake2/files
>mkdir -p yquake2/files > /dev/null 2>&1
>echo x - yquake2/files/patch-CMakeLists.txt
>sed 's/^X//' >yquake2/files/patch-CMakeLists.txt << '1b1d490c2a24b558caa207b9775f8c8c'
>X--- CMakeLists.txt.orig
>X+++ CMakeLists.txt
>X@@ -628,3 +628,8 @@ set_target_properties(ref_soft PROPERTIES
>X 		SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}
>X 		)
>X target_link_libraries(ref_soft ${yquake2LinkerFlags} ${yquake2SDLLinkerFlags})
>X+
>X+# Install things
>X+install (TARGETS quake2 q2ded RUNTIME DESTINATION bin)
>X+install (TARGETS ref_soft ref_gl1 ref_gl3 LIBRARY DESTINATION lib/yquake2)
>X+install (TARGETS game LIBRARY DESTINATION lib/yquake2/baseq2)
>1b1d490c2a24b558caa207b9775f8c8c
>echo x - yquake2/files/patch-src_client_vid.c
>sed 's/^X//' >yquake2/files/patch-src_client_vid.c << '59eed5f8fd953abdb143193201bb4cc7'
>X--- src/client/vid/vid.c.orig
>X+++ src/client/vid/vid.c
>X@@ -348,6 +348,7 @@ VID_LoadRenderer(void)
>X 
>X 	char reflib_name[64] = {0};
>X 	char reflib_path[MAX_OSPATH] = {0};
>X+    char *next_path = NULL;
>X 
>X 	// If the refresher is already active we need
>X 	// to shut it down before loading a new one
>X@@ -356,21 +357,20 @@ VID_LoadRenderer(void)
>X 	// Log what we're doing.
>X 	Com_Printf("----- refresher initialization -----\n");
>X 
>X-	snprintf(reflib_name, sizeof(reflib_name), "ref_%s.%s", vid_renderer->string, lib_ext);
>X-	snprintf(reflib_path, sizeof(reflib_path), "%s%s", Sys_GetBinaryDir(), reflib_name);
>X-	Com_Printf("LoadLibrary(%s)\n", reflib_name);
>X+    snprintf(reflib_name, sizeof(reflib_name), "ref_%s.%s", vid_renderer->string, lib_ext);
>X+    while ((next_path = FS_GetNextRawPath (next_path)) != NULL) {
>X+        snprintf(reflib_path, sizeof(reflib_path), "%s%s", next_path, reflib_name);
>X+        Com_Printf("LoadLibrary(%s)\n", reflib_name);
>X 
>X-	// Mkay, let's load the requested renderer.
>X-	GetRefAPI = Sys_LoadLibrary(reflib_path, "GetRefAPI", &reflib_handle);
>X+        // Mkay, let's load the requested renderer.
>X+        GetRefAPI = Sys_LoadLibrary(reflib_path, "GetRefAPI", &reflib_handle);
>X 
>X-	// Okay, we couldn't load it. It's up to the
>X-	// caller to recover from this.
>X-	if (GetRefAPI == NULL)
>X-	{
>X-		Com_Printf("Loading %s as renderer lib failed!", reflib_path);
>X-
>X-		return false;
>X-	}
>X+        // Okay, we couldn't load it. It's up to the
>X+        // caller to recover from this.
>X+        if (GetRefAPI == NULL) Com_Printf("Loading %s as renderer lib failed!\n", reflib_path);
>X+        else break;
>X+    }
>X+    if (next_path == NULL) return false;
>X 
>X 	// Fill in the struct exported to the renderer.
>X 	// FIXME: Do we really need all these?
>59eed5f8fd953abdb143193201bb4cc7
>echo x - yquake2/files/patch-src_common_filesystem.c
>sed 's/^X//' >yquake2/files/patch-src_common_filesystem.c << '629adedab43f5d46c1e5c08a9c2b773d'
>X--- src/common/filesystem.c.orig
>X+++ src/common/filesystem.c
>X@@ -36,8 +36,9 @@
>X #define MAX_PAKS 100
>X 
>X #ifdef SYSTEMWIDE
>X- #ifndef SYSTEMDIR
>X-  #define SYSTEMDIR "/usr/share/games/quake2"
>X+#if !defined(SYSTEMDATADIR) || !defined(SYSTEMLIBDIR)
>X+  #define SYSTEMDATADIR "%%DATADIR%%/"
>X+  #define SYSTEMLIBDIR "%%LIBDIR%%/yquake2/"
>X  #endif
>X #endif
>X 
>X@@ -1708,7 +1709,8 @@ void FS_BuildRawPath(void) {
>X 
>X 	// Add SYSTEMDIR
>X #ifdef SYSTEMWIDE
>X-	FS_AddDirToRawPath(SYSTEMDIR, false);
>X+	FS_AddDirToRawPath(SYSTEMDATADIR, false);
>X+	FS_AddDirToRawPath(SYSTEMLIBDIR, false);
>X #endif
>X 
>X 	// The CD must be the last directory of the path,
>629adedab43f5d46c1e5c08a9c2b773d
>echo x - yquake2/pkg-plist
>sed 's/^X//' >yquake2/pkg-plist << 'ee165bcfb99fa08c61bb70e332f19f64'
>Xbin/q2ded
>Xbin/quake2
>Xlib/yquake2/baseq2/game.so
>Xlib/yquake2/ref_gl1.so
>Xlib/yquake2/ref_gl3.so
>Xlib/yquake2/ref_soft.so
>ee165bcfb99fa08c61bb70e332f19f64
>echo x - yquake2/pkg-descr
>sed 's/^X//' >yquake2/pkg-descr << 'b04ef8d7fb48df5aa646e8fa2c7a842f'
>XYamagi QuakeII is a version of quake2 with modern renderer and
>Xbugfixes based on Icculus QuakeII and working with SDL2.
>b04ef8d7fb48df5aa646e8fa2c7a842f
>echo x - yquake2/distinfo
>sed 's/^X//' >yquake2/distinfo << '5623eddc484ee8617cd574f66335cf83'
>XTIMESTAMP = 1587408411
>XSHA256 (yquake2-yquake2-7.43-8bcb8f8_GH0.tar.gz) = 16732367b82fa229140a80fc7e61fcba30a6a0b7378d80d53db0165db3b4c9b3
>XSIZE (yquake2-yquake2-7.43-8bcb8f8_GH0.tar.gz) = 2342975
>5623eddc484ee8617cd574f66335cf83
>echo x - yquake2/Makefile
>sed 's/^X//' >yquake2/Makefile << '05ead90a0f6bd7344fb8c37b21c83bf4'
>X# Created by: Vasily Postnicov <shamaz.mazum@gmail.com>
>X# $FreeBSD$
>X
>XPORTNAME=	yquake2
>XPORTVERSION=	7.43
>XCATEGORIES=	games
>XCONFLICTS_INSTALL=	quake2lnx quake2max quake2sdl
>X
>XUSE_GITHUB=	yes
>XGH_ACCOUNT=	${PORTNAME}
>XGH_PROJECT=	${PORTNAME}
>XGH_TAGNAME=	8bcb8f8
>XLIB_DEPENDS=	libcurl.so:ftp/curl
>X
>XMAINTAINER=	shamaz.mazum@gmail.com
>XCOMMENT=	Yamagi QuakeII is an improved version of Icculus Quake II
>XLICENSE=	GPLv2
>X
>XUSES=		cmake openal gl sdl
>XUSE_GL=		gl
>XUSE_SDL=	sdl2
>XCMAKE_ON=	SYSTEMWIDE_SUPPORT
>X
>XOPTIONS_SUB=		yes
>X.include <bsd.port.options.mk>
>X
>Xpost-patch: .SILENT
>X	${REINPLACE_CMD} -e 's|%%DATADIR%%|${Q2DIR}| ; \
>X		s|%%LIBDIR%%|${PREFIX}/lib|' ${WRKSRC}/src/common/filesystem.c
>X
>X.include "${.CURDIR}/../quake2-data/Makefile.include"
>X.include <bsd.port.mk>
>05ead90a0f6bd7344fb8c37b21c83bf4
>exit
>

Actions: View

Attachments on bug 245770: 213612 | 232689