commit: 25ef3038fb9713eceab53e679c201d671fe3dcd2
Author: Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Sat Oct 14 07:40:10 2023 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sat Oct 14 07:40:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=25ef3038
games-engines/fs2_open: drop 22.2.0
Signed-off-by: Jonas Frei <freijon <AT> pm.me>
games-engines/fs2_open/Manifest | 3 -
.../files/fs2_open-22.2.0-disable-discord.patch | 55 -----------
.../files/fs2_open-22.2.0-dont-build-lz4.patch | 9 --
.../fs2_open-22.2.0-make-arch-independent.patch | 14 ---
games-engines/fs2_open/fs2_open-22.2.0.ebuild | 103 ---------------------
5 files changed, 184 deletions(-)
diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest
index 668c54b081..45d23ae1f0 100644
--- a/games-engines/fs2_open/Manifest
+++ b/games-engines/fs2_open/Manifest
@@ -1,6 +1,3 @@
-DIST fs2_open-22.2.0-ext_libRocket.tar.gz 2417905 BLAKE2B
0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2
SHA512
700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
-DIST fs2_open-22.2.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B
d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9
SHA512
0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
-DIST fs2_open-22.2.0.tar.gz 10690003 BLAKE2B
9d751407ee06877e27e18a9295370ed2c97a48ac65c65757ea57ee1f1d7ba36e07cddb9812a62a763eefb842d5df71151243a81e97aa664a8c3123b7b7913255
SHA512
e72ad40f8f52430549f76330f8b34255ae68fff53ced76f56b04ef19d7ce510026c3bb38fcebdb6f3bfaf7db59ca89df5686e8480e883e01b6408d21cb08cc77
DIST fs2_open-23.0.0-ext_libRocket.tar.gz 2417905 BLAKE2B
0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2
SHA512
700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
DIST fs2_open-23.0.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B
d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9
SHA512
0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
DIST fs2_open-23.0.0.tar.gz 12210430 BLAKE2B
95e5a4f328711a3915b2624941eb90810a19c4d8fe16edc0af47eec3cb1393be8379cd53f27cf378693ba711bd37f0fec360fda931ba17b883195f356a0f8dfc
SHA512
efd3648986bb36f0b217ea033ab56ba7c1a705a0d9f16f0351a019d06276f68810729eb9749d1facbf8bc312114eb4e380b68049f5d30b410de2b28c5c67975e
diff --git a/games-engines/fs2_open/files/fs2_open-22.2.0-disable-discord.patch
b/games-engines/fs2_open/files/fs2_open-22.2.0-disable-discord.patch
deleted file mode 100644
index 1b145d7da1..0000000000
--- a/games-engines/fs2_open/files/fs2_open-22.2.0-disable-discord.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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.2.0-dont-build-lz4.patch
b/games-engines/fs2_open/files/fs2_open-22.2.0-dont-build-lz4.patch
deleted file mode 100644
index 60dc982a17..0000000000
--- a/games-engines/fs2_open/files/fs2_open-22.2.0-dont-build-lz4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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-22.2.0-make-arch-independent.patch
b/games-engines/fs2_open/files/fs2_open-22.2.0-make-arch-independent.patch
deleted file mode 100644
index c2f5d7f36c..0000000000
--- a/games-engines/fs2_open/files/fs2_open-22.2.0-make-arch-independent.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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()
-
--IF(IS_64BIT)
-- # This is a 64-bit builds
-- SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_x64")
--ENDIF()
--
- IF (NOT "${FSO_INSTRUCTION_SET}" STREQUAL "")
- SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_${FSO_INSTRUCTION_SET}")
- ENDIF()
diff --git a/games-engines/fs2_open/fs2_open-22.2.0.ebuild
b/games-engines/fs2_open/fs2_open-22.2.0.ebuild
deleted file mode 100644
index 8c63d4680d..0000000000
--- a/games-engines/fs2_open/fs2_open-22.2.0.ebuild
+++ /dev/null
@@ -1,103 +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"
-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."
-}
