| 1 |
nyhm 09/09/02 19:29:22 |
| 2 |
|
| 3 |
Added: warsow-0.5-openal.patch warsow-0.5-build.patch |
| 4 |
Log: |
| 5 |
Version bump, bug #283168 |
| 6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-fps/warsow/files/warsow-0.5-openal.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/warsow/files/warsow-0.5-openal.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/warsow/files/warsow-0.5-openal.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: warsow-0.5-openal.patch |
| 15 |
=================================================================== |
| 16 |
--- source/snd_openal/snd_main.c |
| 17 |
+++ source/snd_openal/snd_main.c |
| 18 |
@@ -231,7 +231,7 @@ |
| 19 |
#define ALDRIVER "/System/Library/Frameworks/OpenAL.framework/OpenAL" |
| 20 |
#define ALDEVICE_DEFAULT NULL |
| 21 |
#else |
| 22 |
-#define ALDRIVER "libopenal.so.0" |
| 23 |
+#define ALDRIVER "libopenal.so" |
| 24 |
#define ALDEVICE_DEFAULT NULL |
| 25 |
#endif |
| 26 |
|
| 27 |
|
| 28 |
|
| 29 |
|
| 30 |
1.1 games-fps/warsow/files/warsow-0.5-build.patch |
| 31 |
|
| 32 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/warsow/files/warsow-0.5-build.patch?rev=1.1&view=markup |
| 33 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/warsow/files/warsow-0.5-build.patch?rev=1.1&content-type=text/plain |
| 34 |
|
| 35 |
Index: warsow-0.5-build.patch |
| 36 |
=================================================================== |
| 37 |
--- libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile |
| 38 |
+++ libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile |
| 39 |
@@ -12,8 +12,8 @@ |
| 40 |
INCDIR = ../../include |
| 41 |
OBJDIR = obj |
| 42 |
|
| 43 |
-CXX = gcc |
| 44 |
-CXXFLAGS = -g -Wall -fPIC |
| 45 |
+CC ?= gcc |
| 46 |
+CFLAGS += -Wall -fPIC -fno-strict-aliasing |
| 47 |
DELETER = rm -f |
| 48 |
COPIER = cp |
| 49 |
|
| 50 |
@@ -59,13 +59,13 @@ |
| 51 |
all: $(BIN) |
| 52 |
|
| 53 |
$(BIN): $(OBJ) |
| 54 |
- ar r $(BIN) $(OBJ) |
| 55 |
- ranlib $(BIN) |
| 56 |
+ $(AR) r $(BIN) $(OBJ) |
| 57 |
+ $(RANLIB) $(BIN) |
| 58 |
@echo ------------------------------------------------------------------- |
| 59 |
@echo Done. As root, type 'make install' to install the library. |
| 60 |
|
| 61 |
$(OBJDIR)/%.o: $(SRCDIR)/%.cpp |
| 62 |
- $(CXX) $(CXXFLAGS) -o $@ -c $< |
| 63 |
+ $(CC) $(CFLAGS) -o $@ -c $< |
| 64 |
|
| 65 |
|
| 66 |
clean: |
| 67 |
--- source/Makefile |
| 68 |
+++ source/Makefile |
| 69 |
@@ -52,7 +52,7 @@ |
| 70 |
#LD=gcc |
| 71 |
else |
| 72 |
CC?=gcc |
| 73 |
-LD=gcc |
| 74 |
+LD=$(CC) |
| 75 |
|
| 76 |
# this nice line comes from the linux kernel makefile |
| 77 |
BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/) |
| 78 |
@@ -134,9 +134,9 @@ |
| 79 |
LOCALBASE?=/usr/local |
| 80 |
X11BASE?=/usr/X11R6 |
| 81 |
|
| 82 |
-CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall |
| 83 |
-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG |
| 84 |
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG |
| 85 |
+CFLAGS_COMMON=$(CFLAGS) -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -fno-strict-aliasing |
| 86 |
+CFLAGS_RELEASE=-DNDEBUG |
| 87 |
+CFLAGS_DEBUG=-D_DEBUG |
| 88 |
ifeq ($(DEBUG_BUILD),YES) |
| 89 |
CFLAGS_COMMON+=$(CFLAGS_DEBUG) |
| 90 |
else |
| 91 |
@@ -152,7 +152,7 @@ |
| 92 |
ifeq ($(OS),FreeBSD) |
| 93 |
LDFLAGS_COMMON=-L/usr/local/lib -lm -pthread |
| 94 |
else |
| 95 |
-LDFLAGS_COMMON=-L/usr/local/lib -ldl -lm -Wl -O1 --as-needed |
| 96 |
+LDFLAGS_COMMON=$(LDFLAGS) -ldl -lm |
| 97 |
endif |
| 98 |
|
| 99 |
ifeq ($(ARCH),x86_64) |
| 100 |
@@ -168,7 +168,7 @@ |
| 101 |
|
| 102 |
# openal |
| 103 |
ifeq ($(BUILD_SND_OPENAL),YES) |
| 104 |
-OPENAL_CONFIG?=openal-config |
| 105 |
+OPENAL_CONFIG?=pkg-config openal |
| 106 |
|
| 107 |
CFLAGS_OPENAL=$(shell $(OPENAL_CONFIG) --cflags) |
| 108 |
LDFLAGS_OPENAL=-lvorbisfile |
| 109 |
@@ -400,16 +400,16 @@ |
| 110 |
|
| 111 |
all: client openal qf ded cgame game ui irc angelwrap tv_server |
| 112 |
|
| 113 |
-client: $(BUILDDIRS) message-client compile-client link-client start-script-client |
| 114 |
+client: $(BUILDDIRS) message-client compile-client link-client |
| 115 |
openal: $(BUILDDIRS) message-openal compile-openal link-openal |
| 116 |
qf: $(BUILDDIRS) message-qf compile-qf link-qf |
| 117 |
-ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded |
| 118 |
+ded: $(BUILDDIRS) message-ded compile-ded link-ded |
| 119 |
cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame |
| 120 |
game: $(BUILDDIRS) message-game compile-game link-game |
| 121 |
ui: $(BUILDDIRS) message-ui compile-ui link-ui |
| 122 |
irc: $(BUILDDIRS) message-irc compile-irc link-irc |
| 123 |
angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap |
| 124 |
-tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server |
| 125 |
+tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server |
| 126 |
|
| 127 |
clean: clean-msg clean-depend clean-client clean-openal clean-qf clean-ded clean-cgame clean-game clean-ui clean-irc clean-angelwrap clean-tv_server |
Archives