From bf56c1906d5f5d7dc119d812a9d0099347fc5d41 Mon Sep 17 00:00:00 2001
From: Jonas Frei <freijon@pm.me>
Date: Sun, 27 Mar 2022 18:03:39 +0200
Subject: games-engines/fs2_open: Added patch to fix linker QA issue

Closes: https://bugs.gentoo.org/836249
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jonas Frei <freijon@pm.me>
---
 .../fs2_open-21.4.1-dont-override-ldflags.patch    | 14 ++++
 games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild   | 77 ---------------------
 games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild   | 78 ++++++++++++++++++++++
 3 files changed, 92 insertions(+), 77 deletions(-)
 create mode 100644 games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
 delete mode 100644 games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild
 create mode 100644 games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild

(limited to 'games-engines')

diff --git a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
new file mode 100644
index 000000000..c75458ded
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
@@ -0,0 +1,14 @@
+--- fs2_open-21.4.1/cmake/toolchain-gcc.cmake	2021-11-01 18:00:53.000000000 +0100
++++ fs2_open-21.4.1/cmake/toolchain-gcc.cmake	2022-03-27 17:52:26.738107292 +0200
+@@ -27,6 +27,11 @@
+ set(COMPILER_FLAGS "")
+ set(LINKER_FLAGS "")
+ 
++# For C and C++, the values can be overwritten independently
++if(DEFINED ENV{LDFLAGS})
++    set(LINKER_FLAGS $ENV{LDFLAGS})
++endif()
++
+ if (GCC_USE_GOLD)
+ 	OPTION(GCC_INCREMENTAL_LINKING "Use incremental linking" OFF)
+ 	set(LINKER_FLAGS "${LINKER_FLAGS} -fuse-ld=gold")
diff --git a/games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild b/games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild
deleted file mode 100644
index d96915f96..000000000
--- a/games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="FreeSpace2 Source Code Project game engine"
-HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/"
-
-# Replace "." with "_" in version
-_PV=${PV//./_}
-
-# Current hashes of external repositories:
-HASH_LIBROCKET="ecd648a43aff8a9f3daf064d75ca5725237d5b38"
-HASH_CMAKE_MODULES="7cef9577d6fc35057ea57f46b4986a8a28aeff50"
-
-SRC_URI="
-	https://github.com/scp-fs2open/fs2open.github.com/archive/refs/tags/release_${_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/asarium/libRocket/archive/${HASH_LIBROCKET}.tar.gz -> ${P}-ext_libRocket.tar.gz
-	https://github.com/asarium/cmake-modules/archive/${HASH_CMAKE_MODULES}.tar.gz -> ${P}-ext_rpavlik-cmake-modules.tar.gz
-"
-
-LICENSE="Unlicense MIT Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	app-arch/lz4
-	<dev-lang/lua-5.1.6:5.1
-	dev-libs/jansson
-	media-libs/freetype:2
-	media-libs/glu
-	media-libs/libjpeg-turbo
-	media-libs/libpng
-	media-libs/libsdl2
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/mesa
-	media-libs/openal
-	media-video/ffmpeg
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-PATCHES=(
-	"${FILESDIR}/${P}-dont-build-lz4.patch"
-	"${FILESDIR}/${P}-make-arch-independent.patch"
-	"${FILESDIR}/${P}-version-fix.patch"
-)
-
-CMAKE_BUILD_TYPE=Release
-
-S="${WORKDIR}/fs2open.github.com-release_${_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mv libRocket-${HASH_LIBROCKET}/* "${S}/lib/libRocket/" || die
-	mv cmake-modules-${HASH_CMAKE_MODULES}/* "${S}/cmake/external/rpavlik-cmake-modules/" || die
-}
-
-src_install() {
-	exeinto "/opt/${PN}"
-	doexe "${BUILD_DIR}/bin/${PN}_${_PV}"
-	insinto "/opt/${PN}"
-	doins "${BUILD_DIR}/bin/libRocketControls.so"
-	doins "${BUILD_DIR}/bin/libRocketControlsLua.so"
-	doins "${BUILD_DIR}/bin/libRocketCore.so"
-	doins "${BUILD_DIR}/bin/libRocketCoreLua.so"
-	doins "${BUILD_DIR}/bin/libRocketDebugger.so"
-	doins "${BUILD_DIR}/bin/libdiscord-rpc.so"
-}
-
-pkg_postinst() {
-	einfo "This package only generates the engine binary."
-	einfo "The retail Freespace 2 data is required to play the"
-	einfo "original game and most mods."
-}
diff --git a/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild b/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
new file mode 100644
index 000000000..2d1b5f674
--- /dev/null
+++ b/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="FreeSpace2 Source Code Project game engine"
+HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/"
+
+# Replace "." with "_" in version
+_PV=${PV//./_}
+
+# Current hashes of external repositories:
+HASH_LIBROCKET="ecd648a43aff8a9f3daf064d75ca5725237d5b38"
+HASH_CMAKE_MODULES="7cef9577d6fc35057ea57f46b4986a8a28aeff50"
+
+SRC_URI="
+	https://github.com/scp-fs2open/fs2open.github.com/archive/refs/tags/release_${_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/asarium/libRocket/archive/${HASH_LIBROCKET}.tar.gz -> ${P}-ext_libRocket.tar.gz
+	https://github.com/asarium/cmake-modules/archive/${HASH_CMAKE_MODULES}.tar.gz -> ${P}-ext_rpavlik-cmake-modules.tar.gz
+"
+
+LICENSE="Unlicense MIT Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	app-arch/lz4
+	<dev-lang/lua-5.1.6:5.1
+	dev-libs/jansson
+	media-libs/freetype:2
+	media-libs/glu
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	media-libs/libsdl2
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/mesa
+	media-libs/openal
+	media-video/ffmpeg
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+PATCHES=(
+	"${FILESDIR}/${P}-dont-build-lz4.patch"
+	"${FILESDIR}/${P}-dont-override-ldflags.patch"
+	"${FILESDIR}/${P}-make-arch-independent.patch"
+	"${FILESDIR}/${P}-version-fix.patch"
+)
+
+CMAKE_BUILD_TYPE=Release
+
+S="${WORKDIR}/fs2open.github.com-release_${_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mv libRocket-${HASH_LIBROCKET}/* "${S}/lib/libRocket/" || die
+	mv cmake-modules-${HASH_CMAKE_MODULES}/* "${S}/cmake/external/rpavlik-cmake-modules/" || die
+}
+
+src_install() {
+	exeinto "/opt/${PN}"
+	doexe "${BUILD_DIR}/bin/${PN}_${_PV}"
+	insinto "/opt/${PN}"
+	doins "${BUILD_DIR}/bin/libRocketControls.so"
+	doins "${BUILD_DIR}/bin/libRocketControlsLua.so"
+	doins "${BUILD_DIR}/bin/libRocketCore.so"
+	doins "${BUILD_DIR}/bin/libRocketCoreLua.so"
+	doins "${BUILD_DIR}/bin/libRocketDebugger.so"
+	doins "${BUILD_DIR}/bin/libdiscord-rpc.so"
+}
+
+pkg_postinst() {
+	einfo "This package only generates the engine binary."
+	einfo "The retail Freespace 2 data is required to play the"
+	einfo "original game and most mods."
+}
-- 
cgit v1.2.3-65-gdbad