commit: 1372d310aa47be73b4b4c065922c855232ad3659 Author: Jonas Frei <freijon <AT> pm <DOT> me> AuthorDate: Sat Mar 26 11:33:28 2022 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sat Mar 26 11:33:28 2022 +0000 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 <freijon <AT> 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 000000000..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.000000000 +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.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 - >=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" )
