diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
| commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
| tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /games-fps/yamagi-quake2/files | |
| parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'games-fps/yamagi-quake2/files')
3 files changed, 87 insertions, 0 deletions
diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch new file mode 100644 index 000000000000..d767f04d4b09 --- /dev/null +++ b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch @@ -0,0 +1,30 @@ +--- a/Makefile 2017-05-25 12:45:51.000000000 +0300 ++++ b/Makefile 2018-01-14 17:38:34.540167879 +0300 +@@ -64,11 +64,11 @@ + # + # -MMD to generate header dependencies. + ifeq ($(OSTYPE), Darwin) +-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ +- -Wall -pipe -g -fwrapv -arch i386 -arch x86_64 ++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \ ++ -Wall -fwrapv -arch i386 -arch x86_64 + else +-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ +- -Wall -pipe -g -MMD -fwrapv ++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \ ++ -Wall -MMD -fwrapv + endif + + # ---------- +@@ -80,9 +80,9 @@ + + # Base LDFLAGS. + ifeq ($(OSTYPE), Darwin) +-LDFLAGS := -shared -arch i386 -arch x86_64 ++LDFLAGS += -shared -arch i386 -arch x86_64 + else +-LDFLAGS := -shared ++LDFLAGS += -shared + endif + + # ---------- diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-respect-flags.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-respect-flags.patch new file mode 100644 index 000000000000..76ac4b60f503 --- /dev/null +++ b/games-fps/yamagi-quake2/files/yamagi-quake2-respect-flags.patch @@ -0,0 +1,40 @@ +--- a/Makefile 2017-12-08 12:22:59.000000000 +0300 ++++ b/Makefile 2018-01-14 15:42:56.804047742 +0300 +@@ -165,12 +165,12 @@ + # -MMD to generate header dependencies. (They cannot be + # generated if building universal binaries on OSX) + ifeq ($(YQ2_OSTYPE), Darwin) +-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ +- -Wall -pipe -g -fwrapv ++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \ ++ -Wall -fwrapv + CFLAGS += $(OSX_ARCH) + else +-CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing \ +- -Wall -pipe -g -ggdb -MMD -fwrapv ++CFLAGS += -std=gnu99 -fno-strict-aliasing \ ++ -Wall -MMD -fwrapv + endif + + # ---------- +@@ -263,15 +263,15 @@ + + # Base LDFLAGS. + ifeq ($(YQ2_OSTYPE),Linux) +-LDFLAGS := -L/usr/lib -lm -ldl -rdynamic ++LDFLAGS += -lm -ldl -rdynamic + else ifeq ($(YQ2_OSTYPE),FreeBSD) +-LDFLAGS := -L/usr/local/lib -lm ++LDFLAGS += -lm + else ifeq ($(YQ2_OSTYPE),OpenBSD) +-LDFLAGS := -L/usr/local/lib -lm ++LDFLAGS += -lm + else ifeq ($(YQ2_OSTYPE),Windows) +-LDFLAGS := -L/usr/lib -lws2_32 -lwinmm -static-libgcc ++LDFLAGS += -lws2_32 -lwinmm -static-libgcc + else ifeq ($(YQ2_OSTYPE), Darwin) +-LDFLAGS := $(OSX_ARCH) -lm ++LDFLAGS += $(OSX_ARCH) -lm + endif + + CFLAGS += -fvisibility=hidden diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch new file mode 100644 index 000000000000..1de79c986907 --- /dev/null +++ b/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/383179 + +Upstream removed OF macro definition: +https://github.com/yquake2/yquake2/commit/716d72a295c9247b3c88ccd180bb7a517ed99e13 + +--- a/src/common/unzip/ioapi.h 2018-03-10 20:24:21.000000000 +0300 ++++ b/src/common/unzip/ioapi.h 2018-04-10 00:34:08.688675097 +0300 +@@ -120,6 +120,9 @@ + #define ZLIB_FILEFUNC_MODE_EXISTING (4) + #define ZLIB_FILEFUNC_MODE_CREATE (8) + ++#ifdef _Z_OF ++#define OF _Z_OF ++#endif + + #ifndef ZCALLBACK + #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK) |