Github messages for voidlinux
 help / color / mirror / Atom feed
From: ologantr <ologantr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] sauerbraten: update to 2020.12.29
Date: Wed, 05 Jan 2022 09:53:57 +0100	[thread overview]
Message-ID: <20220105085357.xn9Di_LhPwlu57Tgp03dv0xfzTiMROiktGWMSFY1vG0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34792@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 510 bytes --]

There is an updated pull request by ologantr against master on the void-packages repository

https://github.com/ologantr/void-packages sauerbraten-2020.12.29
https://github.com/void-linux/void-packages/pull/34792

sauerbraten: update to 2020.12.29
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

A patch file from https://github.com/void-linux/void-packages/pull/34792.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sauerbraten-2020.12.29-34792.patch --]
[-- Type: text/x-diff, Size: 3713 bytes --]

From 5434f3165c9e68f9b5e04152f9b642f4f0d377a9 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
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 <maldridge@voidlinux.org>"
 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*"

  parent reply	other threads:[~2022-01-05  8:53 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-31 19:21 [PR PATCH] " ologantr
2022-01-01 10:39 ` paper42
2022-01-01 10:39 ` paper42
2022-01-04  8:00 ` ericonr
2022-01-04 16:45 ` the-maldridge
2022-01-04 21:49 ` ologantr
2022-01-04 23:55 ` the-maldridge
2022-01-05  0:11 ` [PR REVIEW] " paper42
2022-01-05  5:53 ` Johnnynator
2022-01-05  8:53 ` ologantr [this message]
2022-01-13 11:31 ` [PR PATCH] [Merged]: " Johnnynator

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220105085357.xn9Di_LhPwlu57Tgp03dv0xfzTiMROiktGWMSFY1vG0@z \
    --to=ologantr@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    --subject='Re: [PR PATCH] [Updated] sauerbraten: update to 2020.12.29' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).