diff options
Diffstat (limited to 'games-fps/sauerbraten/files')
5 files changed, 295 insertions, 8 deletions
diff --git a/games-fps/sauerbraten/files/sauerbraten-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch new file mode 100644 index 000000000000..6d0dc3b1f082 --- /dev/null +++ b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch @@ -0,0 +1,146 @@ +From: Sam James <sam@gentoo.org> +Date: Thu, 22 Apr 2021 13:47:33 +0000 +Subject: Respect *FLAGS, don't strip symbols + +--- a/src/enet/Makefile ++++ b/src/enet/Makefile +@@ -1,4 +1,3 @@ +-CFLAGS=-O3 -fomit-frame-pointer + override CFLAGS:= $(CFLAGS) -Iinclude $(shell ./check_cflags.sh $(CC) $(CFLAGS)) + + OBJS= \ +--- a/src/rpggame/Makefile ++++ b/src/rpggame/Makefile +@@ -1,4 +1,3 @@ +-CXXFLAGS= -Os + override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti + + PLATFORM= $(shell uname -s) +@@ -7,11 +6,6 @@ PLATFORM_PREFIX= native + INCLUDES= -I../shared -I../engine -I../rpggame -I../enet/include + + STRIP= +-ifeq (,$(findstring -g,$(CXXFLAGS))) +-ifeq (,$(findstring -pg,$(CXXFLAGS))) +- STRIP=strip +-endif +-endif + + MV=mv + +@@ -118,7 +112,7 @@ clean: + $(filter-out shared/%,$(CLIENT_PCH)): $(filter shared/%,$(CLIENT_PCH)) + + %.h.gch: %.h +- $(CXX) $(CXXFLAGS) -x c++-header -o $@.tmp $< ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -x c++-header -o $@.tmp $< + $(MV) $@.tmp $@ + + $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES) +@@ -129,13 +123,13 @@ $(filter ../rpggame/%,$(CLIENT_OBJS)): $(filter ../rpggame/%,$(CLIENT_PCH)) + ifneq (,$(findstring MINGW,$(PLATFORM))) + client: $(CLIENT_OBJS) + $(WINDRES) -I ../vcpp -i ../vcpp/mingw.rc -J rc -o ../vcpp/mingw.res -O coff +- $(CXX) $(CXXFLAGS) -o ../$(WINBIN)/rpg.exe ../vcpp/mingw.res $(CLIENT_OBJS) $(CLIENT_LIBS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o ../$(WINBIN)/rpg.exe ../vcpp/mingw.res $(CLIENT_OBJS) $(CLIENT_LIBS) + ifneq (,$(STRIP)) + $(STRIP) ../../bin/rpg.exe + endif + else + client: libenet $(CLIENT_OBJS) +- $(CXX) $(CXXFLAGS) -o rpg_client $(CLIENT_OBJS) $(CLIENT_LIBS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o rpg_client $(CLIENT_OBJS) $(CLIENT_LIBS) + endif + + depend: +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,4 +1,3 @@ +-CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math + override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti + + PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]') +@@ -7,12 +6,6 @@ PLATFORM_PREFIX= native + INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include + + STRIP= +-ifeq (,$(findstring -g,$(CXXFLAGS))) +-ifeq (,$(findstring -pg,$(CXXFLAGS))) +- STRIP=strip +-endif +-endif +- + MV=mv + + ifneq (,$(findstring MINGW,$(PLATFORM))) +@@ -65,8 +58,8 @@ CLIENT_LIBS= -F../sauerbraten.app/Contents/Frameworks/ -framework SDL2 -framewor + CLIENT_LIBS+= -framework SDL2_mixer -framework CoreAudio -framework AudioToolbox + CLIENT_LIBS+= -framework AudioUnit -framework OpenGL -framework Cocoa -lz -Lenet -lenet + else +-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl2-config --cflags` +-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL ++CLIENT_INCLUDES= $(INCLUDES) `sdl2-config --cflags` ++CLIENT_LIBS= -Lenet -lenet -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL + endif + endif + ifeq ($(PLATFORM),LINUX) +@@ -173,11 +166,11 @@ clean: + $(filter-out shared/%,$(CLIENT_PCH)): $(filter shared/%,$(CLIENT_PCH)) + + %.h.gch: %.h +- $(CXX) $(CXXFLAGS) -x c++-header -o $@.tmp $< ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -x c++-header -o $@.tmp $< + $(MV) $@.tmp $@ + + %-standalone.o: %.cpp +- $(CXX) $(CXXFLAGS) -c -o $@ $< ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< + + $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES) + $(filter shared/%,$(CLIENT_OBJS)): $(filter shared/%,$(CLIENT_PCH)) +@@ -188,35 +181,35 @@ $(SERVER_MASTER_OBJS): CXXFLAGS += $(SERVER_INCLUDES) + + ifneq (,$(findstring MINGW,$(PLATFORM))) + client: $(CLIENT_OBJS) +- $(WINDRES) -I vcpp -i vcpp/mingw.rc -J rc -o vcpp/mingw.res -O coff +- $(CXX) $(CXXFLAGS) -o $(WINBIN)/sauerbraten.exe vcpp/mingw.res $(CLIENT_OBJS) $(CLIENT_LIBS) ++ $(WINDRES) -I vcpp -i vcpp/mingw.rc -J rc $(LDFLAGS) -o vcpp/mingw.res $(LDFLAGS) -o coff ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(WINBIN)/sauerbraten.exe vcpp/mingw.res $(CLIENT_OBJS) $(CLIENT_LIBS) + + server: $(SERVER_OBJS) +- $(WINDRES) -I vcpp -i vcpp/mingw.rc -J rc -o vcpp/mingw.res -O coff +- $(CXX) $(CXXFLAGS) -o $(WINBIN)/sauer_server.exe vcpp/mingw.res $(SERVER_OBJS) $(SERVER_LIBS) ++ $(WINDRES) -I vcpp -i vcpp/mingw.rc -J rc $(LDFLAGS) -o vcpp/mingw.res $(LDFLAGS) -o coff ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(WINBIN)/sauer_server.exe vcpp/mingw.res $(SERVER_OBJS) $(SERVER_LIBS) + + master: $(MASTER_OBJS) +- $(CXX) $(CXXFLAGS) -o $(WINBIN)/sauer_master.exe $(MASTER_OBJS) $(MASTER_LIBS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(WINBIN)/sauer_master.exe $(MASTER_OBJS) $(MASTER_LIBS) + + install: all + else + client: libenet $(CLIENT_OBJS) +- $(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) + ifneq (,$(findstring DARWIN,$(PLATFORM))) + install_name_tool -add_rpath @executable_path/../Frameworks sauer_client + endif + + server: libenet $(SERVER_OBJS) +- $(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) + + master: libenet $(MASTER_OBJS) +- $(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) + + shared/cube2font.o: shared/cube2font.c +- $(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags` ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c -o $@ $< `freetype-config --cflags` + + cube2font: shared/cube2font.o +- $(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz + + ifneq (,$(findstring DARWIN,$(PLATFORM))) + install: client diff --git a/games-fps/sauerbraten/files/sauerbraten-2020.12.27-unbundle-enet.patch b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-unbundle-enet.patch new file mode 100644 index 000000000000..ad7494b55385 --- /dev/null +++ b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-unbundle-enet.patch @@ -0,0 +1,113 @@ +From f269af0dc953ee79d95beabd2679e4c91992ac8d Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 22 Apr 2021 14:06:00 +0000 +Subject: [PATCH] Unbundle enet + +--- a/src/Makefile ++++ b/src/Makefile +@@ -4,7 +4,7 @@ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti + PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]') + PLATFORM_PREFIX= native + +-INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include ++INCLUDES= -Ishared -Iengine -Ifpsgame + + STRIP= + MV=mv +@@ -57,10 +57,10 @@ override CXX+= -arch x86_64 -mmacosx-version-min=$(OSXMIN) + CLIENT_INCLUDES= $(INCLUDES) -Iinclude + CLIENT_LIBS= -F../sauerbraten.app/Contents/Frameworks/ -framework SDL2 -framework SDL2_image + CLIENT_LIBS+= -framework SDL2_mixer -framework CoreAudio -framework AudioToolbox +-CLIENT_LIBS+= -framework AudioUnit -framework OpenGL -framework Cocoa -lz -Lenet -lenet ++CLIENT_LIBS+= -framework AudioUnit -framework OpenGL -framework Cocoa -lz -lenet + else +-CLIENT_INCLUDES= $(INCLUDES) `sdl2-config --cflags` +-CLIENT_LIBS= -Lenet -lenet -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL ++CLIENT_INCLUDES= $(INCLUDES) `sdl2-config --cflags` ++CLIENT_LIBS= -lenet -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL + endif + endif + ifeq ($(PLATFORM),LINUX) +@@ -135,7 +135,7 @@ SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_ + MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm + else + SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) +-SERVER_LIBS= -Lenet -lenet -lz ++SERVER_LIBS= -lenet -lz + MASTER_LIBS= $(SERVER_LIBS) + endif + SERVER_OBJS= \ +@@ -226,10 +226,6 @@ endif + endif + endif + +-enet/libenet.a: +- $(MAKE) -C enet CC='$(CC)' AR='$(AR)' +-libenet: enet/libenet.a +- + depend: + makedepend -Y -Ishared -Iengine -Ifpsgame $(CLIENT_OBJS:.o=.cpp) + makedepend -a -o.h.gch -Y -Ishared -Iengine -Ifpsgame $(CLIENT_PCH:.h.gch=.h) + +--- a/src/Makefile ++++ b/src/Makefile +@@ -193,16 +193,16 @@ master: $(MASTER_OBJS) + + install: all + else +-client: libenet $(CLIENT_OBJS) ++client: $(CLIENT_OBJS) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) + ifneq (,$(findstring DARWIN,$(PLATFORM))) + install_name_tool -add_rpath @executable_path/../Frameworks sauer_client + endif + +-server: libenet $(SERVER_OBJS) ++server: $(SERVER_OBJS) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) + +-master: libenet $(MASTER_OBJS) ++master: $(MASTER_OBJS) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) + + shared/cube2font.o: shared/cube2font.c +--- a/src/rpggame/Makefile ++++ b/src/rpggame/Makefile +@@ -3,7 +3,7 @@ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti + PLATFORM= $(shell uname -s) + PLATFORM_PREFIX= native + +-INCLUDES= -I../shared -I../engine -I../rpggame -I../enet/include ++INCLUDES= -I../shared -I../engine -I../rpggame + + STRIP= + +@@ -41,7 +41,7 @@ STD_LIBS= -static-libgcc -static-libstdc++ + CLIENT_LIBS= -mwindows $(STD_LIBS) -L../$(WINBIN) -L../$(WINLIB) -lSDL2 -lSDL2_image -lSDL2_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm + else + CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl2-config --cflags` +-CLIENT_LIBS= -L../enet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL ++CLIENT_LIBS= -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL + endif + ifeq ($(PLATFORM),Linux) + CLIENT_LIBS+= -lrt +@@ -102,10 +102,6 @@ default: all + + all: client + +-enet/libenet.a: +- $(MAKE) -C ../enet/ +-libenet: enet/libenet.a +- + clean: + -$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) rpg_client + +@@ -128,7 +124,7 @@ ifneq (,$(STRIP)) + $(STRIP) ../../bin/rpg.exe + endif + else +-client: libenet $(CLIENT_OBJS) ++client: $(CLIENT_OBJS) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o rpg_client $(CLIENT_OBJS) $(CLIENT_LIBS) + endif + diff --git a/games-fps/sauerbraten/files/sauerbraten-2020.12.27-use-pkg-config-for-freetype2.patch b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-use-pkg-config-for-freetype2.patch new file mode 100644 index 000000000000..ae4a43b43f98 --- /dev/null +++ b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-use-pkg-config-for-freetype2.patch @@ -0,0 +1,28 @@ +From: Sam James <sam@gentoo.org> +Date: Thu, 22 Apr 2021 14:33:15 +0000 +Subject: [PATCH] Use pkg-config for freetype2 + +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,5 +1,7 @@ + override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti + ++PKG_CONFIG?=pkg-config ++ + PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]') + PLATFORM_PREFIX= native + +@@ -206,10 +208,10 @@ master: libenet $(MASTER_OBJS) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) + + shared/cube2font.o: shared/cube2font.c +- $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c -o $@ $< `freetype-config --cflags` ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c -o $@ $< `${PKG_CONFIG} --cflags freetype2` + + cube2font: shared/cube2font.o +- $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `${PKG_CONFIG} --libs freetype2` -lz + + ifneq (,$(findstring DARWIN,$(PLATFORM))) + install: client +-- diff --git a/games-fps/sauerbraten/files/sauerbraten.conf b/games-fps/sauerbraten/files/sauerbraten.conf index 8d93bf62b788..f0c2896b2bea 100644 --- a/games-fps/sauerbraten/files/sauerbraten.conf +++ b/games-fps/sauerbraten/files/sauerbraten.conf @@ -1,15 +1,15 @@ # Config file for /etc/init.d/sauerbraten # Owner of Sauerbraten server processes (must be existing) -USER="%GAMES_USER_DED%" -GROUP="%GAMES_GROUP%" +USER="sauerbraten" +GROUP="sauerbraten" # Whether to run the dedicated server RUNSERVER="Yes" # Location of the dedicated server config directory -SERVERCONFIG="%SYSCONFDIR%" +SERVERCONFIG="/var/lib/sauerbraten" # Additional command line arguments to the dedicated server SERVERARGS="" @@ -19,7 +19,7 @@ SERVERARGS="" RUNMASTER="No" # Location of the master server config directory -MASTERCONFIG="%SYSCONFDIR%" +MASTERCONFIG="/var/lib/sauerbraten" # What port should the masterserver use MASTERPORT="28787" diff --git a/games-fps/sauerbraten/files/sauerbraten.init b/games-fps/sauerbraten/files/sauerbraten.init index a5a7bb32966d..14248bc88959 100644 --- a/games-fps/sauerbraten/files/sauerbraten.init +++ b/games-fps/sauerbraten/files/sauerbraten.init @@ -24,7 +24,7 @@ start_server() { start-stop-daemon \ --quiet --start --user ${USER}:${GROUP} --chdir ${SERVERCONFIG} \ - --make-pidfile --pidfile %GAMES_STATEDIR%/run/sauerbraten/server.pid \ + --make-pidfile --pidfile /var/run/sauerbraten/server.pid \ --background --exec %LIBEXECDIR%/sauer_server -- ${SERVERARGS} eend $? } @@ -45,7 +45,7 @@ start_master() { start-stop-daemon \ --quiet --start --user ${USER}:${GROUP} \ - --make-pidfile --pidfile %GAMES_STATEDIR%/run/sauerbraten/master.pid \ + --make-pidfile --pidfile /var/run/sauerbraten/master.pid \ --background --exec %LIBEXECDIR%/sauer_master -- ${MASTERARGS} eend $? } @@ -58,13 +58,13 @@ stop() { stop_server() { ebegin "Stopping Sauerbraten dedicated server" - start-stop-daemon --stop --retry 3 --pidfile %GAMES_STATEDIR%/run/sauerbraten/server.pid + start-stop-daemon --stop --retry 3 --pidfile /var/run/sauerbraten/server.pid eend $? } stop_master() { ebegin "Stopping Sauerbraten master server" - start-stop-daemon --stop --retry 3 --pidfile %GAMES_STATEDIR%/run/sauerbraten/master.pid + start-stop-daemon --stop --retry 3 --pidfile /var/run/sauerbraten/master.pid eend $? } |