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

2023-10-15 Thread Haelwenn Monnier 
commit: 25ef3038fb9713eceab53e679c201d671fe3dcd2
Author: Jonas Frei  pm  me>
AuthorDate: Sat Oct 14 07:40:10 2023 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Sat Oct 14 07:40:17 2023 +
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  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..00
--- 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.0 +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("LibsDiscord"
--  libs/discord/discord.cpp
--  libs/discord/discord.h
--)
--
- if (FSO_BUILD_WITH_FFMPEG)
-   add_file_folder("LibsFFmpeg"
-   libs/ffmpeg/FFmpeg.cpp
 fs2_open/lib/CMakeLists.txt2022-03-27 21:03:27.287788070 +0200
-+++ fs2_open/lib/CMakeLists.txt2022-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.0 +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"));

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

2022-08-07 Thread Haelwenn Monnier 
commit: c22890acee0bc64ebedd88da87fc7680ff5e68a8
Author: Jonas Frei  pm  me>
AuthorDate: Sun Aug  7 04:22:54 2022 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Sun Aug  7 04:22:54 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c22890ac

games-engines/fs2_open: add 22.2.0

Signed-off-by: Jonas Frei  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 insertions(+)

diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest
index e84657f91..612408bc3 100644
--- a/games-engines/fs2_open/Manifest
+++ b/games-engines/fs2_open/Manifest
@@ -4,3 +4,6 @@ DIST fs2_open-21.4.1.tar.gz 10441595 BLAKE2B 
ae59cea98420cbdd6f18832fa0b8ba33299
 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
+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

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
new file mode 100644
index 0..1b145d7da
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-22.2.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.0 +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("LibsDiscord"
+-  libs/discord/discord.cpp
+-  libs/discord/discord.h
+-)
+-
+ if (FSO_BUILD_WITH_FFMPEG)
+   add_file_folder("LibsFFmpeg"
+   libs/ffmpeg/FFmpeg.cpp
+--- fs2_open/lib/CMakeLists.txt2022-03-27 21:03:27.287788070 +0200
 fs2_open/lib/CMakeLists.txt2022-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.0 +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",

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

2022-03-26 Thread Andrew Ammerlaan 
commit: 1372d310aa47be73b4b4c065922c855232ad3659
Author: Jonas Frei  pm  me>
AuthorDate: Sat Mar 26 11:33:28 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Mar 26 11:33:28 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1372d310

games-engines/fs2_open: Improved/added various dependencies

Bug: https://bugs.gentoo.org/836151
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jonas Frei  pm.me>

 .../files/fs2_open-21.4.1-dont-build-lz4.patch |  9 +
 ...s2_open-21.4.1.ebuild => fs2_open-21.4.1-r1.ebuild} | 18 +++---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-build-lz4.patch 
b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-build-lz4.patch
new file mode 100644
index 0..bfae2ea39
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-build-lz4.patch
@@ -0,0 +1,9 @@
+--- fs2_open-21.4.1/lib/CMakeLists.txt 2021-11-01 18:00:53.0 +0100
 fs2_open-21.4.1/lib/CMakeLists.txt 2022-03-26 11:34:48.746075280 +0100
+@@ -50,5 +50,3 @@
+ add_subdirectory(mdns)
+ 
+ add_subdirectory(variant)
+-
+-ADD_SUBDIRECTORY(lz4)
+\ No newline at end of file

diff --git a/games-engines/fs2_open/fs2_open-21.4.1.ebuild 
b/games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild
similarity index 94%
rename from games-engines/fs2_open/fs2_open-21.4.1.ebuild
rename to games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild
index 15c8490c8..d96915f96 100644
--- a/games-engines/fs2_open/fs2_open-21.4.1.ebuild
+++ b/games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild
@@ -5,6 +5,9 @@ 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//./_}
 
@@ -12,8 +15,6 @@ _PV=${PV//./_}
 HASH_LIBROCKET="ecd648a43aff8a9f3daf064d75ca5725237d5b38"
 HASH_CMAKE_MODULES="7cef9577d6fc35057ea57f46b4986a8a28aeff50"
 
-DESCRIPTION="FreeSpace2 Source Code Project game engine"
-HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/;
 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
@@ -25,21 +26,24 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 DEPEND="
+   app-arch/lz4
+   =dev-lang/lua-5.1.0:*
media-libs/mesa
media-libs/openal
-   media-libs/libsdl2
-   media-libs/glu
-   dev-libs/jansson
-   app-arch/lz4
+   media-video/ffmpeg
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
 PATCHES=(
+   "${FILESDIR}/${P}-dont-build-lz4.patch"
"${FILESDIR}/${P}-make-arch-independent.patch"
"${FILESDIR}/${P}-version-fix.patch"
 )

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

2022-03-25 Thread Ronny Gutbrod 
commit: c820f8c1f2fce98280a20280ae248275f30848a2
Author: Jonas Frei  pm  me>
AuthorDate: Fri Mar 25 22:04:17 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Fri Mar 25 22:04:17 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c820f8c1

games-engines/fs2_open: Bump to 21.4.1. Removed git-r3 eclass.

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

 games-engines/fs2_open/Manifest|  3 +
 .../fs2_open-21.4.1-make-arch-independent.patch| 14 
 .../files/fs2_open-21.4.1-version-fix.patch|  9 +++
 games-engines/fs2_open/fs2_open-21.4.1.ebuild  | 85 ++
 4 files changed, 111 insertions(+)

diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest
new file mode 100644
index 0..9a924eb22
--- /dev/null
+++ b/games-engines/fs2_open/Manifest
@@ -0,0 +1,3 @@
+DIST fs2_open-21.4.1-cmake_external_rpavlik-cmake-modules.tar.gz 267464 
BLAKE2B 
d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9
 SHA512 
0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
+DIST fs2_open-21.4.1-lib_libRocket.tar.gz 2417905 BLAKE2B 
0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2
 SHA512 
700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
+DIST fs2_open-21.4.1.tar.gz 10441595 BLAKE2B 
ae59cea98420cbdd6f18832fa0b8ba332993db03a53cbea43a96827dc4c7da375b14694ce60b1633d8275daa88ac32029be7b8211b7efd427baaffdd784720d9
 SHA512 
a4e6821ee2513cabf8b521f672c36c45aca8fc83fd6901ba19f2c0c0c27b3516c60dabfec1bfae43d82da94c628b9160c447ce853c9927dbb5901c7298986226

diff --git 
a/games-engines/fs2_open/files/fs2_open-21.4.1-make-arch-independent.patch 
b/games-engines/fs2_open/files/fs2_open-21.4.1-make-arch-independent.patch
new file mode 100644
index 0..e03b59bb3
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-make-arch-independent.patch
@@ -0,0 +1,14 @@
+--- fs2_open-21.4.1/cmake/version.cmake2021-05-22 20:20:18.448441242 
+0200
 fs2_open-21.4.1/cmake/version.cmake2021-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/files/fs2_open-21.4.1-version-fix.patch 
b/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch
new file mode 100644
index 0..f3812dc8e
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch
@@ -0,0 +1,9 @@
+--- fs2_open-21.4.1/version_override.cmake 2022-03-25 22:22:13.424199518 
+0100
 fs2_open-21.4.1/version_override.cmake 2022-03-25 22:22:30.378200320 
+0100
+@@ -1,5 +1,5 @@
+ set(FSO_VERSION_MAJOR 21)
+ set(FSO_VERSION_MINOR 4)
+-set(FSO_VERSION_BUILD 0)
++set(FSO_VERSION_BUILD 1)
+ set(FSO_VERSION_REVISION 0)
+ set(FSO_VERSION_REVISION_STR )

diff --git a/games-engines/fs2_open/fs2_open-21.4.1.ebuild 
b/games-engines/fs2_open/fs2_open-21.4.1.ebuild
new file mode 100644
index 0..7a2ae2cd9
--- /dev/null
+++ b/games-engines/fs2_open/fs2_open-21.4.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# Replace "." with "_" in version
+_PV=${PV//./_}
+
+# Current hashes of external repositories:
+HASH_LIBROCKET="ecd648a43aff8a9f3daf064d75ca5725237d5b38"
+HASH_CMAKE_MODULES="7cef9577d6fc35057ea57f46b4986a8a28aeff50"
+
+DESCRIPTION="FreeSpace2 Source Code Project game engine"
+HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/;
+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}-lib_libRocket.tar.gz
+   
https://github.com/asarium/cmake-modules/archive/${HASH_CMAKE_MODULES}.tar.gz 
-> ${P}-cmake_external_rpavlik-cmake-modules.tar.gz
+"
+
+LICENSE="Unlicense MIT Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+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

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

2021-05-24 Thread Andrew Ammerlaan 
commit: e35221bcbfc0092b4bb4225bd6699983dffb3c17
Author: Jonas Frei  pm  me>
AuthorDate: Sun May 23 06:50:17 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun May 23 09:40:08 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e35221bc

games-engines/fs2_open:

Initial commit for games-engines/fs2_open

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Jonas Frei  pm.me>

 .../fs2_open-21.2.0-make-arch-independent.patch| 14 +
 games-engines/fs2_open/fs2_open-21.2.0.ebuild  | 61 ++
 games-engines/fs2_open/metadata.xml| 18 +++
 3 files changed, 93 insertions(+)

diff --git 
a/games-engines/fs2_open/files/fs2_open-21.2.0-make-arch-independent.patch 
b/games-engines/fs2_open/files/fs2_open-21.2.0-make-arch-independent.patch
new file mode 100644
index 0..8bd511129
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-21.2.0-make-arch-independent.patch
@@ -0,0 +1,14 @@
+--- fs2_open-21.2.0/cmake/version.cmake2021-05-22 20:20:18.448441242 
+0200
 fs2_open-21.2.0/cmake/version.cmake2021-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-21.2.0.ebuild 
b/games-engines/fs2_open/fs2_open-21.2.0.ebuild
new file mode 100644
index 0..11720db3a
--- /dev/null
+++ b/games-engines/fs2_open/fs2_open-21.2.0.ebuild
@@ -0,0 +1,61 @@
+# 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="~amd64 ~x86"
+
+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/metadata.xml 
b/games-engines/fs2_open/metadata.xml
new file mode 100644
index 0..ae3fd23ea
--- /dev/null
+++ b/games-engines/fs2_open/metadata.xml
@@ -0,0 +1,18 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+Jonas Frei
+frei...@pm.me
+
+
+fs2_open is the game enginge of the FreeSpace2 Source Code 
Project.
+   This package is not the complete game, but rather the game 
engine
+   that runs the game. The game data files have to be installed
+   manually.
+
+
+scp-fs2open/fs2open.github.com
+
https://github.com/scp-fs2open/fs2open.github.com/issues
+
+