diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-01-08 05:56:20 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-01-08 05:56:20 +0000 |
| commit | 38317014290f9e97585cf9514b78a34b904f8937 (patch) | |
| tree | 7385703a04ff29a717f689536600dd34a57ba58f /games-fps/quake2-icculus/files | |
| parent | fix md5sums in data files #37419 (diff) | |
| download | historical-38317014290f9e97585cf9514b78a34b904f8937.tar.gz historical-38317014290f9e97585cf9514b78a34b904f8937.tar.bz2 historical-38317014290f9e97585cf9514b78a34b904f8937.zip | |
fix install paths #35952
Diffstat (limited to 'games-fps/quake2-icculus/files')
| -rw-r--r-- | games-fps/quake2-icculus/files/0.15-Makefile-noopts.patch | 19 | ||||
| -rw-r--r-- | games-fps/quake2-icculus/files/0.15-gentoo-path.patch | 55 | ||||
| -rw-r--r-- | games-fps/quake2-icculus/files/digest-quake2-icculus-0.15-r1 (renamed from games-fps/quake2-icculus/files/digest-quake2-icculus-0.15) | 0 |
3 files changed, 74 insertions, 0 deletions
diff --git a/games-fps/quake2-icculus/files/0.15-Makefile-noopts.patch b/games-fps/quake2-icculus/files/0.15-Makefile-noopts.patch new file mode 100644 index 000000000000..0f4c4f3dea24 --- /dev/null +++ b/games-fps/quake2-icculus/files/0.15-Makefile-noopts.patch @@ -0,0 +1,19 @@ +--- Makefile.orig 2003-01-23 17:26:45.000000000 -0500 ++++ Makefile 2003-01-23 17:26:54.000000000 -0500 +@@ -82,12 +82,12 @@ + endif + + ifeq ($(ARCH),i386) +-RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -malign-loops=2 \ +- -malign-jumps=2 -malign-functions=2 -g ++RELEASE_CFLAGS=-ffast-math -funroll-loops $(BASE_CFLAGS) ++# -falign-jumps=2 -falign-functions=2 -g + # compiler bugs with gcc 2.96 and 3.0.1 can cause bad builds with heavy opts. + #RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -m486 -ffast-math -funroll-loops \ +-# -fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \ +-# -malign-jumps=2 -malign-functions=2 ++# -fomit-frame-pointer -fexpensive-optimizations -falign-loops=2 \ ++# -falign-jumps=2 -falign-functions=2 + endif + + VERSION=3.21+rCVS diff --git a/games-fps/quake2-icculus/files/0.15-gentoo-path.patch b/games-fps/quake2-icculus/files/0.15-gentoo-path.patch new file mode 100644 index 000000000000..7e1b8a97f9b2 --- /dev/null +++ b/games-fps/quake2-icculus/files/0.15-gentoo-path.patch @@ -0,0 +1,55 @@ +--- src/qcommon/files.c.orig 2004-01-02 01:55:47.219787792 -0500 ++++ src/qcommon/files.c 2004-01-02 01:55:55.622510384 -0500 +@@ -0,0 +1 @@ ++#include "../linux/gentoo-libdir.h" +@@ -60,6 +60,7 @@ + + char fs_gamedir[MAX_OSPATH]; + cvar_t *fs_basedir; ++cvar_t *fs_libdir; + cvar_t *fs_cddir; + cvar_t *fs_gamedirvar; + +@@ -898,7 +899,8 @@ + // basedir <path> + // allows the game to run from outside the data tree + // +- fs_basedir = Cvar_Get ("basedir", ".", CVAR_NOSET); ++ fs_basedir = Cvar_Get ("basedir", "GENTOO_DATADIR", CVAR_NOSET); ++ fs_libdir = Cvar_Get ("libdir", GENTOO_LIBDIR, CVAR_NOSET); + + // + // cddir <path> +@@ -913,6 +915,7 @@ + // add baseq2 to search path + // + FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) ); ++ FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_libdir->string) ); + + // + // then add a '.quake2/baseq2' directory in home directory by default +--- src/linux/vid_so.c.orig 2004-01-02 10:37:46.527355832 -0500 ++++ src/linux/vid_so.c 2004-01-02 10:39:23.890554376 -0500 +@@ -0,0 +1 @@ ++#include "../linux/gentoo-libdir.h" +@@ -231,13 +232,17 @@ + //regain root + seteuid(saved_euid); + +- path = Cvar_Get ("basedir", ".", CVAR_NOSET)->string; ++ path = Cvar_Get ("libdir", GENTOO_LIBDIR, CVAR_NOSET)->string; + + snprintf (fn, MAX_OSPATH, "%s/%s", path, name ); + + if (stat(fn, &st) == -1) { +- Com_Printf( "LoadLibrary(\"%s\") failed: %s\n", name, strerror(errno)); +- return false; ++ path = Cvar_Get ("basedir", ".", CVAR_NOSET)->string; ++ snprintf (fn, MAX_OSPATH, "%s/%s", path, name ); ++ if (stat(fn, &st) == -1) { ++ Com_Printf( "LoadLibrary(\"%s\") failed: %s\n", name, strerror(errno)); ++ return false; ++ } + } + + // permission checking diff --git a/games-fps/quake2-icculus/files/digest-quake2-icculus-0.15 b/games-fps/quake2-icculus/files/digest-quake2-icculus-0.15-r1 index 3f8d9c69a534..3f8d9c69a534 100644 --- a/games-fps/quake2-icculus/files/digest-quake2-icculus-0.15 +++ b/games-fps/quake2-icculus/files/digest-quake2-icculus-0.15-r1 |