From ccc129f49363ef924c18ecfe45835d93a47d06c1 Mon Sep 17 00:00:00 2001 From: ologantr Date: Sat, 15 May 2021 11:36:12 +0200 Subject: [PATCH] sauerbraten: update to 2020.12.27. --- srcpkgs/sauerbraten/patches/flags.patch | 35 ++++++++++--------------- srcpkgs/sauerbraten/template | 8 +++--- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/srcpkgs/sauerbraten/patches/flags.patch b/srcpkgs/sauerbraten/patches/flags.patch index be7bb4bd2957..319b348e8fba 100644 --- a/srcpkgs/sauerbraten/patches/flags.patch +++ b/srcpkgs/sauerbraten/patches/flags.patch @@ -1,35 +1,28 @@ ---- src/Makefile.orig 2017-01-12 21:54:08.156276696 -0600 -+++ src/Makefile 2017-01-12 21:56:06.889752748 -0600 +--- src/Makefile.orig 2021-05-15 10:46:42.353776272 +0200 ++++ src/Makefile 2021-05-15 10:47:22.227774907 +0200 @@ -1,4 +1,4 @@ --CXXFLAGS= -O3 -fomit-frame-pointer -+CXXFLAGS= -O3 -fomit-frame-pointer $(CFLAGS) +-CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math ++CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math $(CFLAGS) override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti - PLATFORM= $(shell uname -s) -@@ -137,7 +137,7 @@ - - enet/Makefile: - cd enet; ./configure --enable-shared=no --enable-static=yes -- -+ - libenet: enet/Makefile - $(MAKE) -C enet/ all - -@@ -177,13 +177,13 @@ + PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]') +@@ -201,16 +201,16 @@ install: all else client: libenet $(CLIENT_OBJS) - $(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) + $(CXX) $(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) $(CXXFLAGS) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) -+ +- $(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) + master: libenet $(MASTER_OBJS) -- $(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) +- $(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) shared/cube2font.o: shared/cube2font.c $(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags` diff --git a/srcpkgs/sauerbraten/template b/srcpkgs/sauerbraten/template index 587cc3da5903..790d9e221fb7 100644 --- a/srcpkgs/sauerbraten/template +++ b/srcpkgs/sauerbraten/template @@ -1,18 +1,18 @@ # Template file for 'sauerbraten' pkgname=sauerbraten -version=2013.02.03 +version=2020.12.27 revision=3 wrksrc=$pkgname build_wrksrc=src build_style=gnu-makefile -makedepends="SDL_image-devel SDL_mixer-devel zlib-devel" +makedepends="SDL2_image-devel SDL2_mixer-devel zlib-devel" depends="${pkgname}-data-${version}_${revision}" short_desc="3D game engine (more powerful redesign of the Cube engine) and FPS game" maintainer="Michael Aldridge " license="Zlib" homepage="http://sauerbraten.org" -distfiles="${SOURCEFORGE_SITE}/sauerbraten/sauerbraten_${version//./_}_collect_edition_linux.tar.bz2" -checksum=45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e +distfiles="${SOURCEFORGE_SITE}/sauerbraten/sauerbraten_${version//./_}_linux.tar.bz2" +checksum=925abf198f1a4e58dfc673423708081325cc0da3f3c554882673b1ae0ff245f6 restricted="Very large - not worth storing on current Void infrastructure"