From b9e8f3cc44aed3b6da71c7510c6287bf7bbbc66b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Jun 2023 15:13:45 +0100 Subject: gentoo auto-resync : 14:06:2023 - 15:13:45 --- games-action/Manifest.gz | Bin 14534 -> 14529 bytes games-action/prismlauncher/Manifest | 6 +- .../prismlauncher/prismlauncher-6.1.ebuild | 147 -------------------- .../prismlauncher/prismlauncher-7.0.ebuild | 148 +++++++++++++++++++++ .../prismlauncher/prismlauncher-9999.ebuild | 5 +- 5 files changed, 154 insertions(+), 152 deletions(-) delete mode 100644 games-action/prismlauncher/prismlauncher-6.1.ebuild create mode 100644 games-action/prismlauncher/prismlauncher-7.0.ebuild (limited to 'games-action') diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz index 57488c1fd531..36d7a5c03be6 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 8b95553aa970..ea10263c7e93 100644 --- a/games-action/prismlauncher/Manifest +++ b/games-action/prismlauncher/Manifest @@ -1,6 +1,6 @@ -DIST prismlauncher-6.1.tar.gz 15238520 BLAKE2B 358c8b7377200598ec8f8f855db9b82c07aba82c939bacdb2d4af6c84a68306450f6d30fba97c9fdc3134f3c28abfc524a8853f36fbf5d32201a91635f22f5c8 SHA512 b4c55ee7bc3d71e13f1ca514b6fc4a0826e49ddb6c93c7d4f9d3fd226e6062a0678e29bf2736f3ae79e205f7c28e4b3782051b92dcd6293471e20d87f646ead5 DIST prismlauncher-6.3.tar.gz 15675450 BLAKE2B 6117172ad13c56c809755230cc9acd1a3987c9cc40bf80e853bfdcb319811ab5fd67cfe981a5301ac8a7bed7ef43f8d93fef31a368095fc8933d4782be7038fd SHA512 ccd37df6113b4c0460a6a2be6babed8d977d07a94f04e0dde65e185008158a4c99a6a991222de66756200b9aafcae8c441e4c30375306affcbe8e158b9242fc4 -EBUILD prismlauncher-6.1.ebuild 3776 BLAKE2B a78fc21882fc264cd422499b3e91ae56dac24894db301685f21ac0f6b4d62a6917492f4632bef83e9e5d675ab849d18c9536047185345cce5e1158a7f7efb2c4 SHA512 2f0a8dadab7d301b198996a0b009e8366eb4e84761e4f4c0fdb098e7150d79dfa53b430d255d5d91bab78935c2739b4d2f5e696b86f7fa31f1ce9da34f7bcf24 +DIST prismlauncher-7.0.tar.gz 17921335 BLAKE2B ed3c5e89ff6787ab3df8832f1b8f7381f27bf850fda296c056df5f891c180fcd82071727814a911f573905570637c192fbfad590491f75f6802e53b7564b1b43 SHA512 472eb12c10a68e914f11bba4b720f7f05930db2b33ef44d50962eec4ee88ecdb9ba43de1730bda81e3fdb8bbd2ea97bf1caa0da35af285b99307949b20f94d55 EBUILD prismlauncher-6.3.ebuild 3776 BLAKE2B 22d0869aada18c32aea52b71bd08c06a302c505fde70de2fb7db376911f75870c4771132a379d36c9b6dd881af80f08a53d30f38c97ad1cb772ec442ae443d3b SHA512 36323738a8eae87ffd85eecb89b4e2efba4d1402d805f353018dd8a89d44557907caaed8458177660e94cbbb57d46b5206718cf0c6b0905010ce3591455e3450 -EBUILD prismlauncher-9999.ebuild 3776 BLAKE2B a78fc21882fc264cd422499b3e91ae56dac24894db301685f21ac0f6b4d62a6917492f4632bef83e9e5d675ab849d18c9536047185345cce5e1158a7f7efb2c4 SHA512 2f0a8dadab7d301b198996a0b009e8366eb4e84761e4f4c0fdb098e7150d79dfa53b430d255d5d91bab78935c2739b4d2f5e696b86f7fa31f1ce9da34f7bcf24 +EBUILD prismlauncher-7.0.ebuild 3811 BLAKE2B 0856b09d2c2aaf4d0b277c68bfeca476f17ec70030598003a0c752313286b33fb3db11d75ed876c5e88d895be20a9ed731835e67de12321c8d1e6cd74494ae34 SHA512 6749113314875579a91725e5ea528f44378065bd98046c32a4b173c85a87671f086faec251fb1c7671823e34cd486a2e97d55c25c72f4ec54035c738ba52722c +EBUILD prismlauncher-9999.ebuild 3811 BLAKE2B 0856b09d2c2aaf4d0b277c68bfeca476f17ec70030598003a0c752313286b33fb3db11d75ed876c5e88d895be20a9ed731835e67de12321c8d1e6cd74494ae34 SHA512 6749113314875579a91725e5ea528f44378065bd98046c32a4b173c85a87671f086faec251fb1c7671823e34cd486a2e97d55c25c72f4ec54035c738ba52722c MISC metadata.xml 1084 BLAKE2B 7def85b6f71b9b18fc987e89c3c2c3e32eaef060183e05a1be179eefe322258c7f83c84066e7300df87c62857e66c2499943db960f45e6532d803b671aa028b9 SHA512 0f893adce9d7b7b259226da5047b594774930afbf25d5a933dbfc9d7247380ae255b97d765ef0b07814101cd017c3c4852131d2f38b57acae0961b4b4606da0e diff --git a/games-action/prismlauncher/prismlauncher-6.1.ebuild b/games-action/prismlauncher/prismlauncher-6.1.ebuild deleted file mode 100644 index 2c80e3d6509d..000000000000 --- a/games-action/prismlauncher/prismlauncher-6.1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake java-pkg-2 optfeature xdg - -HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher" -DESCRIPTION="A custom, open source Minecraft launcher" - -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' ) -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(-)] ) - - 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:5 -" - -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 - - # Prevent conflicting with the user's flags - # See https://bugs.gentoo.org/848765 for more info - sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed' -} - -src_configure(){ - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="/usr" - # Resulting binary is named prismlauncher - -DLauncher_APP_BINARY_NAME="${PN}" - -DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5) - - -DENABLE_LTO=$(usex lto) - -DBUILD_TESTING=$(usex test) - ) - - 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-7.0.ebuild b/games-action/prismlauncher/prismlauncher-7.0.ebuild new file mode 100644 index 000000000000..19ea1c798175 --- /dev/null +++ b/games-action/prismlauncher/prismlauncher-7.0.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake java-pkg-2 optfeature xdg + +HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher" +DESCRIPTION="A custom, open source Minecraft launcher" + +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(-)] ) + + 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/cmark + app-text/scdoc + dev-cpp/gulrak-filesystem + kde-frameworks/extra-cmake-modules:5 +" + +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 + + # Prevent conflicting with the user's flags + # See https://bugs.gentoo.org/848765 for more info + sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed' +} + +src_configure(){ + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="/usr" + # Resulting binary is named prismlauncher + -DLauncher_APP_BINARY_NAME="${PN}" + -DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5) + + -DENABLE_LTO=$(usex lto) + -DBUILD_TESTING=$(usex test) + ) + + 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 2c80e3d6509d..19ea1c798175 100644 --- a/games-action/prismlauncher/prismlauncher-9999.ebuild +++ b/games-action/prismlauncher/prismlauncher-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then " # TODO: Add tomlplusplus as a system library, like quazip - EGIT_SUBMODULES=( '*' '-libraries/quazip' '-libraries/filesystem' '-libraries/zlib' '-libraries/extra-cmake-modules' ) + EGIT_SUBMODULES=( '*' '-libraries/quazip' '-libraries/filesystem' '-libraries/zlib' '-libraries/extra-cmake-modules' '-libraries/cmark' ) else MY_PN="PrismLauncher" @@ -81,6 +81,7 @@ COMMON_DEPENDS=" # 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/cmark app-text/scdoc dev-cpp/gulrak-filesystem kde-frameworks/extra-cmake-modules:5 -- cgit v1.2.3