Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] sauerbraten: update to 2020.12.29
@ 2021-12-31 19:21 ologantr
  2022-01-01 10:39 ` paper42
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: ologantr @ 2021-12-31 19:21 UTC (permalink / raw)
  To: ml

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

There is a new 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: 3610 bytes --]

From 6d93ead51aa8ebe69b5ca6cba3035f3c8b9d6a55 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            | 10 +++---
 2 files changed, 18 insertions(+), 33 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..1e1f15a65128 100644
--- a/srcpkgs/sauerbraten/template
+++ b/srcpkgs/sauerbraten/template
@@ -1,18 +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
+distfiles="${SOURCEFORGE_SITE}/sauerbraten/sauerbraten_${version//./_}_linux.tar.bz2"
+checksum=cdba7c4a47cefd30d0afdd6a912199a1384319cf1619923cb7189e72e468be70
 
 restricted="Very large - not worth storing on current Void infrastructure"
 

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: sauerbraten: update to 2020.12.29
  2021-12-31 19:21 [PR PATCH] sauerbraten: update to 2020.12.29 ologantr
@ 2022-01-01 10:39 ` paper42
  2022-01-01 10:39 ` paper42
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2022-01-01 10:39 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34792#issuecomment-1003539280

Comment:
Please dont close and open PRs for new updates, just force push to the old one next time.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: sauerbraten: update to 2020.12.29
  2021-12-31 19:21 [PR PATCH] sauerbraten: update to 2020.12.29 ologantr
  2022-01-01 10:39 ` paper42
@ 2022-01-01 10:39 ` paper42
  2022-01-04  8:00 ` ericonr
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2022-01-01 10:39 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34792#issuecomment-1003539280

Comment:
Please don't close and open PRs for new updates, just force push to the old one next time.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: sauerbraten: update to 2020.12.29
  2021-12-31 19:21 [PR PATCH] sauerbraten: update to 2020.12.29 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
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2022-01-04  8:00 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34792#issuecomment-1004596168

Comment:
@the-maldridge ok?

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: sauerbraten: update to 2020.12.29
  2021-12-31 19:21 [PR PATCH] sauerbraten: update to 2020.12.29 ologantr
                   ` (2 preceding siblings ...)
  2022-01-04  8:00 ` ericonr
@ 2022-01-04 16:45 ` the-maldridge
  2022-01-04 21:49 ` ologantr
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: the-maldridge @ 2022-01-04 16:45 UTC (permalink / raw)
  To: ml

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

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/34792#issuecomment-1004981744

Comment:
Looks okay to me.  I think we've also gained enough disk space we can unrestrict.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: sauerbraten: update to 2020.12.29
  2021-12-31 19:21 [PR PATCH] sauerbraten: update to 2020.12.29 ologantr
                   ` (3 preceding siblings ...)
  2022-01-04 16:45 ` the-maldridge
@ 2022-01-04 21:49 ` ologantr
  2022-01-04 23:55 ` the-maldridge
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ologantr @ 2022-01-04 21:49 UTC (permalink / raw)
  To: ml

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

New comment by ologantr on void-packages repository

https://github.com/void-linux/void-packages/pull/34792#issuecomment-1005196053

Comment:
> Looks okay to me. I think we've also gained enough disk space we can unrestrict.

If this is the case I could force push to my branch a fix to remove restriction.
Am I to amend the single commit or add another that just removes "restricted"?

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: sauerbraten: update to 2020.12.29
  2021-12-31 19:21 [PR PATCH] sauerbraten: update to 2020.12.29 ologantr
                   ` (4 preceding siblings ...)
  2022-01-04 21:49 ` ologantr
@ 2022-01-04 23:55 ` the-maldridge
  2022-01-05  0:11 ` [PR REVIEW] " paper42
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: the-maldridge @ 2022-01-04 23:55 UTC (permalink / raw)
  To: ml

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

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/34792#issuecomment-1005261668

Comment:
Just make the change and force push, no need to mention it in the commit messsage.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] sauerbraten: update to 2020.12.29
  2021-12-31 19:21 [PR PATCH] sauerbraten: update to 2020.12.29 ologantr
                   ` (5 preceding siblings ...)
  2022-01-04 23:55 ` the-maldridge
@ 2022-01-05  0:11 ` paper42
  2022-01-05  5:53 ` Johnnynator
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2022-01-05  0:11 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34792#discussion_r778467849

Comment:
I am not familiar with this package, but why are we adding -ffast-math here?

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] sauerbraten: update to 2020.12.29
  2021-12-31 19:21 [PR PATCH] sauerbraten: update to 2020.12.29 ologantr
                   ` (6 preceding siblings ...)
  2022-01-05  0:11 ` [PR REVIEW] " paper42
@ 2022-01-05  5:53 ` Johnnynator
  2022-01-05  8:53 ` [PR PATCH] [Updated] " ologantr
  2022-01-13 11:31 ` [PR PATCH] [Merged]: " Johnnynator
  9 siblings, 0 replies; 11+ messages in thread
From: Johnnynator @ 2022-01-05  5:53 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/34792#discussion_r778562411

Comment:
`fast-math` is decided by upstream, we are only appending `$(CFLAGS)`

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] sauerbraten: update to 2020.12.29
  2021-12-31 19:21 [PR PATCH] sauerbraten: update to 2020.12.29 ologantr
                   ` (7 preceding siblings ...)
  2022-01-05  5:53 ` Johnnynator
@ 2022-01-05  8:53 ` ologantr
  2022-01-13 11:31 ` [PR PATCH] [Merged]: " Johnnynator
  9 siblings, 0 replies; 11+ messages in thread
From: ologantr @ 2022-01-05  8:53 UTC (permalink / raw)
  To: ml

[-- 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*"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Merged]: sauerbraten: update to 2020.12.29
  2021-12-31 19:21 [PR PATCH] sauerbraten: update to 2020.12.29 ologantr
                   ` (8 preceding siblings ...)
  2022-01-05  8:53 ` [PR PATCH] [Updated] " ologantr
@ 2022-01-13 11:31 ` Johnnynator
  9 siblings, 0 replies; 11+ messages in thread
From: Johnnynator @ 2022-01-13 11:31 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

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

Description:
#### 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)

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-01-13 11:31 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-31 19:21 [PR PATCH] sauerbraten: update to 2020.12.29 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 ` [PR PATCH] [Updated] " ologantr
2022-01-13 11:31 ` [PR PATCH] [Merged]: " Johnnynator

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).