Note: Due to technical difficulties, the Archives are currently not up to date.
GMANE provides an alternative service for most mailing lists. c.f. bug 424647
| Navigation: |
|
Lists:
gentoo-commits:
< Prev
By Thread
Next >
< Prev
By Date
Next >
|
| Headers: |
|
To:
|
gentoo-commits@g.o
|
|
From:
|
"Julian Ospald (hasufell)" <hasufell@g.o>
|
|
Subject:
|
gentoo-x86 commit in games-fps/urbanterror/files: urbanterror-4.1.1-minizip.patch urbanterror-4.1.1-build.patch
|
|
Date:
|
Thu, 24 May 2012 23:37:47 +0000 (UTC)
|
|
hasufell 12/05/24 23:37:47
Added: urbanterror-4.1.1-minizip.patch
urbanterror-4.1.1-build.patch
Log:
initial import wrt #203296 thanks to Mr_Bones_
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Revision Changes Path
1.1 games-fps/urbanterror/files/urbanterror-4.1.1-minizip.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.1.1-minizip.patch?rev=1.1&view=markup
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
Index: urbanterror-4.1.1-minizip.patch
===================================================================
--- code/qcommon/files.c
+++ code/qcommon/files.c
@@ -31,7 +31,7 @@
#include "q_shared.h"
#include "qcommon.h"
-#include "unzip.h"
+#include <minizip/unzip.h>
extern cvar_t *com_quiet;
--- Makefile
+++ Makefile
@@ -1001,7 +1001,7 @@
else
LIBS += -lz
endif
-
+LIBS += -lz -lminizip
ifdef DEFAULT_BASEDIR
BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\"
endif
@@ -1498,8 +1498,6 @@
$(B)/client/q_math.o \
$(B)/client/q_shared.o \
\
- $(B)/client/unzip.o \
- $(B)/client/ioapi.o \
$(B)/client/puff.o \
$(B)/client/vm.o \
$(B)/client/vm_interpreted.o \
@@ -1790,8 +1778,6 @@
$(B)/ded/q_math.o \
$(B)/ded/q_shared.o \
\
- $(B)/ded/unzip.o \
- $(B)/ded/ioapi.o \
$(B)/ded/vm.o \
$(B)/ded/vm_interpreted.o \
\
1.1 games-fps/urbanterror/files/urbanterror-4.1.1-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.1.1-build.patch?rev=1.1&view=markup
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
Index: urbanterror-4.1.1-build.patch
===================================================================
applied on top of ioq3-1807-urt-251210-git-nobumpy.patch
--- Makefile
+++ Makefile
@@ -242,7 +242,7 @@
CURL_LIBS=$(shell pkg-config --silence-errors --libs libcurl)
OPENAL_CFLAGS=$(shell pkg-config --silence-errors --cflags openal)
OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
- SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
+ SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags freetype2 sdl|sed 's/-Dmain=SDL_main//')
SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl)
endif
# Use sdl-config if all else fails
@@ -305,9 +305,9 @@
endif
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
- -pipe -DUSE_ICON
+ -DUSE_ICON
CLIENT_CFLAGS = $(SDL_CFLAGS)
- SERVER_CFLAGS =
+ SERVER_CFLAGS = $(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
ifeq ($(USE_OPENAL),1)
CLIENT_CFLAGS += -DUSE_OPENAL
|
|
