Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] sauerbraten: update to 2020.12.27.
@ 2021-05-15  9:51 ologantr
  2021-12-31 17:37 ` [PR PATCH] [Updated] " ologantr
  2021-12-31 17:41 ` [PR PATCH] [Closed]: " ologantr
  0 siblings, 2 replies; 3+ messages in thread
From: ologantr @ 2021-05-15  9:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1610 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.27
https://github.com/void-linux/void-packages/pull/30913

sauerbraten: update to 2020.12.27.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (x86_64)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From ccc129f49363ef924c18ecfe45835d93a47d06c1 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
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 <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=925abf198f1a4e58dfc673423708081325cc0da3f3c554882673b1ae0ff245f6
 
 restricted="Very large - not worth storing on current Void infrastructure"
 

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

* Re: [PR PATCH] [Updated] sauerbraten: update to 2020.12.27.
  2021-05-15  9:51 [PR PATCH] sauerbraten: update to 2020.12.27 ologantr
@ 2021-12-31 17:37 ` ologantr
  2021-12-31 17:41 ` [PR PATCH] [Closed]: " ologantr
  1 sibling, 0 replies; 3+ messages in thread
From: ologantr @ 2021-12-31 17:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1615 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.27
https://github.com/void-linux/void-packages/pull/30913

sauerbraten: update to 2020.12.27.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (x86_64)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 8f81066a378d56c89d7467c715b7d31bc243e754 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
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 6cd7c3c3ba4c..319b348e8fba 100644
--- a/srcpkgs/sauerbraten/patches/flags.patch
+++ b/srcpkgs/sauerbraten/patches/flags.patch
@@ -1,35 +1,28 @@
---- a/src/Makefile	2017-01-12 21:54:08.156276696 -0600
-+++ b/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 <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=925abf198f1a4e58dfc673423708081325cc0da3f3c554882673b1ae0ff245f6
 
 restricted="Very large - not worth storing on current Void infrastructure"
 

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

* Re: [PR PATCH] [Closed]: sauerbraten: update to 2020.12.27.
  2021-05-15  9:51 [PR PATCH] sauerbraten: update to 2020.12.27 ologantr
  2021-12-31 17:37 ` [PR PATCH] [Updated] " ologantr
@ 2021-12-31 17:41 ` ologantr
  1 sibling, 0 replies; 3+ messages in thread
From: ologantr @ 2021-12-31 17:41 UTC (permalink / raw)
  To: ml

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

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

sauerbraten: update to 2020.12.27.
https://github.com/void-linux/void-packages/pull/30913

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (x86_64)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

end of thread, other threads:[~2021-12-31 17:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-15  9:51 [PR PATCH] sauerbraten: update to 2020.12.27 ologantr
2021-12-31 17:37 ` [PR PATCH] [Updated] " ologantr
2021-12-31 17:41 ` [PR PATCH] [Closed]: " ologantr

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