From 5434f3165c9e68f9b5e04152f9b642f4f0d377a9 Mon Sep 17 00:00:00 2001 From: ologantr Date: Fri, 31 Dec 2021 20:18:34 +0100 Subject: [PATCH] sauerbraten: update to 2020.12.29 --- srcpkgs/sauerbraten/patches/flags.patch | 41 ++++++++----------------- srcpkgs/sauerbraten/template | 12 +++----- 2 files changed, 18 insertions(+), 35 deletions(-) diff --git a/srcpkgs/sauerbraten/patches/flags.patch b/srcpkgs/sauerbraten/patches/flags.patch index 6cd7c3c3ba4c..9bba072f423e 100644 --- a/srcpkgs/sauerbraten/patches/flags.patch +++ b/srcpkgs/sauerbraten/patches/flags.patch @@ -1,35 +1,20 @@ ---- a/src/Makefile 2017-01-12 21:54:08.156276696 -0600 -+++ b/src/Makefile 2017-01-12 21:56:06.889752748 -0600 -@@ -1,4 +1,4 @@ --CXXFLAGS= -O3 -fomit-frame-pointer -+CXXFLAGS= -O3 -fomit-frame-pointer $(CFLAGS) +--- a/src/Makefile 2021-12-31 19:09:40.620827928 +0100 ++++ b/src/Makefile 2021-12-31 19:11:40.736780250 +0100 +@@ -1,2 +1,2 @@ +-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 @@ - install: all - else +@@ -203,3 +203,3 @@ 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))) +@@ -209,6 +209,6 @@ 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..5251a99d10b2 100644 --- a/srcpkgs/sauerbraten/template +++ b/srcpkgs/sauerbraten/template @@ -1,20 +1,18 @@ # Template file for 'sauerbraten' pkgname=sauerbraten -version=2013.02.03 -revision=3 +version=2020.12.29 +revision=1 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 - -restricted="Very large - not worth storing on current Void infrastructure" +distfiles="${SOURCEFORGE_SITE}/sauerbraten/sauerbraten_${version//./_}_linux.tar.bz2" +checksum=cdba7c4a47cefd30d0afdd6a912199a1384319cf1619923cb7189e72e468be70 # Build is only supported on i686 and x86_64, and enet doesn't cross compile archs="i686* x86_64*"