r6694 - in packages/trunk/warsow/debian: . patches
Andres Mejia
ceros-guest at alioth.debian.org
Mon Apr 21 03:42:01 UTC 2008
Author: ceros-guest
Date: 2008-04-21 03:42:01 +0000 (Mon, 21 Apr 2008)
New Revision: 6694
Modified:
packages/trunk/warsow/debian/changelog
packages/trunk/warsow/debian/patches/fix_different_archs.diff
packages/trunk/warsow/debian/patches/makefile_modifications.diff
Log:
Updating patches
Modified: packages/trunk/warsow/debian/changelog
===================================================================
--- packages/trunk/warsow/debian/changelog 2008-04-21 03:27:30 UTC (rev 6693)
+++ packages/trunk/warsow/debian/changelog 2008-04-21 03:42:01 UTC (rev 6694)
@@ -29,6 +29,7 @@
* Added watchfile.
* Fixed copyright to say who really debianized this package.
* Added get-orig-source in debian/rules.
+ * map_download.diff patch no longer needed.
-- Andres Mejia <mcitadel at gmail.com> Tue, 15 Jan 2008 19:37:36 -0500
Modified: packages/trunk/warsow/debian/patches/fix_different_archs.diff
===================================================================
--- packages/trunk/warsow/debian/patches/fix_different_archs.diff 2008-04-21 03:27:30 UTC (rev 6693)
+++ packages/trunk/warsow/debian/patches/fix_different_archs.diff 2008-04-21 03:42:01 UTC (rev 6694)
@@ -1,17 +1,14 @@
-Index: Fixes some problems on other architectures.
+Fixes some problems on other architectures.
===================================================================
---- ./warsow_0.32/source/game/q_shared.h.bak 2007-09-04 16:29:46.000000000 -0400
-+++ ./warsow_0.32/source/game/q_shared.h 2007-09-04 16:58:27.000000000 -0400
-@@ -170,12 +170,36 @@
- # define ARCH "x86_64"
- # define CPUSTRING "x86_64"
- # endif
--# elif defined(__powerpc__)
--# define CPUSTRING "ppc"
--# define ARCH "ppc"
- # elif defined(__alpha__)
- # define CPUSTRING "axp"
- # define ARCH "axp"
+--- ./warsow_0.42_src/source/game/q_shared.h.bak 2008-04-20 23:15:26.000000000 -0400
++++ ./warsow_0.42_src/source/game/q_shared.h 2008-04-20 23:19:25.000000000 -0400
+@@ -177,9 +177,33 @@
+ #define ARCH "x86_64"
+ #define CPUSTRING "x86_64"
+ #endif
+-#elif defined ( __powerpc__ )
+-#define CPUSTRING "ppc"
+-#define ARCH "ppc"
+# elif defined(__powerpc64__)
+# define CPUSTRING "ppc64"
+# define ARCH "ppc64"
@@ -39,15 +36,15 @@
+# elif defined(__sparc__)
+# define CPUSTRING "sparc"
+# define ARCH "sparc"
- # else
- # define CPUSTRING "Unknown"
- # define ARCH "Unknown"
-@@ -271,7 +295,7 @@
- # endif
+ #elif defined ( __alpha__ )
+ #define CPUSTRING "axp"
+ #define ARCH "axp"
+@@ -278,7 +302,7 @@
#endif
-
--#if (defined(_M_IX86) || defined(__i386__) || defined(__ia64__)) && !defined(C_ONLY)
+ #endif
+
+-#if ( defined ( _M_IX86 ) || defined ( __i386__ ) || defined ( __ia64__ ) ) && !defined ( C_ONLY )
+#if (defined(_M_IX86) || defined(__i386__)) && !defined(C_ONLY)
- # define id386
+ #define id386
#else
- # ifdef id386
+ #ifdef id386
Modified: packages/trunk/warsow/debian/patches/makefile_modifications.diff
===================================================================
--- packages/trunk/warsow/debian/patches/makefile_modifications.diff 2008-04-21 03:27:30 UTC (rev 6693)
+++ packages/trunk/warsow/debian/patches/makefile_modifications.diff 2008-04-21 03:42:01 UTC (rev 6694)
@@ -1,49 +1,50 @@
-Index: Some makefile modifications, making it more useful in building
+Some makefile modifications, making it more useful in building
Debian packages.
===================================================================
---- ./warsow_0.32/source/Makefile.bak 2008-01-16 02:23:55.000000000 -0500
-+++ ./warsow_0.32/source/Makefile 2008-01-16 02:25:39.000000000 -0500
-@@ -32,7 +32,7 @@
+--- ./warsow_0.42_src/source/Makefile.bak 2008-04-20 23:27:30.000000000 -0400
++++ ./warsow_0.42_src/source/Makefile 2008-04-20 23:37:50.000000000 -0400
+@@ -35,7 +35,7 @@
LD=i586-mingw32msvc-gcc
else
CC?=gcc
-LD=gcc
+LD?=gcc
-
+
# this nice line comes from the linux kernel makefile
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/)
-@@ -47,7 +47,7 @@
+@@ -50,7 +50,7 @@
SHARED_LIBRARY_EXTENSION=so
endif
-
+
-BUILDDIR=build$(ARCH)
+BUILDDIR=build
BINDIR=release
-
+
DEPENDFILE_CLIENT=$(BUILDDIR)/client/Makefile.d
-@@ -96,13 +96,13 @@
-
+@@ -104,13 +104,13 @@
CLIENT_EXE=warsow_$(ARCH).exe
SERVER_EXE=wsw_server_$(ARCH).exe
+ TV_SERVER_EXE=wswtv_server_$(ARCH).exe
-else # USE_MINGW
+else # when USE_MINGW=NO
LOCALBASE?=/usr/local
X11BASE?=/usr/X11R6
-
- CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -Wall
+
+ CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall
CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
+CFLAGS_DEBUG=-O0 -g -D_DEBUG
ifeq ($(DEBUG_BUILD),YES)
CFLAGS_COMMON+=$(CFLAGS_DEBUG)
else
-@@ -111,19 +111,15 @@
-
+@@ -119,20 +119,16 @@
+
CFLAGS_CLIENT=$(shell curl-config --cflags)
- CFLAGS_DED=-DDEDICATED_ONLY -DC_ONLY
+ CFLAGS_DED=-DDEDICATED_ONLY -DC_ONLY $(shell curl-config --cflags)
-CFLAGS_MODULE=-DPIC -fPIC
+CFLAGS_MODULE=-DPIC -fPIC -D_REENTRANT
-
+ CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
+
ifeq ($(OS),FreeBSD)
-LDFLAGS_COMMON=-L/usr/local/lib -lm
+LDFLAGS_COMMON=-L/usr/lib -lm
@@ -51,27 +52,29 @@
-LDFLAGS_COMMON=-L/usr/local/lib -ldl -lm
+LDFLAGS_COMMON=-L/usr/lib -ldl -lm
endif
-
+
-ifeq ($(ARCH),x86_64)
-LIB=lib64
-else
LIB=lib
-endif
-
+
LDFLAGS_CLIENT=-ljpeg -lz -L$(X11BASE)/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lXinerama $(shell curl-config --libs)
- LDFLAGS_DED=-lz
-@@ -149,8 +145,8 @@
+ LDFLAGS_DED=-lz $(shell curl-config --libs)
+@@ -159,9 +155,9 @@
LDFLAGS_QF=$(shell $(SDL_CONFIG) --libs) -lvorbisfile
endif # BUILD_SND_QF
-
+
-CLIENT_EXE=warsow.$(ARCH)
-SERVER_EXE=wsw_server.$(ARCH)
+-TV_SERVER_EXE=wswtv_server.$(ARCH)
+CLIENT_EXE=warsow_bin
+SERVER_EXE=wsw_server_bin
++TV_SERVER_EXE=wswtv_server_bin
endif # USE_MINGW
-
+
# Mac support, hacking this in at the end where it is easier than adding more if statements throughout
-@@ -182,12 +178,13 @@
+@@ -193,13 +189,15 @@
######################################################################################################
# Helper functions
######################################################################################################
@@ -81,6 +84,7 @@
-DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
-DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
-DO_CC_MODULE=$(DO_CC) $(CFLAGS_MODULE)
+-DO_CC_TV_SERVER=$(DO_CC) $(CFLAGS_TV_SERVER)
+# Need to adjust this so that all options used are displayed
+# in the build logs.
+DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@
@@ -88,11 +92,13 @@
+DO_CC_CLIENT=@echo "$(DO_CC) $(CFLAGS_CLIENT)" && $(DO_CC) $(CFLAGS_CLIENT)
+DO_CC_DED=@echo "$(DO_CC) $(CFLAGS_DED)" && $(DO_CC) $(CFLAGS_DED)
+DO_CC_MODULE=@echo "$(DO_CC) $(CFLAGS_MODULE)" && $(DO_CC) $(CFLAGS_MODULE)
-
-
++DO_CC_TV_SERVER=@echo "$(DO_CC) $(CFLAGS_TV_SERVER)" && \
++$(DO_CC) $(CFLAGS_TV_SERVER)
+
+
######################################################################################################
-@@ -439,12 +436,13 @@
-
+@@ -489,12 +487,13 @@
+
######################################################################################################
# Linking Rules
+# Need to display all options used for later viewing from build logs.
@@ -104,9 +110,9 @@
- @echo " > Linking $@" && \
+ @echo "$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)" && \
$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
-
+
#########
-@@ -452,11 +450,11 @@
+@@ -502,11 +501,11 @@
#########
ifeq ($(OS),Darwin)
$(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
@@ -119,15 +125,15 @@
+ @echo "$(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)" && \
$(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
endif
-
-@@ -464,33 +462,33 @@
+
+@@ -514,40 +513,40 @@
# OPENAL
#########
$(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL)
- @echo " > Linking $@" && \
+ @echo "$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)" && \
$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
-
+
#########
# QF
#########
@@ -135,7 +141,7 @@
- @echo " > Linking $@" && \
+ @echo "$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)" && \
$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
-
+
########
# .SO
########
@@ -143,20 +149,28 @@
- @echo " > Linking $@" && \
+ @echo "$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)" && \
$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
-
+
$(BINDIR)/basewsw/game_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_GAME)
- @echo " > Linking $@" && \
+ @echo "$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)" && \
$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
-
+
$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI)
- @echo " > Linking $@" && \
+ @echo "$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)" && \
$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
-
+
$(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC)
- @echo " > Linking $@" && \
+ @echo "$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)" && \
$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
-
+
+ ########
+ # TV
+ ########
+ $(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER)
+- @echo " > Linking $@" && \
++ @echo "$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)" && \
+ $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
+
######################################################################################################
More information about the Pkg-games-commits
mailing list