From 97bacba3ead078e5db8b87ab651a3ffa7d82f60f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 17 Apr 2024 12:04:28 +0100 Subject: gentoo auto-resync : 17:04:2024 - 12:04:27 --- games-action/Manifest.gz | Bin 14363 -> 14362 bytes games-action/prismlauncher/Manifest | 4 +- .../prismlauncher/prismlauncher-8.2-r1.ebuild | 167 +++++++++++++++++++++ .../prismlauncher/prismlauncher-8.2.ebuild | 166 -------------------- .../prismlauncher/prismlauncher-9999.ebuild | 1 + 5 files changed, 170 insertions(+), 168 deletions(-) create mode 100644 games-action/prismlauncher/prismlauncher-8.2-r1.ebuild delete mode 100644 games-action/prismlauncher/prismlauncher-8.2.ebuild (limited to 'games-action') diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz index 3042cb2ed5af..9bcbb72e07d3 100644 Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest index 97adba87f41e..983e93f969fe 100644 --- a/games-action/prismlauncher/Manifest +++ b/games-action/prismlauncher/Manifest @@ -1,5 +1,5 @@ AUX prismlauncher-8.2-openjdk21.patch 1541 BLAKE2B 80f38e970dbe448e3251ea90ef77e780aaf85c9ebf579affbf06690cafdbe4581066eaef7c6551a13198ab9aa51bc9b2137ec8f02c2b6ee83fce0ae0299436df SHA512 f3ef51239de85052e4c47bf61132b36975309eeac4281a31a8f78e4b9aecb20dbb6a2dee262c0fe8f634b2e0a690ca73f6223e389f73532a5033f335d39cd7ab DIST prismlauncher-8.2.tar.gz 8437675 BLAKE2B 3eee060dbc80ca690b344875caa20b27d8949b1e972602d1d383e1ae394404408d74dece11b47f940948ac2c437bd73fadf56d4e492daa34adef1c1eade66bc9 SHA512 6a0988a83e36df0da328fed0efe93171f8b4c565622f8eddf885e6e019214b15b8f64485ce1d9982dd441fad7c4aac8d1647e1b4dbf2cdb8ebadc46f664857ad -EBUILD prismlauncher-8.2.ebuild 4624 BLAKE2B 74fa94c9d156a2825fb4c63f3e77bacfbe6ce53ac5a8f90409c5189170063ba7ea3385e158ccdeee82db2d6f11203ca8e154ea72e03047ac73544d70fbb89d80 SHA512 f797415c06f841287c41bf63dda2d214faecaac72d883f6879433bd3bfa7d7a214f586098dba1e094cdce51546acfbbfff399c14021c26ffc48088cafd6027a4 -EBUILD prismlauncher-9999.ebuild 4600 BLAKE2B d0207b80c966a5e97178079fa08ed5acc7b037efba0be93b087fb7c66684da4c87c161f6015070644bc25342ebc6b450c1d105d1a321240ddafe2c2b80302d40 SHA512 078b277c295e526db95a39a6ac0fc36b6fd2176a3ae6312f0d4c2925a92dd7ef368820457b36cd4b5bd6d24ba91dca05289c27437aaf9003d4245217bf86ee8e +EBUILD prismlauncher-8.2-r1.ebuild 4646 BLAKE2B 9b15b424cc9c36cd79ac75c874c39bc65160dd69499795a463196eed44bda2fdbec4a8975abc2690ff2a90d386cd5f93c910ee9b1e799c47be88f82d3432ddd5 SHA512 fa99861333ea8fbd18957c4fb373492e37546ed431d4a1b5e3184ca579db21c9eb20bf7d87e4583cfb99db4db6ffe9ea575ff1f9a45aa76e198af43f8dd50853 +EBUILD prismlauncher-9999.ebuild 4622 BLAKE2B 0ba5af111c95e6f3cc679c1020fcfae33cb58fe690a51d1884ff696a4757077855a0cb659bc89ae5438d4ba8924f786d742f916ef6951d28cc0ca6161b95ccc4 SHA512 6de0ce1bcf1a34e16047951153c1d9b254b9c9e46a927aa56a2c79d42f88bef08ee898c5ce84a02af6a86db4de355c3fe37df18d2f6058fd34f5e3498e573708 MISC metadata.xml 1026 BLAKE2B 645b49b0a9848a1c8b48184bc3df7f1049b0292a90b19b391feda2f9f036af10adf6be79af266dfac0e032fa9524fdd39fd54cfdd71d9e63d5e221b5abd1ee7c SHA512 506f5cf43fc44bf192c17b52fab92a3e57bd87dff3226bbe5a7376040a23be5903a0c009a42dc71604d316f897e8d98f5fe53a04abe0758284b9e1b2b0e66a72 diff --git a/games-action/prismlauncher/prismlauncher-8.2-r1.ebuild b/games-action/prismlauncher/prismlauncher-8.2-r1.ebuild new file mode 100644 index 000000000000..862c412bfab6 --- /dev/null +++ b/games-action/prismlauncher/prismlauncher-8.2-r1.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake java-pkg-2 optfeature xdg + +DESCRIPTION="A custom, open source Minecraft launcher" +HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + + EGIT_REPO_URI=" + https://github.com/PrismLauncher/PrismLauncher + " + + # TODO: Add tomlplusplus as a system library, like quazip + EGIT_SUBMODULES=( '*' '-libraries/quazip' '-libraries/filesystem' '-libraries/zlib' '-libraries/extra-cmake-modules' '-libraries/cmark' ) +else + MY_PN="PrismLauncher" + + # Let's use the vendored tarball to avoid dealing with the submodules directly + SRC_URI=" + https://github.com/PrismLauncher/PrismLauncher/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz + " + + # The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV} + S="${WORKDIR}/${MY_PN}-${PV}" + + KEYWORDS="amd64 ~arm64" +fi + +# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself +# Apache-2.0 for MultiMC (PolyMC is forked from it) +# LGPL-3+ for libnbtplusplus +# MIT for tomlplusplus +# See the rest of PrismLauncher's libraries at https://github.com/PrismLauncher/PrismLauncher/tree/develop/libraries +LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT" + +SLOT="0" + +IUSE="debug lto qt6 test" +REQUIRED_USE=" + lto? ( !debug ) +" + +RESTRICT="!test? ( test )" + +MIN_QT_5_VERSION="5.12.0" +MIN_QT_6_VERSION="6.0.0" + +QT_DEPS=" + !qt6? ( + >=dev-qt/qtconcurrent-${MIN_QT_5_VERSION}:5 + >=dev-qt/qtcore-${MIN_QT_5_VERSION}:5 + >=dev-qt/qtgui-${MIN_QT_5_VERSION}:5 + >=dev-qt/qtnetwork-${MIN_QT_5_VERSION}:5 + >=dev-qt/qttest-${MIN_QT_5_VERSION}:5 + >=dev-qt/qtwidgets-${MIN_QT_5_VERSION}:5 + >=dev-qt/qtxml-${MIN_QT_5_VERSION}:5 + ) + + qt6? ( + >=dev-qt/qtbase-${MIN_QT_6_VERSION}:6[concurrent,gui,network,widgets,xml(+)] + >=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6 + ) +" + +# Required at both build-time and run-time +COMMON_DEPENDS=" + ${QT_DEPS} + + !qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] ) + qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] ) + + app-text/cmark + dev-cpp/tomlplusplus + sys-libs/zlib +" + +# The gulrak-filesystem dependency is only needed at build time, because we don't actually use it on Linux, +# only on legacy macOS. Still, we need it present at build time to appease CMake, and having it like this +# makes it easier to maintain than patching the CMakeLists file directly. +BDEPEND=" + app-text/scdoc + dev-cpp/gulrak-filesystem + kde-frameworks/extra-cmake-modules:0 +" + +DEPEND=" + ${COMMON_DEPENDS} + media-libs/libglvnd + >=virtual/jdk-1.8.0:* +" + +# At run-time we don't depend on JDK, only JRE +# And we need more than just the GL headers +RDEPEND=" + ${COMMON_DEPENDS} + + !qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 ) + qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 ) + + >=virtual/jre-1.8.0:* + virtual/opengl +" + +src_prepare() { + cmake_src_prepare + + local java="$(java-config -f)" + local java_version=${java//[^0-9]/} + if [[ ${java_version} -ge 20 ]]; then + elog "Java 20 and up has dropped binary compatibility with java 7." + elog "${PN} is being compiled with java ${java_version}." + elog "The sources will be patched to build binary compatible with" + elog "java 8 instead of java 7. This may cause issues with very old" + elog "Minecraft versions and/or older forge versions." + elog + elog "If you experience any problems, install an older java compiler" + elog "and select it with \"eselect java\", then recompile ${PN}." + eapply "${FILESDIR}/${P}-openjdk21.patch" + fi + + sed -i -e 's/-Werror//' CMakeLists.txt || die 'Failed to remove -Werror via sed' + + # Prevent conflicting with the user's flags + # See https://bugs.gentoo.org/848765 and https://bugs.gentoo.org/911858 for more info + sed -i -e "/CMAKE_CXX_FLAGS_RELEASE/d" CMakeLists.txt || die 'Failed to remove "CMAKE_CXX_FLAGS_RELEASE" from CMakeLists via sed' +} + +src_configure(){ + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="/usr" + # Resulting binary is named prismlauncher + -DLauncher_APP_BINARY_NAME="${PN}" + -DLauncher_BUILD_PLATFORM="Gentoo" + -DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5) + + -DENABLE_LTO=$(usex lto) + -DBUILD_TESTING=$(usex test) + -DDEBUG_ADDRESS_SANITIZER=0 + ) + + if use debug; then + CMAKE_BUILD_TYPE=Debug + else + CMAKE_BUILD_TYPE=Release + fi + + cmake_src_configure +} + +src_compile(){ + cmake_src_compile +} + +pkg_postinst() { + xdg_pkg_postinst + + # Original issue: https://github.com/PolyMC/PolyMC/issues/227 + optfeature "old Minecraft (<= 1.12.2) support" x11-apps/xrandr + + optfeature "built-in MangoHud support" games-util/mangohud + optfeature "built-in Feral Gamemode support" games-util/gamemode +} diff --git a/games-action/prismlauncher/prismlauncher-8.2.ebuild b/games-action/prismlauncher/prismlauncher-8.2.ebuild deleted file mode 100644 index 339a0532de76..000000000000 --- a/games-action/prismlauncher/prismlauncher-8.2.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake java-pkg-2 optfeature xdg - -DESCRIPTION="A custom, open source Minecraft launcher" -HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI=" - https://github.com/PrismLauncher/PrismLauncher - " - - # TODO: Add tomlplusplus as a system library, like quazip - EGIT_SUBMODULES=( '*' '-libraries/quazip' '-libraries/filesystem' '-libraries/zlib' '-libraries/extra-cmake-modules' '-libraries/cmark' ) -else - MY_PN="PrismLauncher" - - # Let's use the vendored tarball to avoid dealing with the submodules directly - SRC_URI=" - https://github.com/PrismLauncher/PrismLauncher/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz - " - - # The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV} - S="${WORKDIR}/${MY_PN}-${PV}" - - KEYWORDS="amd64 ~arm64" -fi - -# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself -# Apache-2.0 for MultiMC (PolyMC is forked from it) -# LGPL-3+ for libnbtplusplus -# MIT for tomlplusplus -# See the rest of PrismLauncher's libraries at https://github.com/PrismLauncher/PrismLauncher/tree/develop/libraries -LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT" - -SLOT="0" - -IUSE="debug lto qt6 test" -REQUIRED_USE=" - lto? ( !debug ) -" - -RESTRICT="!test? ( test )" - -MIN_QT_5_VERSION="5.12.0" -MIN_QT_6_VERSION="6.0.0" - -QT_DEPS=" - !qt6? ( - >=dev-qt/qtconcurrent-${MIN_QT_5_VERSION}:5 - >=dev-qt/qtcore-${MIN_QT_5_VERSION}:5 - >=dev-qt/qtgui-${MIN_QT_5_VERSION}:5 - >=dev-qt/qtnetwork-${MIN_QT_5_VERSION}:5 - >=dev-qt/qttest-${MIN_QT_5_VERSION}:5 - >=dev-qt/qtwidgets-${MIN_QT_5_VERSION}:5 - >=dev-qt/qtxml-${MIN_QT_5_VERSION}:5 - ) - - qt6? ( - >=dev-qt/qtbase-${MIN_QT_6_VERSION}:6[concurrent,gui,network,widgets,xml(+)] - >=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6 - ) -" - -# Required at both build-time and run-time -COMMON_DEPENDS=" - ${QT_DEPS} - - !qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] ) - qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] ) - - app-text/cmark - sys-libs/zlib -" - -# The gulrak-filesystem dependency is only needed at build time, because we don't actually use it on Linux, -# only on legacy macOS. Still, we need it present at build time to appease CMake, and having it like this -# makes it easier to maintain than patching the CMakeLists file directly. -BDEPEND=" - app-text/scdoc - dev-cpp/gulrak-filesystem - kde-frameworks/extra-cmake-modules:0 -" - -DEPEND=" - ${COMMON_DEPENDS} - media-libs/libglvnd - >=virtual/jdk-1.8.0:* -" - -# At run-time we don't depend on JDK, only JRE -# And we need more than just the GL headers -RDEPEND=" - ${COMMON_DEPENDS} - - !qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 ) - qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 ) - - >=virtual/jre-1.8.0:* - virtual/opengl -" - -src_prepare() { - cmake_src_prepare - - local java="$(java-config -f)" - local java_version=${java//[^0-9]/} - if [[ ${java_version} -ge 20 ]]; then - elog "Java 20 and up has dropped binary compatibility with java 7." - elog "${PN} is being compiled with java ${java_version}." - elog "The sources will be patched to build binary compatible with" - elog "java 8 instead of java 7. This may cause issues with very old" - elog "Minecraft versions and/or older forge versions." - elog - elog "If you experience any problems, install an older java compiler" - elog "and select it with \"eselect java\", then recompile ${PN}." - eapply "${FILESDIR}/${P}-openjdk21.patch" - fi - - sed -i -e 's/-Werror//' CMakeLists.txt || die 'Failed to remove -Werror via sed' - - # Prevent conflicting with the user's flags - # See https://bugs.gentoo.org/848765 and https://bugs.gentoo.org/911858 for more info - sed -i -e "/CMAKE_CXX_FLAGS_RELEASE/d" CMakeLists.txt || die 'Failed to remove "CMAKE_CXX_FLAGS_RELEASE" from CMakeLists via sed' -} - -src_configure(){ - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="/usr" - # Resulting binary is named prismlauncher - -DLauncher_APP_BINARY_NAME="${PN}" - -DLauncher_BUILD_PLATFORM="Gentoo" - -DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5) - - -DENABLE_LTO=$(usex lto) - -DBUILD_TESTING=$(usex test) - -DDEBUG_ADDRESS_SANITIZER=0 - ) - - if use debug; then - CMAKE_BUILD_TYPE=Debug - else - CMAKE_BUILD_TYPE=Release - fi - - cmake_src_configure -} - -src_compile(){ - cmake_src_compile -} - -pkg_postinst() { - xdg_pkg_postinst - - # Original issue: https://github.com/PolyMC/PolyMC/issues/227 - optfeature "old Minecraft (<= 1.12.2) support" x11-apps/xrandr - - optfeature "built-in MangoHud support" games-util/mangohud - optfeature "built-in Feral Gamemode support" games-util/gamemode -} diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild index 02f607f83f6c..5e485a25b6f6 100644 --- a/games-action/prismlauncher/prismlauncher-9999.ebuild +++ b/games-action/prismlauncher/prismlauncher-9999.ebuild @@ -75,6 +75,7 @@ COMMON_DEPENDS=" qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] ) app-text/cmark + dev-cpp/tomlplusplus sys-libs/zlib " -- cgit v1.2.3