| 1 |
hasufell 12/05/24 23:37:47 |
| 2 |
|
| 3 |
Added: urbanterror-4.1.1-minizip.patch |
| 4 |
urbanterror-4.1.1-build.patch |
| 5 |
Log: |
| 6 |
initial import wrt #203296 thanks to Mr_Bones_ |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 games-fps/urbanterror/files/urbanterror-4.1.1-minizip.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.1.1-minizip.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.1.1-minizip.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: urbanterror-4.1.1-minizip.patch |
| 17 |
=================================================================== |
| 18 |
--- code/qcommon/files.c |
| 19 |
+++ code/qcommon/files.c |
| 20 |
@@ -31,7 +31,7 @@ |
| 21 |
|
| 22 |
#include "q_shared.h" |
| 23 |
#include "qcommon.h" |
| 24 |
-#include "unzip.h" |
| 25 |
+#include <minizip/unzip.h> |
| 26 |
|
| 27 |
extern cvar_t *com_quiet; |
| 28 |
|
| 29 |
--- Makefile |
| 30 |
+++ Makefile |
| 31 |
@@ -1001,7 +1001,7 @@ |
| 32 |
else |
| 33 |
LIBS += -lz |
| 34 |
endif |
| 35 |
- |
| 36 |
+LIBS += -lz -lminizip |
| 37 |
ifdef DEFAULT_BASEDIR |
| 38 |
BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\" |
| 39 |
endif |
| 40 |
@@ -1498,8 +1498,6 @@ |
| 41 |
$(B)/client/q_math.o \ |
| 42 |
$(B)/client/q_shared.o \ |
| 43 |
\ |
| 44 |
- $(B)/client/unzip.o \ |
| 45 |
- $(B)/client/ioapi.o \ |
| 46 |
$(B)/client/puff.o \ |
| 47 |
$(B)/client/vm.o \ |
| 48 |
$(B)/client/vm_interpreted.o \ |
| 49 |
@@ -1790,8 +1778,6 @@ |
| 50 |
$(B)/ded/q_math.o \ |
| 51 |
$(B)/ded/q_shared.o \ |
| 52 |
\ |
| 53 |
- $(B)/ded/unzip.o \ |
| 54 |
- $(B)/ded/ioapi.o \ |
| 55 |
$(B)/ded/vm.o \ |
| 56 |
$(B)/ded/vm_interpreted.o \ |
| 57 |
\ |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
1.1 games-fps/urbanterror/files/urbanterror-4.1.1-build.patch |
| 62 |
|
| 63 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.1.1-build.patch?rev=1.1&view=markup |
| 64 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.1.1-build.patch?rev=1.1&content-type=text/plain |
| 65 |
|
| 66 |
Index: urbanterror-4.1.1-build.patch |
| 67 |
=================================================================== |
| 68 |
applied on top of ioq3-1807-urt-251210-git-nobumpy.patch |
| 69 |
|
| 70 |
--- Makefile |
| 71 |
+++ Makefile |
| 72 |
@@ -242,7 +242,7 @@ |
| 73 |
CURL_LIBS=$(shell pkg-config --silence-errors --libs libcurl) |
| 74 |
OPENAL_CFLAGS=$(shell pkg-config --silence-errors --cflags openal) |
| 75 |
OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal) |
| 76 |
- SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//') |
| 77 |
+ SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags freetype2 sdl|sed 's/-Dmain=SDL_main//') |
| 78 |
SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl) |
| 79 |
endif |
| 80 |
# Use sdl-config if all else fails |
| 81 |
@@ -305,9 +305,9 @@ |
| 82 |
endif |
| 83 |
|
| 84 |
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ |
| 85 |
- -pipe -DUSE_ICON |
| 86 |
+ -DUSE_ICON |
| 87 |
CLIENT_CFLAGS = $(SDL_CFLAGS) |
| 88 |
- SERVER_CFLAGS = |
| 89 |
+ SERVER_CFLAGS = $(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//') |
| 90 |
|
| 91 |
ifeq ($(USE_OPENAL),1) |
| 92 |
CLIENT_CFLAGS += -DUSE_OPENAL |
Archives