[gentoo-commits] repo/proj/guru:dev commit in: games-fps/assaultcube/files/, games-fps/assaultcube/

[gentoo-commits] repo/proj/guru:dev commit in: games-fps/assaultcube/files/, games-fps/assaultcube/

[Duje Mihanović]

commit:     822934a79b7413392669e9d4ce936a879a2f7c8b
Author:     Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Thu Apr  7 07:44:37 2022 +0000
Commit:     Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
CommitDate: Thu Apr  7 08:14:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=822934a7

games-fps/assaultcube: respect LDFLAGS

Signed-off-by: Duje Mihanović <duje.mihanovic <AT> skole.hr>

 games-fps/assaultcube/assaultcube-1.3.0.2.ebuild     |  4 ++++
 .../files/assaultcube-1.3.0.2-respect-ldflags.patch  | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
index 305b968c2..7676be084 100644
--- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
@@ -15,8 +15,12 @@ KEYWORDS="~amd64"
 RDEPEND="sys-libs/zlib media-libs/libsdl2 media-libs/sdl2-image x11-libs/libX11 media-libs/libogg media-libs/libvorbis media-libs/openal"
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/clang"
+PATCHES=(
+	"${FILESDIR}/assaultcube-1.3.0.2-respect-ldflags.patch"
+)
 
 src_prepare() {
+	eapply ${PATCHES}
 	eapply_user
 	sed -i 's|//#define PRODUCTION|#define PRODUCTION|' "${S}/source/src/cube.h"
 }

diff --git a/games-fps/assaultcube/files/assaultcube-1.3.0.2-respect-ldflags.patch b/games-fps/assaultcube/files/assaultcube-1.3.0.2-respect-ldflags.patch
new file mode 100644
index 000000000..9a9a8b460
--- /dev/null
+++ b/games-fps/assaultcube/files/assaultcube-1.3.0.2-respect-ldflags.patch
@@ -0,0 +1,20 @@
+diff --git a/source/src/Makefile b/source/src/Makefile
+index bf06195..61da2b7 100644
+--- a/source/src/Makefile
++++ b/source/src/Makefile
+@@ -202,12 +202,12 @@ server_install: server
+ 
+ else
+ client: libenet $(CLIENT_OBJS)
+-	$(CXX) $(CXXFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
+ 
+ server: libenet $(SERVER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS)
+ master: libenet $(MASTER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)
+ 
+ client_install: client
+ 	install -d ../../bin_unix/

[gentoo-commits] repo/proj/guru:dev commit in: games-fps/assaultcube/files/, games-fps/assaultcube/

[Duje Mihanović]

commit:     1c93ee9db87756a95609a4b6a99fcb4909f532d4
Author:     Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Thu Jan  5 14:45:47 2023 +0000
Commit:     Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
CommitDate: Thu Jan  5 14:45:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1c93ee9d

games-fps/assaultcube: configure bundled libenet in src_configure

Signed-off-by: Duje Mihanović <duje.mihanovic <AT> skole.hr>

 games-fps/assaultcube/assaultcube-1.3.0.2.ebuild   |  5 +++
 .../0002-Don-t-configure-libenet-in-Makefile.patch | 45 ++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
index 8db59ebc9..1ea47bda7 100644
--- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
 	# a script which checks for required libs and certain parts of the game
 	"${FILESDIR}/${PN}-1.3.0.2-fix-checkinstall.patch"
 	"${FILESDIR}/0001-Fix-unnecessary-rebuild-on-make-install.patch"
+	"${FILESDIR}/0002-Don-t-configure-libenet-in-Makefile.patch"
 )
 
 src_prepare() {
@@ -40,12 +41,16 @@ src_prepare() {
 
 src_configure() {
 	filter-lto
+	cd source/enet && ./configure \
+		--enable-shared=no \
+		--enable-static=yes
 }
 
 src_compile() {
 	if use debug; then
 		local -x DEBUGBUILD=1
 	fi
+	emake -C source/enet
 	emake -C source/src
 }
 

diff --git a/games-fps/assaultcube/files/0002-Don-t-configure-libenet-in-Makefile.patch b/games-fps/assaultcube/files/0002-Don-t-configure-libenet-in-Makefile.patch
new file mode 100644
index 000000000..7a2f32abf
--- /dev/null
+++ b/games-fps/assaultcube/files/0002-Don-t-configure-libenet-in-Makefile.patch
@@ -0,0 +1,45 @@
+From ab7618606b8358245b13dc5a7291fa3b0211fd10 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Duje=20Mihanovi=C4=87?= <duje.mihanovic@skole.hr>
+Date: Thu, 5 Jan 2023 15:14:48 +0100
+Subject: [PATCH 2/2] Don't configure libenet in Makefile
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This shall be done in the ebuild's src_configure instead.
+
+Signed-off-by: Duje Mihanović <duje.mihanovic@skole.hr>
+---
+ source/src/Makefile | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/source/src/Makefile b/source/src/Makefile
+index 9ecf691..6607f91 100644
+--- a/source/src/Makefile
++++ b/source/src/Makefile
+@@ -155,19 +155,16 @@ default: all
+ 
+ all: client server
+ 
+-../enet/Makefile:
+-	cd ../enet; ./configure --enable-shared=no --enable-static=yes
+-
+-../enet/.libs/libenet.la: ../enet/Makefile
++../enet/.libs/libenet.la:
+ 	-$(MAKE) -C ../enet all
+ 
+-clean-enet: ../enet/Makefile
++clean-enet:
+ 	$(MAKE) -C ../enet/ clean
+ 
+ clean:
+ 	-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) ac_client ac_server ac_master
+ 
+-mrproper: clean ../enet/Makefile
++mrproper: clean
+ 	$(MAKE) -C ../enet/ distclean
+ 	-$(RM) ../enet/Makefile
+ 
+-- 
+2.38.2
+