* [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/files/, games-fps/assaultcube/
@ 2022-04-08 2:43 Ronny Gutbrod
0 siblings, 0 replies; 3+ messages in thread
From: Ronny Gutbrod @ 2022-04-08 2:43 UTC (permalink / raw
To: gentoo-commits
commit: 822934a79b7413392669e9d4ce936a879a2f7c8b
Author: Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Thu Apr 7 07:44:37 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
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/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/files/, games-fps/assaultcube/
@ 2023-01-06 8:51 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2023-01-06 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 1c93ee9db87756a95609a4b6a99fcb4909f532d4
Author: Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Thu Jan 5 14:45:47 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
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
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/files/, games-fps/assaultcube/
@ 2024-11-07 23:44 David Roman
0 siblings, 0 replies; 3+ messages in thread
From: David Roman @ 2024-11-07 23:44 UTC (permalink / raw
To: gentoo-commits
commit: 94a997bfbee0ba9ebb39f4fc8a9837ee5fbacb95
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Thu Nov 7 13:52:54 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Nov 7 13:52:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=94a997bf
games-fps/assaultcube: fix compile failure with clang
Closes: https://bugs.gentoo.org/921915
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
....3.0.2.ebuild => assaultcube-1.3.0.2-r1.ebuild} | 6 ++--
.../assaultcube-1.3.0.2-unset-variables.patch | 32 ++++++++++++++++++++++
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2-r1.ebuild
similarity index 94%
rename from games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
rename to games-fps/assaultcube/assaultcube-1.3.0.2-r1.ebuild
index 25001c061..0301e81c0 100644
--- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.3.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,16 +20,18 @@ RDEPEND="
media-libs/libsdl2[opengl]
media-libs/sdl2-image[jpeg,png]
x11-libs/libX11
+ media-libs/libglvnd[X]
media-libs/libogg
media-libs/libvorbis
media-libs/openal
"
DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/clang"
PATCHES=(
"${FILESDIR}/${PN}-1.3.0.2-respect-ldflags.patch"
# a script which checks for required libs and certain parts of the game
"${FILESDIR}/${PN}-1.3.0.2-fix-checkinstall.patch"
+ # bug #921915
+ "${FILESDIR}/${PN}-1.3.0.2-unset-variables.patch"
"${FILESDIR}/0001-Fix-unnecessary-rebuild-on-make-install.patch"
"${FILESDIR}/0002-Don-t-configure-libenet-in-Makefile.patch"
)
diff --git a/games-fps/assaultcube/files/assaultcube-1.3.0.2-unset-variables.patch b/games-fps/assaultcube/files/assaultcube-1.3.0.2-unset-variables.patch
new file mode 100644
index 000000000..1bc54b38c
--- /dev/null
+++ b/games-fps/assaultcube/files/assaultcube-1.3.0.2-unset-variables.patch
@@ -0,0 +1,32 @@
+Respect user preferences during the build and fix the Clang build by
+disabling PCH.
+https://bugs.gentoo.org/921915
+--- a/source/src/Makefile
++++ b/source/src/Makefile
+@@ -6,7 +6,6 @@
+ # found to have been caused by the g++ compiler in the past. This seems to have
+ # been fixed now by relaxing the optimization that g++ does, so although we'll
+ # continue using clang++ (just in case), you can use g++ if you prefer.
+-CXX=clang++
+
+ # call like 'DEBUGBUILD=1 make' to compile a debug version of AssaultCube.
+ ifdef DEBUGBUILD
+@@ -34,10 +33,8 @@ ifeq ($(ACDEBUG),yes)
+ endif
+
+ ifneq (,$(findstring clang,$(CXX)))
+- CXXFLAGS= -O3 -fomit-frame-pointer
+ override CXXFLAGS+= -Wall -fsigned-char
+ else
+- CXXFLAGS= -O3 -fomit-frame-pointer
+ override CXXFLAGS+= -Wall -fsigned-char -ffast-math -rdynamic -Wno-format-zero-length
+ ifeq "$(shell expr 'gcc -dumpversion' \>= 8)" "1"
+ override CXXFLAGS+= -Wno-stringop-truncation
+@@ -182,7 +179,6 @@ rendermodel.o: rendermodel.cpp
+ $(CXX) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
+
+ $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES)
+-$(CLIENT_OBJS): $(CLIENT_PCH)
+ $(SERVER_OBJS): CXXFLAGS += $(SERVER_INCLUDES)
+ $(filter-out $(SERVER_OBJS),$(MASTER_OBJS)): CXXFLAGS += $(SERVER_INCLUDES)
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-07 23:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-06 8:51 [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/files/, games-fps/assaultcube/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2024-11-07 23:44 David Roman
2022-04-08 2:43 Ronny Gutbrod
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox