From 23fb10c075a74a6504647a16c3e06a6378e208c8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 29 Jul 2022 09:06:52 +0100 Subject: gentoo auto-resync : 29:07:2022 - 09:06:52 --- games-action/polymc/Manifest | 6 +- games-action/polymc/polymc-1.3.1.ebuild | 115 ---------------------------- games-action/polymc/polymc-1.4.1.ebuild | 129 ++++++++++++++++++++++++++++++++ games-action/polymc/polymc-9999.ebuild | 30 ++++++-- 4 files changed, 154 insertions(+), 126 deletions(-) delete mode 100644 games-action/polymc/polymc-1.3.1.ebuild create mode 100644 games-action/polymc/polymc-1.4.1.ebuild (limited to 'games-action/polymc') diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest index a544f6955074..28725eeae367 100644 --- a/games-action/polymc/Manifest +++ b/games-action/polymc/Manifest @@ -1,6 +1,6 @@ -DIST polymc-1.3.1.tar.gz 5651471 BLAKE2B ee36d6f046959932c72d6b3320704bbc565afd56e03f715db0f9270148b7ced80ff46d4e2ad33167e77e9b95d5dbe3316d9c7b5f9b36c15e28989555fddf0239 SHA512 8cfd644574a588a0b8dca6adbd9aee21bd603fc29649bbf55ad713dc37a1a9d7a8720031a6952d97c6a597c082f7437315044926d7da2d50e58a3da096343c7b DIST polymc-1.3.2.tar.gz 5641952 BLAKE2B f1014c79c394db79e07bcd55c65c930ace80274a83cffc4c8adff58547f3ddf9baa5685ecd7b860c8ec21e4ae4ebf407233d3cb2b8d9ae2a81abd31248b1cebf SHA512 f272248631e76e2cb3b74f3bc91ab3d4f7e7cf4fb7396a09b8bcaf65d928076f49e436e3d7c1a34c32a2cbcf10760709f86cd9c0eca285b66790f25b1c466ea0 -EBUILD polymc-1.3.1.ebuild 2462 BLAKE2B da795feac3140106746b41392edb7fd006e16adccc7e342b3b9d3d6eb95bd0492c03b62dc59fb9e16bf0ada82cebab9c18d529f6293b234b25a63cb4beb9677e SHA512 22c654b5170529e7af3d9ec517517729f104c363026e8d26b7f10c10d3d7480f70ac04d05beb44770865aac1ef93284b8fcd7607d0673ba3809dcf8b09426ce1 +DIST polymc-1.4.1.tar.gz 5771113 BLAKE2B d55907770d913c814015c4337c0442cb3fdaf92815f3e2f1f496b7869b6da8ee2295260efc3df67e7407ee27d300c4e89900603281e69163c07df216193c05d9 SHA512 170d03b61d3e9edbe1a0b27812e52fb90963d09769327f2d95eab6c4b7c88291136f47a44b7c206808fcc2e0e9ddf4aeb3a3f267ccbdc6b70b44d91c4642bf75 EBUILD polymc-1.3.2.ebuild 2462 BLAKE2B da795feac3140106746b41392edb7fd006e16adccc7e342b3b9d3d6eb95bd0492c03b62dc59fb9e16bf0ada82cebab9c18d529f6293b234b25a63cb4beb9677e SHA512 22c654b5170529e7af3d9ec517517729f104c363026e8d26b7f10c10d3d7480f70ac04d05beb44770865aac1ef93284b8fcd7607d0673ba3809dcf8b09426ce1 -EBUILD polymc-9999.ebuild 2462 BLAKE2B da795feac3140106746b41392edb7fd006e16adccc7e342b3b9d3d6eb95bd0492c03b62dc59fb9e16bf0ada82cebab9c18d529f6293b234b25a63cb4beb9677e SHA512 22c654b5170529e7af3d9ec517517729f104c363026e8d26b7f10c10d3d7480f70ac04d05beb44770865aac1ef93284b8fcd7607d0673ba3809dcf8b09426ce1 +EBUILD polymc-1.4.1.ebuild 2914 BLAKE2B 7e9b232be3ace1e5d956136ea2f12842c1b701c8065180411ddfa0d53611d9c1a258afbdd8ebfa155c40dba2a7980532f2cebc5f51f9e977774fbc4ae8361865 SHA512 3780595a4b73ed6b358299e5247b07dec953cd99a1faf34eaaef8bb3453863aa784e298e14aca2ccbd8d061ee7a817f7225168582f545c31ef3c2ad1f04bd88f +EBUILD polymc-9999.ebuild 2914 BLAKE2B 7e9b232be3ace1e5d956136ea2f12842c1b701c8065180411ddfa0d53611d9c1a258afbdd8ebfa155c40dba2a7980532f2cebc5f51f9e977774fbc4ae8361865 SHA512 3780595a4b73ed6b358299e5247b07dec953cd99a1faf34eaaef8bb3453863aa784e298e14aca2ccbd8d061ee7a817f7225168582f545c31ef3c2ad1f04bd88f MISC metadata.xml 1088 BLAKE2B 5a9d980fb174d942db61bacb4e5b7d65b59f2ecbc91e4e4a5b15b91fc1abb1d6ab9e8acd3a9db6e526df1321e25120ba89f0802f859daae86a2269542b51db3a SHA512 1c2657370e99a198fc2dea81e9829509e0a49a0a87230cf51b6c695ea1f46a85c0a9a4c001c793b733eef2134db8966ba54d6188e4241095a330604dccc91f4b diff --git a/games-action/polymc/polymc-1.3.1.ebuild b/games-action/polymc/polymc-1.3.1.ebuild deleted file mode 100644 index 1034a30e5df0..000000000000 --- a/games-action/polymc/polymc-1.3.1.ebuild +++ /dev/null @@ -1,115 +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://polymc.org/ https://github.com/PolyMC/PolyMC" -DESCRIPTION="A custom, open source Minecraft launcher" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI=" - https://github.com/PolyMC/PolyMC - https://github.com/PolyMC/libnbtplusplus - " - - EGIT_SUBMODULES=( 'depends/libnbtplusplus' ) -else - MY_PN="PolyMC" - - # Let's use the vendored tarball to avoid dealing with the submodules directly - SRC_URI=" - https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz - " - - # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV} - S="${WORKDIR}/${MY_PN}-${PV}" - - KEYWORDS="~amd64" -fi - -# Apache-2.0 for MultiMC (PolyMC is forked from it) -# GPL-3 for PolyMC -# LGPL-3 for libnbtplusplus -# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries -LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT" - -SLOT="0" - -IUSE="debug lto" -REQUIRED_USE=" - lto? ( !debug ) -" - -MIN_QT="5.12.0" - -QT_DEPS=" - >=dev-qt/qtconcurrent-${MIN_QT}:5 - >=dev-qt/qtcore-${MIN_QT}:5 - >=dev-qt/qtgui-${MIN_QT}:5 - >=dev-qt/qtnetwork-${MIN_QT}:5 - >=dev-qt/qttest-${MIN_QT}:5 - >=dev-qt/qtwidgets-${MIN_QT}:5 - >=dev-qt/qtxml-${MIN_QT}:5 -" - -# Required at both build-time and run-time -COMMON_DEPENDS=" - ${QT_DEPS} - >=dev-libs/quazip-1.3:= - sys-libs/zlib -" - -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} - >=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 polymc - -DLauncher_APP_BINARY_NAME="${PN}" - - -DENABLE_LTO=$(usex lto) - ) - - 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 - - # https://github.com/PolyMC/PolyMC/issues/227 - optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr -} diff --git a/games-action/polymc/polymc-1.4.1.ebuild b/games-action/polymc/polymc-1.4.1.ebuild new file mode 100644 index 000000000000..508b1bf1a3e7 --- /dev/null +++ b/games-action/polymc/polymc-1.4.1.ebuild @@ -0,0 +1,129 @@ +# 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://polymc.org/ https://github.com/PolyMC/PolyMC" +DESCRIPTION="A custom, open source Minecraft launcher" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + + EGIT_REPO_URI=" + https://github.com/PolyMC/PolyMC + https://github.com/PolyMC/libnbtplusplus + " + + EGIT_SUBMODULES=( 'depends/libnbtplusplus' ) +else + MY_PN="PolyMC" + + # Let's use the vendored tarball to avoid dealing with the submodules directly + SRC_URI=" + https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz + " + + # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV} + S="${WORKDIR}/${MY_PN}-${PV}" + + KEYWORDS="~amd64" +fi + +# Apache-2.0 for MultiMC (PolyMC is forked from it) +# GPL-3 for PolyMC +# LGPL-3 for libnbtplusplus +# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries +LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT" + +SLOT="0" + +IUSE="debug lto test" +REQUIRED_USE=" + lto? ( !debug ) +" + +RESTRICT="!test? ( test )" + +MIN_QT="5.12.0" +QT_SLOT=5 + +QT_DEPS=" + >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT} + >=dev-qt/qttest-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT} +" + +# Required at both build-time and run-time +COMMON_DEPENDS=" + ${QT_DEPS} + >=dev-libs/quazip-1.3:= + sys-libs/zlib +" + +BDEPEND=" + app-text/scdoc + 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} + >=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 polymc + -DLauncher_APP_BINARY_NAME="${PN}" + # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things + -DLauncher_QT_VERSION_MAJOR=${QT_SLOT} + + -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 + + # https://github.com/PolyMC/PolyMC/issues/227 + optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr + + optfeature "built-in MangoHud support" games-util/mangohud + optfeature "built-in Feral Gamemode support" games-util/gamemode +} diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild index 1034a30e5df0..508b1bf1a3e7 100644 --- a/games-action/polymc/polymc-9999.ebuild +++ b/games-action/polymc/polymc-9999.ebuild @@ -39,21 +39,24 @@ LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT" SLOT="0" -IUSE="debug lto" +IUSE="debug lto test" REQUIRED_USE=" lto? ( !debug ) " +RESTRICT="!test? ( test )" + MIN_QT="5.12.0" +QT_SLOT=5 QT_DEPS=" - >=dev-qt/qtconcurrent-${MIN_QT}:5 - >=dev-qt/qtcore-${MIN_QT}:5 - >=dev-qt/qtgui-${MIN_QT}:5 - >=dev-qt/qtnetwork-${MIN_QT}:5 - >=dev-qt/qttest-${MIN_QT}:5 - >=dev-qt/qtwidgets-${MIN_QT}:5 - >=dev-qt/qtxml-${MIN_QT}:5 + >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT} + >=dev-qt/qttest-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT} " # Required at both build-time and run-time @@ -63,6 +66,11 @@ COMMON_DEPENDS=" sys-libs/zlib " +BDEPEND=" + app-text/scdoc + kde-frameworks/extra-cmake-modules:5 +" + DEPEND=" ${COMMON_DEPENDS} media-libs/libglvnd @@ -90,8 +98,11 @@ src_configure(){ -DCMAKE_INSTALL_PREFIX="/usr" # Resulting binary is named polymc -DLauncher_APP_BINARY_NAME="${PN}" + # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things + -DLauncher_QT_VERSION_MAJOR=${QT_SLOT} -DENABLE_LTO=$(usex lto) + -DBUILD_TESTING=$(usex test) ) if use debug; then @@ -112,4 +123,7 @@ pkg_postinst() { # https://github.com/PolyMC/PolyMC/issues/227 optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr + + optfeature "built-in MangoHud support" games-util/mangohud + optfeature "built-in Feral Gamemode support" games-util/gamemode } -- cgit v1.2.3