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

[Jonas Frei]

commit:     ed6f0ff96641bee2fb4a5f1f997a24abf49149d1
Author:     Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Sat Apr  2 06:40:59 2022 +0000
Commit:     Jonas Frei <freijon <AT> pm <DOT> me>
CommitDate: Sat Apr  2 06:40:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ed6f0ff9

games-engines/fs2_open: Bump to 22.0.0, Added 'clang' USE flag

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jonas Frei <freijon <AT> pm.me>

 games-engines/fs2_open/Manifest                    |   3 +
 .../files/fs2_open-22.0.0-disable-discord.patch    |  55 +++++++++++
 .../files/fs2_open-22.0.0-dont-build-lz4.patch     |   9 ++
 ...=> fs2_open-22.0.0-make-arch-independent.patch} |   4 +-
 games-engines/fs2_open/fs2_open-21.4.0.ebuild      |  61 ------------
 games-engines/fs2_open/fs2_open-22.0.0.ebuild      | 103 +++++++++++++++++++++
 games-engines/fs2_open/metadata.xml                |   1 +
 7 files changed, 173 insertions(+), 63 deletions(-)

diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest
index fae041c48..e84657f91 100644
--- a/games-engines/fs2_open/Manifest
+++ b/games-engines/fs2_open/Manifest
@@ -1,3 +1,6 @@
 DIST fs2_open-21.4.1-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
 DIST fs2_open-21.4.1-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
 DIST fs2_open-21.4.1.tar.gz 10441595 BLAKE2B ae59cea98420cbdd6f18832fa0b8ba332993db03a53cbea43a96827dc4c7da375b14694ce60b1633d8275daa88ac32029be7b8211b7efd427baaffdd784720d9 SHA512 a4e6821ee2513cabf8b521f672c36c45aca8fc83fd6901ba19f2c0c0c27b3516c60dabfec1bfae43d82da94c628b9160c447ce853c9927dbb5901c7298986226
+DIST fs2_open-22.0.0-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
+DIST fs2_open-22.0.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
+DIST fs2_open-22.0.0.tar.gz 10573800 BLAKE2B b75bd9e44679bf2ad441178b7f8175f4429e321d2feeddf2cf5b4391e51f82c15250c36b73f3750326b1cd3ce71ae319042f57432d48a41b5abab9e30a4a76ba SHA512 e57972348073571947ff88e5a392ae0b4eec9d81cbcfe3d0ff3c2b844dd676cb33f727ddb32a0544e9cd3f1ae9b614429ea137b8921ef625fad27a53f1875081

diff --git a/games-engines/fs2_open/files/fs2_open-22.0.0-disable-discord.patch b/games-engines/fs2_open/files/fs2_open-22.0.0-disable-discord.patch
new file mode 100644
index 000000000..1b145d7da
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-22.0.0-disable-discord.patch
@@ -0,0 +1,55 @@
+--- fs2_open/code/CMakeLists.txt	2022-03-27 21:03:27.290788070 +0200
++++ fs2_open/code/CMakeLists.txt	2022-03-27 21:06:50.271782416 +0200
+@@ -41,8 +41,6 @@
+ 
+ target_link_libraries(code PUBLIC md5)
+ 
+-target_link_libraries(code PUBLIC discord-rpc)
+-
+ target_link_libraries(code PUBLIC libRocket)
+ 
+ target_link_libraries(code PUBLIC pcp)
+--- fs2_open/code/source_groups.cmake	2021-11-01 18:00:53.000000000 +0100
++++ fs2_open/code/source_groups.cmake	2022-03-27 21:35:47.595734025 +0200
+@@ -705,11 +705,6 @@
+ 	libs/antlr/ErrorListener.h
+ 	)
+ 
+-add_file_folder("Libs\\\\Discord"
+-	libs/discord/discord.cpp
+-	libs/discord/discord.h
+-)
+-
+ if (FSO_BUILD_WITH_FFMPEG)
+ 	add_file_folder("Libs\\\\FFmpeg"
+ 		libs/ffmpeg/FFmpeg.cpp
+--- fs2_open/lib/CMakeLists.txt	2022-03-27 21:03:27.287788070 +0200
++++ fs2_open/lib/CMakeLists.txt	2022-03-27 21:07:12.849781787 +0200
+@@ -33,8 +33,6 @@
+ 	include(FFmpeg.cmake)
+ endif()
+ 
+-add_subdirectory(discord)
+-
+ include(libRocket.cmake)
+ 
+ add_subdirectory(libpcp)
+--- fs2_open/freespace2/freespace.cpp	2021-11-01 18:00:53.000000000 +0100
++++ fs2_open/freespace2/freespace.cpp	2022-03-27 21:07:50.111780749 +0200
+@@ -83,7 +83,6 @@
+ #include "jumpnode/jumpnode.h"
+ #include "lab/labv2.h"
+ #include "lab/wmcgui.h" //So that GUI_System can be initialized
+-#include "libs/discord/discord.h"
+ #include "libs/ffmpeg/FFmpeg.h"
+ #include "lighting/lighting.h"
+ #include "localization/localize.h"
+@@ -1987,8 +1987,6 @@
+ #ifdef WITH_FFMPEG
+ 		libs::ffmpeg::initialize();
+ #endif
+-
+-		libs::discord::init();
+ 	}
+ 
+ 	nprintf(("General", "Ships.tbl is : %s\n", Game_ships_tbl_valid ? "VALID" : "INVALID!!!!"));

diff --git a/games-engines/fs2_open/files/fs2_open-22.0.0-dont-build-lz4.patch b/games-engines/fs2_open/files/fs2_open-22.0.0-dont-build-lz4.patch
new file mode 100644
index 000000000..60dc982a1
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-22.0.0-dont-build-lz4.patch
@@ -0,0 +1,9 @@
+--- fs2_open/lib/CMakeLists.txt	2022-04-01 23:30:46.000000000 +0200
++++ fs2_open/lib/CMakeLists.txt	2022-04-02 08:20:16.336924470 +0200
+@@ -52,5 +52,3 @@
+ add_subdirectory(variant)
+ 
+ add_subdirectory(any)
+-
+-ADD_SUBDIRECTORY(lz4)
+\ No newline at end of file

diff --git a/games-engines/fs2_open/files/fs2_open-21.4.0-make-arch-independent.patch b/games-engines/fs2_open/files/fs2_open-22.0.0-make-arch-independent.patch
similarity index 71%
rename from games-engines/fs2_open/files/fs2_open-21.4.0-make-arch-independent.patch
rename to games-engines/fs2_open/files/fs2_open-22.0.0-make-arch-independent.patch
index 8bd511129..c2f5d7f36 100644
--- a/games-engines/fs2_open/files/fs2_open-21.4.0-make-arch-independent.patch
+++ b/games-engines/fs2_open/files/fs2_open-22.0.0-make-arch-independent.patch
@@ -1,5 +1,5 @@
---- fs2_open-21.2.0/cmake/version.cmake	2021-05-22 20:20:18.448441242 +0200
-+++ fs2_open-21.2.0/cmake/version.cmake	2021-05-22 20:21:05.493447003 +0200
+--- fs2_open/cmake/version.cmake	2021-05-22 20:20:18.448441242 +0200
++++ fs2_open/cmake/version.cmake	2021-05-22 20:21:05.493447003 +0200
 @@ -35,11 +35,6 @@
      SET(FSO_BINARY_SUFFIX "${FSO_VERSION_MAJOR}_${FSO_VERSION_MINOR}_${FSO_VERSION_BUILD}_${FSO_VERSION_REVISION_STR}")
  ENDIF()

diff --git a/games-engines/fs2_open/fs2_open-21.4.0.ebuild b/games-engines/fs2_open/fs2_open-21.4.0.ebuild
deleted file mode 100644
index efd95c55d..000000000
--- a/games-engines/fs2_open/fs2_open-21.4.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3
-inherit cmake
-
-# Replace "." with "_" in version
-_PV=${PV//./_}
-
-DESCRIPTION="FreeSpace2 Source Code Project game engine"
-HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/"
-EGIT_REPO_URI="https://github.com/scp-fs2open/fs2open.github.com.git"
-EGIT_COMMIT="release_${_PV}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS=""
-
-DEPEND="
-	media-libs/libjpeg-turbo
-	media-libs/libpng
-	media-libs/libtheora
-	media-libs/libvorbis
-	>=dev-lang/lua-5.1.0:*
-	media-libs/mesa
-	media-libs/openal
-	media-libs/libsdl2
-	media-libs/glu
-	dev-libs/jansson
-	app-arch/lz4
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-make-arch-independent.patch"
-	eapply_user
-	cmake_src_prepare
-}
-
-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-22.0.0.ebuild b/games-engines/fs2_open/fs2_open-22.0.0.ebuild
new file mode 100644
index 000000000..8c63d4680
--- /dev/null
+++ b/games-engines/fs2_open/fs2_open-22.0.0.ebuild
@@ -0,0 +1,103 @@
+# 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"
+IUSE="clang debug discord"
+
+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="
+	dev-util/cmake
+	clang? ( sys-devel/clang:= )
+"
+PATCHES=(
+	"${FILESDIR}/${P}-dont-build-lz4.patch"
+	"${FILESDIR}/${P}-make-arch-independent.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_configure() {
+	if use clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		LDFLAGS+=" -fuse-ld=lld"
+	fi
+	cmake_src_configure
+}
+
+src_prepare() {
+	use discord || eapply "${FILESDIR}/${P}-disable-discord.patch"
+	eapply_user
+	cmake_src_prepare
+	use debug && CMAKE_BUILD_TYPE=Debug
+}
+
+src_install() {
+	exeinto "/opt/${PN}"
+	if use debug ; then
+		doexe "${BUILD_DIR}/bin/${PN}_${_PV}-DEBUG"
+	else
+		doexe "${BUILD_DIR}/bin/${PN}_${_PV}"
+	fi
+	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"
+	use discord && 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/metadata.xml b/games-engines/fs2_open/metadata.xml
index aef4fd67c..52df334c4 100644
--- a/games-engines/fs2_open/metadata.xml
+++ b/games-engines/fs2_open/metadata.xml
@@ -16,6 +16,7 @@
 		<bugs-to>https://github.com/scp-fs2open/fs2open.github.com/issues</bugs-to>
 	</upstream>
 	<use>
+		<flag name="clang">Use Clang compiler instead of GCC</flag>
 		<flag name="debug">Debug build to collect logfiles</flag>
 		<flag name="discord">Enable Discord RPC support</flag>
 	</use>