* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-10-20 4:25 Sam James
0 siblings, 0 replies; 46+ messages in thread
From: Sam James @ 2022-10-20 4:25 UTC (permalink / raw
To: gentoo-commits
commit: a6e70576e0d401a87ab4dd51f9be72e0e5bbaf1e
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Wed Oct 19 22:02:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 04:22:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6e70576
games-action/prismlauncher: use system gulrak-filesystem
This replaces the bundled one, like what's done with quazip.
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-9999.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index 0c3fb958fff1..ae1e581ba2f0 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
"
# TODO: Add tomlplusplus as a system library, like quazip
- EGIT_SUBMODULES=( '*' '-libraries/quazip' )
+ EGIT_SUBMODULES=( '*' '-libraries/quazip' '-libraries/filesystem' )
else
MY_PN="PrismLauncher"
@@ -77,8 +77,12 @@ COMMON_DEPENDS="
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
"
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-10-20 4:25 Sam James
0 siblings, 0 replies; 46+ messages in thread
From: Sam James @ 2022-10-20 4:25 UTC (permalink / raw
To: gentoo-commits
commit: a56bea75ed3a0b6795a4c2446422ef38367e13a6
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Wed Oct 19 00:13:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 04:22:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56bea75
games-action/prismlauncher: new package, add 9999
This is mostly an adaptation of the games-action/polymc ebuild,
considering we're a 2-day old fork of it.
Bug: https://bugs.gentoo.org/877495
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/prismlauncher/metadata.xml | 26 ++++
.../prismlauncher/prismlauncher-9999.ebuild | 143 +++++++++++++++++++++
2 files changed, 169 insertions(+)
diff --git a/games-action/prismlauncher/metadata.xml b/games-action/prismlauncher/metadata.xml
new file mode 100644
index 000000000000..f54dc7d44a8d
--- /dev/null
+++ b/games-action/prismlauncher/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>flowlnlnln@gmail.com</email>
+ <name>Thiago Donato Ferreira</name>
+ </maintainer>
+ <maintainer type="person" proxied="proxy">
+ <email>andrewammerlaan@gentoo.org</email>
+ <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://github.com/PrismLauncher/PrismLauncher/issues</bugs-to>
+ <doc>https://prismlauncher.org/wiki/</doc>
+ <remote-id type="github">PrismLauncher/PrismLauncher</remote-id>
+ </upstream>
+ <longdescription>Prism Launcher is a multi-instance Minecraft launcher focused on user freedom, redistributability, and simplicity.</longdescription>
+ <use>
+ <flag name="lto">Enable link-time optimization</flag>
+ <flag name="qt6">Build with Qt6 support instead of the default Qt5</flag>
+ </use>
+</pkgmetadata>
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
new file mode 100644
index 000000000000..0c3fb958fff1
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -0,0 +1,143 @@
+# 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' )
+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"
+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
+"
+
+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}
+
+ !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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-10-20 4:25 Sam James
0 siblings, 0 replies; 46+ messages in thread
From: Sam James @ 2022-10-20 4:25 UTC (permalink / raw
To: gentoo-commits
commit: cacfa151958efec7c8e5f893e98809e15d6b0c28
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Wed Oct 19 22:03:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 04:22:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cacfa151
games-action/prismlauncher: add 5.0
Bug: https://bugs.gentoo.org/877495
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27860
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-5.0.ebuild | 147 +++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
new file mode 100644
index 000000000000..6ee941d3ab73
--- /dev/null
+++ b/games-action/prismlauncher/Manifest
@@ -0,0 +1 @@
+DIST prismlauncher-5.0.tar.gz 9379431 BLAKE2B 0406b0e706068d32eaed427c5475b1388144b6155a69cf29674e7b45de84c86ca872615b6ec64602e942f155061630c7a866800e24ccb7546c2a32bf298380cf SHA512 71f19603a2e09d581ed80bbef6a3cd4a2c3081ba820fad8d73ebab155075d7a84e17ce9f70490a8984e7cb6a5d35089efb77bb5c364c4580fe4a8759fa79313d
diff --git a/games-action/prismlauncher/prismlauncher-5.0.ebuild b/games-action/prismlauncher/prismlauncher-5.0.ebuild
new file mode 100644
index 000000000000..ae1e581ba2f0
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-5.0.ebuild
@@ -0,0 +1,147 @@
+# 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' )
+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"
+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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-10-20 4:25 Sam James
0 siblings, 0 replies; 46+ messages in thread
From: Sam James @ 2022-10-20 4:25 UTC (permalink / raw
To: gentoo-commits
commit: 53cbf3cf4dd1b3c608bab9994aa8b1af6c40341a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 04:22:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 04:22:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53cbf3cf
games-action/prismlauncher: add !games-action/polymc
They may install the same JAR files.
Bug: https://github.com/gentoo/gentoo/pull/27860
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-5.0.ebuild | 2 ++
games-action/prismlauncher/prismlauncher-9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/games-action/prismlauncher/prismlauncher-5.0.ebuild b/games-action/prismlauncher/prismlauncher-5.0.ebuild
index ae1e581ba2f0..1de25bc2a4f4 100644
--- a/games-action/prismlauncher/prismlauncher-5.0.ebuild
+++ b/games-action/prismlauncher/prismlauncher-5.0.ebuild
@@ -97,6 +97,8 @@ DEPEND="
RDEPEND="
${COMMON_DEPENDS}
+ !games-action/polymc
+
!qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 )
qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 )
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index ae1e581ba2f0..1de25bc2a4f4 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -97,6 +97,8 @@ DEPEND="
RDEPEND="
${COMMON_DEPENDS}
+ !games-action/polymc
+
!qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 )
qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 )
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-10-20 12:23 Jakov Smolić
0 siblings, 0 replies; 46+ messages in thread
From: Jakov Smolić @ 2022-10-20 12:23 UTC (permalink / raw
To: gentoo-commits
commit: 7fb8f3e274a5cfe1230810b155930205daf3adeb
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 12:23:34 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 12:23:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb8f3e2
games-action/prismlauncher: Keyword 5.0 arm64, #877739
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/prismlauncher/prismlauncher-5.0.ebuild b/games-action/prismlauncher/prismlauncher-5.0.ebuild
index 1de25bc2a4f4..cfd7ead1c78c 100644
--- a/games-action/prismlauncher/prismlauncher-5.0.ebuild
+++ b/games-action/prismlauncher/prismlauncher-5.0.ebuild
@@ -28,7 +28,7 @@ else
# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
S="${WORKDIR}/${MY_PN}-${PV}"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm64"
fi
# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-11-02 11:49 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2022-11-02 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 1cf6aa60bd7096a235c561072ade8bbbc04e0c83
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Tue Nov 1 15:40:33 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Nov 2 11:49:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf6aa60
games-action/prismlauncher: add 5.1
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-5.1.ebuild | 147 +++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 6ee941d3ab73..2e0d7ab91d60 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1 +1,2 @@
DIST prismlauncher-5.0.tar.gz 9379431 BLAKE2B 0406b0e706068d32eaed427c5475b1388144b6155a69cf29674e7b45de84c86ca872615b6ec64602e942f155061630c7a866800e24ccb7546c2a32bf298380cf SHA512 71f19603a2e09d581ed80bbef6a3cd4a2c3081ba820fad8d73ebab155075d7a84e17ce9f70490a8984e7cb6a5d35089efb77bb5c364c4580fe4a8759fa79313d
+DIST prismlauncher-5.1.tar.gz 9401315 BLAKE2B 22a0508efc042a78099d0458d305c623465533d9770b111e584f4591cbd9372b354501fb3edf941f4c9f744f3540bd793c00f1ca428705bd2ca140be87056575 SHA512 2e0de23040b26c3bf9d3758b3c8ee0db6516edab9d25d64beca6ddde4c039d88655349895a1ab15b63c8c2e26f3fedbf2ef9f9c14ce5a86149aa75374c24cd5f
diff --git a/games-action/prismlauncher/prismlauncher-5.1.ebuild b/games-action/prismlauncher/prismlauncher-5.1.ebuild
new file mode 100644
index 000000000000..ae1e581ba2f0
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-5.1.ebuild
@@ -0,0 +1,147 @@
+# 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' )
+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"
+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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-11-02 11:49 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2022-11-02 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 78397b76c7cfcbff8d795799a0dcb8cff7340bdb
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Tue Nov 1 16:16:38 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Nov 2 11:49:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78397b76
games-action/prismlauncher: add ~arm64 keywording to 5.1 and -9999
This propagates the keywording on 5.0 to the other ebuilds.
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28080
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-5.1.ebuild | 2 +-
games-action/prismlauncher/prismlauncher-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-action/prismlauncher/prismlauncher-5.1.ebuild b/games-action/prismlauncher/prismlauncher-5.1.ebuild
index ae1e581ba2f0..ad60b690649f 100644
--- a/games-action/prismlauncher/prismlauncher-5.1.ebuild
+++ b/games-action/prismlauncher/prismlauncher-5.1.ebuild
@@ -28,7 +28,7 @@ else
# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
S="${WORKDIR}/${MY_PN}-${PV}"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm64"
fi
# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index ae1e581ba2f0..ad60b690649f 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -28,7 +28,7 @@ else
# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
S="${WORKDIR}/${MY_PN}-${PV}"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm64"
fi
# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-11-02 11:49 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2022-11-02 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 40fa999ecf00065a72dcf9f6ee08e653436b18ed
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Tue Nov 1 10:06:04 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Nov 2 11:49:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40fa999e
games-action/prismlauncher: remove !games-action/polymc
We now install JAR files in a Prism-exclusive location, so there's no
more conflict with PolyMC
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-9999.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index 1de25bc2a4f4..ae1e581ba2f0 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -97,8 +97,6 @@ DEPEND="
RDEPEND="
${COMMON_DEPENDS}
- !games-action/polymc
-
!qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 )
qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 )
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-11-15 21:03 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2022-11-15 21:03 UTC (permalink / raw
To: gentoo-commits
commit: 738e102233faf498e1d3c06db700b92969804319
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Tue Nov 15 17:22:23 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 21:00:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=738e1022
games-action/prismlauncher: add 5.2
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Larry the Cow <larry <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-5.2.ebuild | 147 +++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 2e0d7ab91d60..2802b51087aa 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,2 +1,3 @@
DIST prismlauncher-5.0.tar.gz 9379431 BLAKE2B 0406b0e706068d32eaed427c5475b1388144b6155a69cf29674e7b45de84c86ca872615b6ec64602e942f155061630c7a866800e24ccb7546c2a32bf298380cf SHA512 71f19603a2e09d581ed80bbef6a3cd4a2c3081ba820fad8d73ebab155075d7a84e17ce9f70490a8984e7cb6a5d35089efb77bb5c364c4580fe4a8759fa79313d
DIST prismlauncher-5.1.tar.gz 9401315 BLAKE2B 22a0508efc042a78099d0458d305c623465533d9770b111e584f4591cbd9372b354501fb3edf941f4c9f744f3540bd793c00f1ca428705bd2ca140be87056575 SHA512 2e0de23040b26c3bf9d3758b3c8ee0db6516edab9d25d64beca6ddde4c039d88655349895a1ab15b63c8c2e26f3fedbf2ef9f9c14ce5a86149aa75374c24cd5f
+DIST prismlauncher-5.2.tar.gz 8772931 BLAKE2B 95c5be2a177086ba15a1d14a85f8a0edb349bcfbe4e9adff9dcca5c4a8dbf00d3ec49e30a2c99cfbeca2a7617ccaba6cf1f86bd396c1bf9b306c0ad5c1f4a3c7 SHA512 96a5fbf7c5d80da72377a4d8e9df16d4f9597a5764386f5b60d520d84fe319f8b6fbb3f89715214a037a70c440e418eb72e933a911d253fad93fbda9213d16e5
diff --git a/games-action/prismlauncher/prismlauncher-5.2.ebuild b/games-action/prismlauncher/prismlauncher-5.2.ebuild
new file mode 100644
index 000000000000..ad60b690649f
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-5.2.ebuild
@@ -0,0 +1,147 @@
+# 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' )
+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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-11-15 21:03 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2022-11-15 21:03 UTC (permalink / raw
To: gentoo-commits
commit: 4923128a80b2a59ad47935cdf6dd8d13c4d5ab70
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Tue Nov 15 17:22:41 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 21:00:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4923128a
games-action/prismlauncher: drop 5.0
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28288
Signed-off-by: Larry the Cow <larry <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 -
.../prismlauncher/prismlauncher-5.0.ebuild | 149 ---------------------
2 files changed, 150 deletions(-)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 2802b51087aa..a67273d1d76f 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,3 +1,2 @@
-DIST prismlauncher-5.0.tar.gz 9379431 BLAKE2B 0406b0e706068d32eaed427c5475b1388144b6155a69cf29674e7b45de84c86ca872615b6ec64602e942f155061630c7a866800e24ccb7546c2a32bf298380cf SHA512 71f19603a2e09d581ed80bbef6a3cd4a2c3081ba820fad8d73ebab155075d7a84e17ce9f70490a8984e7cb6a5d35089efb77bb5c364c4580fe4a8759fa79313d
DIST prismlauncher-5.1.tar.gz 9401315 BLAKE2B 22a0508efc042a78099d0458d305c623465533d9770b111e584f4591cbd9372b354501fb3edf941f4c9f744f3540bd793c00f1ca428705bd2ca140be87056575 SHA512 2e0de23040b26c3bf9d3758b3c8ee0db6516edab9d25d64beca6ddde4c039d88655349895a1ab15b63c8c2e26f3fedbf2ef9f9c14ce5a86149aa75374c24cd5f
DIST prismlauncher-5.2.tar.gz 8772931 BLAKE2B 95c5be2a177086ba15a1d14a85f8a0edb349bcfbe4e9adff9dcca5c4a8dbf00d3ec49e30a2c99cfbeca2a7617ccaba6cf1f86bd396c1bf9b306c0ad5c1f4a3c7 SHA512 96a5fbf7c5d80da72377a4d8e9df16d4f9597a5764386f5b60d520d84fe319f8b6fbb3f89715214a037a70c440e418eb72e933a911d253fad93fbda9213d16e5
diff --git a/games-action/prismlauncher/prismlauncher-5.0.ebuild b/games-action/prismlauncher/prismlauncher-5.0.ebuild
deleted file mode 100644
index cfd7ead1c78c..000000000000
--- a/games-action/prismlauncher/prismlauncher-5.0.ebuild
+++ /dev/null
@@ -1,149 +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' )
-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}
-
- !games-action/polymc
-
- !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
-}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-11-15 22:24 Sam James
0 siblings, 0 replies; 46+ messages in thread
From: Sam James @ 2022-11-15 22:24 UTC (permalink / raw
To: gentoo-commits
commit: 8b554583afbc464866b8a17d66b2a19906d671ae
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 22:22:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 22:23:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b554583
Revert "games-action/prismlauncher: add 5.2"
This reverts commit 738e102233faf498e1d3c06db700b92969804319.
Wrong Signed-off-by / git author. Innocent mistake but let's
revert for accuracy. PGP signature is from andrewammerlaan <AT> gentoo.org
so nothing nefarious going on.
Bug: https://github.com/gentoo/gentoo/pull/28288
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 -
.../prismlauncher/prismlauncher-5.2.ebuild | 147 ---------------------
2 files changed, 148 deletions(-)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index a67273d1d76f..3521bda3e2dc 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,2 +1 @@
DIST prismlauncher-5.1.tar.gz 9401315 BLAKE2B 22a0508efc042a78099d0458d305c623465533d9770b111e584f4591cbd9372b354501fb3edf941f4c9f744f3540bd793c00f1ca428705bd2ca140be87056575 SHA512 2e0de23040b26c3bf9d3758b3c8ee0db6516edab9d25d64beca6ddde4c039d88655349895a1ab15b63c8c2e26f3fedbf2ef9f9c14ce5a86149aa75374c24cd5f
-DIST prismlauncher-5.2.tar.gz 8772931 BLAKE2B 95c5be2a177086ba15a1d14a85f8a0edb349bcfbe4e9adff9dcca5c4a8dbf00d3ec49e30a2c99cfbeca2a7617ccaba6cf1f86bd396c1bf9b306c0ad5c1f4a3c7 SHA512 96a5fbf7c5d80da72377a4d8e9df16d4f9597a5764386f5b60d520d84fe319f8b6fbb3f89715214a037a70c440e418eb72e933a911d253fad93fbda9213d16e5
diff --git a/games-action/prismlauncher/prismlauncher-5.2.ebuild b/games-action/prismlauncher/prismlauncher-5.2.ebuild
deleted file mode 100644
index ad60b690649f..000000000000
--- a/games-action/prismlauncher/prismlauncher-5.2.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' )
-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
-}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-11-15 22:24 Sam James
0 siblings, 0 replies; 46+ messages in thread
From: Sam James @ 2022-11-15 22:24 UTC (permalink / raw
To: gentoo-commits
commit: ce19206213b6e486a0c004b5787ce3a4a729d471
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 22:23:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 22:24:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce192062
Revert "games-action/prismlauncher: drop 5.0"
This reverts commit 4923128a80b2a59ad47935cdf6dd8d13c4d5ab70.
Wrong Signed-off-by / git author. Innocent mistake but let's
revert for accuracy. PGP signature is from andrewammerlaan <AT> gentoo.org
so nothing nefarious going on.
Bug: https://github.com/gentoo/gentoo/pull/28288
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-5.0.ebuild | 149 +++++++++++++++++++++
2 files changed, 150 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 3521bda3e2dc..2e0d7ab91d60 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1 +1,2 @@
+DIST prismlauncher-5.0.tar.gz 9379431 BLAKE2B 0406b0e706068d32eaed427c5475b1388144b6155a69cf29674e7b45de84c86ca872615b6ec64602e942f155061630c7a866800e24ccb7546c2a32bf298380cf SHA512 71f19603a2e09d581ed80bbef6a3cd4a2c3081ba820fad8d73ebab155075d7a84e17ce9f70490a8984e7cb6a5d35089efb77bb5c364c4580fe4a8759fa79313d
DIST prismlauncher-5.1.tar.gz 9401315 BLAKE2B 22a0508efc042a78099d0458d305c623465533d9770b111e584f4591cbd9372b354501fb3edf941f4c9f744f3540bd793c00f1ca428705bd2ca140be87056575 SHA512 2e0de23040b26c3bf9d3758b3c8ee0db6516edab9d25d64beca6ddde4c039d88655349895a1ab15b63c8c2e26f3fedbf2ef9f9c14ce5a86149aa75374c24cd5f
diff --git a/games-action/prismlauncher/prismlauncher-5.0.ebuild b/games-action/prismlauncher/prismlauncher-5.0.ebuild
new file mode 100644
index 000000000000..cfd7ead1c78c
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-5.0.ebuild
@@ -0,0 +1,149 @@
+# 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' )
+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}
+
+ !games-action/polymc
+
+ !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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-11-16 9:26 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2022-11-16 9:26 UTC (permalink / raw
To: gentoo-commits
commit: 91780d16764a3bcabfcf1793027f23002c71b49e
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Tue Nov 15 17:22:23 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 09:25:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91780d16
games-action/prismlauncher: add 5.2
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-5.2.ebuild | 147 +++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 2e0d7ab91d60..2802b51087aa 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,2 +1,3 @@
DIST prismlauncher-5.0.tar.gz 9379431 BLAKE2B 0406b0e706068d32eaed427c5475b1388144b6155a69cf29674e7b45de84c86ca872615b6ec64602e942f155061630c7a866800e24ccb7546c2a32bf298380cf SHA512 71f19603a2e09d581ed80bbef6a3cd4a2c3081ba820fad8d73ebab155075d7a84e17ce9f70490a8984e7cb6a5d35089efb77bb5c364c4580fe4a8759fa79313d
DIST prismlauncher-5.1.tar.gz 9401315 BLAKE2B 22a0508efc042a78099d0458d305c623465533d9770b111e584f4591cbd9372b354501fb3edf941f4c9f744f3540bd793c00f1ca428705bd2ca140be87056575 SHA512 2e0de23040b26c3bf9d3758b3c8ee0db6516edab9d25d64beca6ddde4c039d88655349895a1ab15b63c8c2e26f3fedbf2ef9f9c14ce5a86149aa75374c24cd5f
+DIST prismlauncher-5.2.tar.gz 8772931 BLAKE2B 95c5be2a177086ba15a1d14a85f8a0edb349bcfbe4e9adff9dcca5c4a8dbf00d3ec49e30a2c99cfbeca2a7617ccaba6cf1f86bd396c1bf9b306c0ad5c1f4a3c7 SHA512 96a5fbf7c5d80da72377a4d8e9df16d4f9597a5764386f5b60d520d84fe319f8b6fbb3f89715214a037a70c440e418eb72e933a911d253fad93fbda9213d16e5
diff --git a/games-action/prismlauncher/prismlauncher-5.2.ebuild b/games-action/prismlauncher/prismlauncher-5.2.ebuild
new file mode 100644
index 000000000000..ad60b690649f
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-5.2.ebuild
@@ -0,0 +1,147 @@
+# 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' )
+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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-11-16 9:26 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2022-11-16 9:26 UTC (permalink / raw
To: gentoo-commits
commit: 65ea1aa24139261f9a61f2648be81e729aafbda2
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Tue Nov 15 17:22:41 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 09:25:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65ea1aa2
games-action/prismlauncher: drop 5.0
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28288
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 -
.../prismlauncher/prismlauncher-5.0.ebuild | 149 ---------------------
2 files changed, 150 deletions(-)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 2802b51087aa..a67273d1d76f 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,3 +1,2 @@
-DIST prismlauncher-5.0.tar.gz 9379431 BLAKE2B 0406b0e706068d32eaed427c5475b1388144b6155a69cf29674e7b45de84c86ca872615b6ec64602e942f155061630c7a866800e24ccb7546c2a32bf298380cf SHA512 71f19603a2e09d581ed80bbef6a3cd4a2c3081ba820fad8d73ebab155075d7a84e17ce9f70490a8984e7cb6a5d35089efb77bb5c364c4580fe4a8759fa79313d
DIST prismlauncher-5.1.tar.gz 9401315 BLAKE2B 22a0508efc042a78099d0458d305c623465533d9770b111e584f4591cbd9372b354501fb3edf941f4c9f744f3540bd793c00f1ca428705bd2ca140be87056575 SHA512 2e0de23040b26c3bf9d3758b3c8ee0db6516edab9d25d64beca6ddde4c039d88655349895a1ab15b63c8c2e26f3fedbf2ef9f9c14ce5a86149aa75374c24cd5f
DIST prismlauncher-5.2.tar.gz 8772931 BLAKE2B 95c5be2a177086ba15a1d14a85f8a0edb349bcfbe4e9adff9dcca5c4a8dbf00d3ec49e30a2c99cfbeca2a7617ccaba6cf1f86bd396c1bf9b306c0ad5c1f4a3c7 SHA512 96a5fbf7c5d80da72377a4d8e9df16d4f9597a5764386f5b60d520d84fe319f8b6fbb3f89715214a037a70c440e418eb72e933a911d253fad93fbda9213d16e5
diff --git a/games-action/prismlauncher/prismlauncher-5.0.ebuild b/games-action/prismlauncher/prismlauncher-5.0.ebuild
deleted file mode 100644
index cfd7ead1c78c..000000000000
--- a/games-action/prismlauncher/prismlauncher-5.0.ebuild
+++ /dev/null
@@ -1,149 +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' )
-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}
-
- !games-action/polymc
-
- !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
-}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-12-12 17:56 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2022-12-12 17:56 UTC (permalink / raw
To: gentoo-commits
commit: 4618b75f3d29a6bee3a9c123da960c04f34f67ba
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Mon Dec 12 17:35:07 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 17:55:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4618b75f
games-action/prismlauncher: drop 5.1
Since 5.2, a fix for LTO compilation was applied upstream.
Closes: https://bugs.gentoo.org/878877
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28648
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 -
.../prismlauncher/prismlauncher-5.1.ebuild | 147 ---------------------
2 files changed, 148 deletions(-)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 1affee076b7f..bf9976f829a5 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,3 +1,2 @@
-DIST prismlauncher-5.1.tar.gz 9401315 BLAKE2B 22a0508efc042a78099d0458d305c623465533d9770b111e584f4591cbd9372b354501fb3edf941f4c9f744f3540bd793c00f1ca428705bd2ca140be87056575 SHA512 2e0de23040b26c3bf9d3758b3c8ee0db6516edab9d25d64beca6ddde4c039d88655349895a1ab15b63c8c2e26f3fedbf2ef9f9c14ce5a86149aa75374c24cd5f
DIST prismlauncher-5.2.tar.gz 8772931 BLAKE2B 95c5be2a177086ba15a1d14a85f8a0edb349bcfbe4e9adff9dcca5c4a8dbf00d3ec49e30a2c99cfbeca2a7617ccaba6cf1f86bd396c1bf9b306c0ad5c1f4a3c7 SHA512 96a5fbf7c5d80da72377a4d8e9df16d4f9597a5764386f5b60d520d84fe319f8b6fbb3f89715214a037a70c440e418eb72e933a911d253fad93fbda9213d16e5
DIST prismlauncher-6.0.tar.gz 15242433 BLAKE2B 33f99a4c8ca5ace049035edec217890116cbb6cb7b88061d010677d3c5167a986b02116a4fe92e780636e1771e90a550902a9a19e33aa750d90fca6e23761199 SHA512 d80fe1dd1d057003acb8cf9a0f0bf793b346932e068ac516f7f6e6fbed69e1485a9267f7b37f4d6659385e3b01a3f1b41b5ae208ceaaddda0b4e5caf4ac8119f
diff --git a/games-action/prismlauncher/prismlauncher-5.1.ebuild b/games-action/prismlauncher/prismlauncher-5.1.ebuild
deleted file mode 100644
index ad60b690649f..000000000000
--- a/games-action/prismlauncher/prismlauncher-5.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' )
-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
-}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-12-12 17:56 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2022-12-12 17:56 UTC (permalink / raw
To: gentoo-commits
commit: b5ecbb3d9a74a7120c79b07874f8283fbb257917
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sun Dec 11 12:24:46 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 17:55:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5ecbb3d
games-action/prismlauncher: prefer system zlib and ECM over bundled ones
There's no need to clone the subprojects and compile them if the user
already has it on their system.
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index ad60b690649f..2c80e3d6509d 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
"
# TODO: Add tomlplusplus as a system library, like quazip
- EGIT_SUBMODULES=( '*' '-libraries/quazip' '-libraries/filesystem' )
+ EGIT_SUBMODULES=( '*' '-libraries/quazip' '-libraries/filesystem' '-libraries/zlib' '-libraries/extra-cmake-modules' )
else
MY_PN="PrismLauncher"
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-12-12 17:56 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2022-12-12 17:56 UTC (permalink / raw
To: gentoo-commits
commit: f156a0a2d432dccd3beb270f14b4d2874aaa1247
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Mon Dec 12 17:33:36 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 17:55:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f156a0a2
games-action/prismlauncher: add 6.0
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-6.0.ebuild | 147 +++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index a67273d1d76f..1affee076b7f 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,2 +1,3 @@
DIST prismlauncher-5.1.tar.gz 9401315 BLAKE2B 22a0508efc042a78099d0458d305c623465533d9770b111e584f4591cbd9372b354501fb3edf941f4c9f744f3540bd793c00f1ca428705bd2ca140be87056575 SHA512 2e0de23040b26c3bf9d3758b3c8ee0db6516edab9d25d64beca6ddde4c039d88655349895a1ab15b63c8c2e26f3fedbf2ef9f9c14ce5a86149aa75374c24cd5f
DIST prismlauncher-5.2.tar.gz 8772931 BLAKE2B 95c5be2a177086ba15a1d14a85f8a0edb349bcfbe4e9adff9dcca5c4a8dbf00d3ec49e30a2c99cfbeca2a7617ccaba6cf1f86bd396c1bf9b306c0ad5c1f4a3c7 SHA512 96a5fbf7c5d80da72377a4d8e9df16d4f9597a5764386f5b60d520d84fe319f8b6fbb3f89715214a037a70c440e418eb72e933a911d253fad93fbda9213d16e5
+DIST prismlauncher-6.0.tar.gz 15242433 BLAKE2B 33f99a4c8ca5ace049035edec217890116cbb6cb7b88061d010677d3c5167a986b02116a4fe92e780636e1771e90a550902a9a19e33aa750d90fca6e23761199 SHA512 d80fe1dd1d057003acb8cf9a0f0bf793b346932e068ac516f7f6e6fbed69e1485a9267f7b37f4d6659385e3b01a3f1b41b5ae208ceaaddda0b4e5caf4ac8119f
diff --git a/games-action/prismlauncher/prismlauncher-6.0.ebuild b/games-action/prismlauncher/prismlauncher-6.0.ebuild
new file mode 100644
index 000000000000..2c80e3d6509d
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-6.0.ebuild
@@ -0,0 +1,147 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-12-20 9:54 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2022-12-20 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 8c5ec2c9db6ede3d0b8f44a067cc9760d94fb40f
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Mon Dec 19 17:01:03 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 09:47:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c5ec2c9
games-action/prismlauncher: add 6.1
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-6.1.ebuild | 147 +++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index bf9976f829a5..33000dee76e6 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,2 +1,3 @@
DIST prismlauncher-5.2.tar.gz 8772931 BLAKE2B 95c5be2a177086ba15a1d14a85f8a0edb349bcfbe4e9adff9dcca5c4a8dbf00d3ec49e30a2c99cfbeca2a7617ccaba6cf1f86bd396c1bf9b306c0ad5c1f4a3c7 SHA512 96a5fbf7c5d80da72377a4d8e9df16d4f9597a5764386f5b60d520d84fe319f8b6fbb3f89715214a037a70c440e418eb72e933a911d253fad93fbda9213d16e5
DIST prismlauncher-6.0.tar.gz 15242433 BLAKE2B 33f99a4c8ca5ace049035edec217890116cbb6cb7b88061d010677d3c5167a986b02116a4fe92e780636e1771e90a550902a9a19e33aa750d90fca6e23761199 SHA512 d80fe1dd1d057003acb8cf9a0f0bf793b346932e068ac516f7f6e6fbed69e1485a9267f7b37f4d6659385e3b01a3f1b41b5ae208ceaaddda0b4e5caf4ac8119f
+DIST prismlauncher-6.1.tar.gz 15238520 BLAKE2B 358c8b7377200598ec8f8f855db9b82c07aba82c939bacdb2d4af6c84a68306450f6d30fba97c9fdc3134f3c28abfc524a8853f36fbf5d32201a91635f22f5c8 SHA512 b4c55ee7bc3d71e13f1ca514b6fc4a0826e49ddb6c93c7d4f9d3fd226e6062a0678e29bf2736f3ae79e205f7c28e4b3782051b92dcd6293471e20d87f646ead5
diff --git a/games-action/prismlauncher/prismlauncher-6.1.ebuild b/games-action/prismlauncher/prismlauncher-6.1.ebuild
new file mode 100644
index 000000000000..2c80e3d6509d
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-6.1.ebuild
@@ -0,0 +1,147 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2022-12-20 9:54 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2022-12-20 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 9a127bce14704f628f596c5b2300b7009c250b27
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Mon Dec 19 17:01:29 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 09:47:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a127bce
games-action/prismlauncher: drop 5.2
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28711
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 -
.../prismlauncher/prismlauncher-5.2.ebuild | 147 ---------------------
2 files changed, 148 deletions(-)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 33000dee76e6..5c34b98cb73b 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,3 +1,2 @@
-DIST prismlauncher-5.2.tar.gz 8772931 BLAKE2B 95c5be2a177086ba15a1d14a85f8a0edb349bcfbe4e9adff9dcca5c4a8dbf00d3ec49e30a2c99cfbeca2a7617ccaba6cf1f86bd396c1bf9b306c0ad5c1f4a3c7 SHA512 96a5fbf7c5d80da72377a4d8e9df16d4f9597a5764386f5b60d520d84fe319f8b6fbb3f89715214a037a70c440e418eb72e933a911d253fad93fbda9213d16e5
DIST prismlauncher-6.0.tar.gz 15242433 BLAKE2B 33f99a4c8ca5ace049035edec217890116cbb6cb7b88061d010677d3c5167a986b02116a4fe92e780636e1771e90a550902a9a19e33aa750d90fca6e23761199 SHA512 d80fe1dd1d057003acb8cf9a0f0bf793b346932e068ac516f7f6e6fbed69e1485a9267f7b37f4d6659385e3b01a3f1b41b5ae208ceaaddda0b4e5caf4ac8119f
DIST prismlauncher-6.1.tar.gz 15238520 BLAKE2B 358c8b7377200598ec8f8f855db9b82c07aba82c939bacdb2d4af6c84a68306450f6d30fba97c9fdc3134f3c28abfc524a8853f36fbf5d32201a91635f22f5c8 SHA512 b4c55ee7bc3d71e13f1ca514b6fc4a0826e49ddb6c93c7d4f9d3fd226e6062a0678e29bf2736f3ae79e205f7c28e4b3782051b92dcd6293471e20d87f646ead5
diff --git a/games-action/prismlauncher/prismlauncher-5.2.ebuild b/games-action/prismlauncher/prismlauncher-5.2.ebuild
deleted file mode 100644
index ad60b690649f..000000000000
--- a/games-action/prismlauncher/prismlauncher-5.2.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' )
-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
-}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-02-03 19:33 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-02-03 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 2d74778e3984d1651014e001492ecbeac9da71b4
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Fri Feb 3 18:47:57 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 19:33:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d74778e
games-action/prismlauncher: add 6.3
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29410
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-6.3.ebuild | 147 +++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index cf1c8e9c701c..88a6c5cc758f 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1 +1,2 @@
DIST prismlauncher-6.1.tar.gz 15238520 BLAKE2B 358c8b7377200598ec8f8f855db9b82c07aba82c939bacdb2d4af6c84a68306450f6d30fba97c9fdc3134f3c28abfc524a8853f36fbf5d32201a91635f22f5c8 SHA512 b4c55ee7bc3d71e13f1ca514b6fc4a0826e49ddb6c93c7d4f9d3fd226e6062a0678e29bf2736f3ae79e205f7c28e4b3782051b92dcd6293471e20d87f646ead5
+DIST prismlauncher-6.3.tar.gz 15675450 BLAKE2B 6117172ad13c56c809755230cc9acd1a3987c9cc40bf80e853bfdcb319811ab5fd67cfe981a5301ac8a7bed7ef43f8d93fef31a368095fc8933d4782be7038fd SHA512 ccd37df6113b4c0460a6a2be6babed8d977d07a94f04e0dde65e185008158a4c99a6a991222de66756200b9aafcae8c441e4c30375306affcbe8e158b9242fc4
diff --git a/games-action/prismlauncher/prismlauncher-6.3.ebuild b/games-action/prismlauncher/prismlauncher-6.3.ebuild
new file mode 100644
index 000000000000..1990da8035c1
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-6.3.ebuild
@@ -0,0 +1,147 @@
+# 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' )
+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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-02-03 19:33 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-02-03 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 6552cd892679eb9d25ac98275839ada1a500cfcd
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Fri Feb 3 18:47:38 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 19:33:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6552cd89
games-action/prismlauncher: drop 6.0
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 -
.../prismlauncher/prismlauncher-6.0.ebuild | 147 ---------------------
2 files changed, 148 deletions(-)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 5c34b98cb73b..cf1c8e9c701c 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,2 +1 @@
-DIST prismlauncher-6.0.tar.gz 15242433 BLAKE2B 33f99a4c8ca5ace049035edec217890116cbb6cb7b88061d010677d3c5167a986b02116a4fe92e780636e1771e90a550902a9a19e33aa750d90fca6e23761199 SHA512 d80fe1dd1d057003acb8cf9a0f0bf793b346932e068ac516f7f6e6fbed69e1485a9267f7b37f4d6659385e3b01a3f1b41b5ae208ceaaddda0b4e5caf4ac8119f
DIST prismlauncher-6.1.tar.gz 15238520 BLAKE2B 358c8b7377200598ec8f8f855db9b82c07aba82c939bacdb2d4af6c84a68306450f6d30fba97c9fdc3134f3c28abfc524a8853f36fbf5d32201a91635f22f5c8 SHA512 b4c55ee7bc3d71e13f1ca514b6fc4a0826e49ddb6c93c7d4f9d3fd226e6062a0678e29bf2736f3ae79e205f7c28e4b3782051b92dcd6293471e20d87f646ead5
diff --git a/games-action/prismlauncher/prismlauncher-6.0.ebuild b/games-action/prismlauncher/prismlauncher-6.0.ebuild
deleted file mode 100644
index 2c80e3d6509d..000000000000
--- a/games-action/prismlauncher/prismlauncher-6.0.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
-}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-06-13 19:51 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-06-13 19:51 UTC (permalink / raw
To: gentoo-commits
commit: ae95da5cd7132c3fd07d0cd38ca4b24cf499e87d
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Mon Jun 12 10:29:07 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 19:45:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae95da5c
games-action/prismlauncher: add 7.0
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-7.0.ebuild | 148 +++++++++++++++++++++
2 files changed, 149 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 88a6c5cc758f..1c2ebc4f93a2 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,2 +1,3 @@
DIST prismlauncher-6.1.tar.gz 15238520 BLAKE2B 358c8b7377200598ec8f8f855db9b82c07aba82c939bacdb2d4af6c84a68306450f6d30fba97c9fdc3134f3c28abfc524a8853f36fbf5d32201a91635f22f5c8 SHA512 b4c55ee7bc3d71e13f1ca514b6fc4a0826e49ddb6c93c7d4f9d3fd226e6062a0678e29bf2736f3ae79e205f7c28e4b3782051b92dcd6293471e20d87f646ead5
DIST prismlauncher-6.3.tar.gz 15675450 BLAKE2B 6117172ad13c56c809755230cc9acd1a3987c9cc40bf80e853bfdcb319811ab5fd67cfe981a5301ac8a7bed7ef43f8d93fef31a368095fc8933d4782be7038fd SHA512 ccd37df6113b4c0460a6a2be6babed8d977d07a94f04e0dde65e185008158a4c99a6a991222de66756200b9aafcae8c441e4c30375306affcbe8e158b9242fc4
+DIST prismlauncher-7.0.tar.gz 17921335 BLAKE2B ed3c5e89ff6787ab3df8832f1b8f7381f27bf850fda296c056df5f891c180fcd82071727814a911f573905570637c192fbfad590491f75f6802e53b7564b1b43 SHA512 472eb12c10a68e914f11bba4b720f7f05930db2b33ef44d50962eec4ee88ecdb9ba43de1730bda81e3fdb8bbd2ea97bf1caa0da35af285b99307949b20f94d55
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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-06-13 19:51 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-06-13 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 7a3352abb71daa02994d0a67b1283bfba80fb3b9
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Mon Jun 12 10:25:44 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 19:45:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3352ab
games-action/prismlauncher: add app-text/cmark BDEPEND to live build
As of commit 24a4bd3a1c33702946b88a3d8017268fb8134210 of upstream, cmark
has been added as a dependency, with the possibility of using the system
library instead of the bundled one.
This patch also updates the copyright date on the live ebuild file.
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-9999.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-06-13 19:51 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-06-13 19:51 UTC (permalink / raw
To: gentoo-commits
commit: c79672520aa99c9f79f80ca60b7fcc823f5845cd
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Mon Jun 12 10:29:24 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 19:45:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7967252
games-action/prismlauncher: drop 6.1
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31396
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 -
.../prismlauncher/prismlauncher-6.1.ebuild | 147 ---------------------
2 files changed, 148 deletions(-)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 1c2ebc4f93a2..82fe13df953a 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,3 +1,2 @@
-DIST prismlauncher-6.1.tar.gz 15238520 BLAKE2B 358c8b7377200598ec8f8f855db9b82c07aba82c939bacdb2d4af6c84a68306450f6d30fba97c9fdc3134f3c28abfc524a8853f36fbf5d32201a91635f22f5c8 SHA512 b4c55ee7bc3d71e13f1ca514b6fc4a0826e49ddb6c93c7d4f9d3fd226e6062a0678e29bf2736f3ae79e205f7c28e4b3782051b92dcd6293471e20d87f646ead5
DIST prismlauncher-6.3.tar.gz 15675450 BLAKE2B 6117172ad13c56c809755230cc9acd1a3987c9cc40bf80e853bfdcb319811ab5fd67cfe981a5301ac8a7bed7ef43f8d93fef31a368095fc8933d4782be7038fd SHA512 ccd37df6113b4c0460a6a2be6babed8d977d07a94f04e0dde65e185008158a4c99a6a991222de66756200b9aafcae8c441e4c30375306affcbe8e158b9242fc4
DIST prismlauncher-7.0.tar.gz 17921335 BLAKE2B ed3c5e89ff6787ab3df8832f1b8f7381f27bf850fda296c056df5f891c180fcd82071727814a911f573905570637c192fbfad590491f75f6802e53b7564b1b43 SHA512 472eb12c10a68e914f11bba4b720f7f05930db2b33ef44d50962eec4ee88ecdb9ba43de1730bda81e3fdb8bbd2ea97bf1caa0da35af285b99307949b20f94d55
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
-}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-06-18 19:37 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-06-18 19:37 UTC (permalink / raw
To: gentoo-commits
commit: 7f5b99cb2ff24a8515caa8c5e5383765f6e19f35
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sat Jun 17 15:19:31 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 19:37:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f5b99cb
games-action/prismlauncher: drop 6.3
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31512
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 -
.../prismlauncher/prismlauncher-6.3.ebuild | 147 ---------------------
2 files changed, 148 deletions(-)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index b003b97381f6..ba5a27e42141 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,3 +1,2 @@
-DIST prismlauncher-6.3.tar.gz 15675450 BLAKE2B 6117172ad13c56c809755230cc9acd1a3987c9cc40bf80e853bfdcb319811ab5fd67cfe981a5301ac8a7bed7ef43f8d93fef31a368095fc8933d4782be7038fd SHA512 ccd37df6113b4c0460a6a2be6babed8d977d07a94f04e0dde65e185008158a4c99a6a991222de66756200b9aafcae8c441e4c30375306affcbe8e158b9242fc4
DIST prismlauncher-7.0.tar.gz 17921335 BLAKE2B ed3c5e89ff6787ab3df8832f1b8f7381f27bf850fda296c056df5f891c180fcd82071727814a911f573905570637c192fbfad590491f75f6802e53b7564b1b43 SHA512 472eb12c10a68e914f11bba4b720f7f05930db2b33ef44d50962eec4ee88ecdb9ba43de1730bda81e3fdb8bbd2ea97bf1caa0da35af285b99307949b20f94d55
DIST prismlauncher-7.1.tar.gz 8277729 BLAKE2B 7bbb21339ecb36d26815ba75345f36df041c8343b073d4a241efd8f6439fa7dc166c0126c74fa58b33547ffe3eca9d77bcf143b29961a0b0d755434c3148a8d9 SHA512 64807c49c4b8eb527c7be53616463a95a990ff2118dde8889157acf90b7086a81b504c48c1ce2f46499fe31d95ee44795dded652e07dcfc09d5f55440c0d34a6
diff --git a/games-action/prismlauncher/prismlauncher-6.3.ebuild b/games-action/prismlauncher/prismlauncher-6.3.ebuild
deleted file mode 100644
index 1990da8035c1..000000000000
--- a/games-action/prismlauncher/prismlauncher-6.3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# 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' )
-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
-}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-06-18 19:37 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-06-18 19:37 UTC (permalink / raw
To: gentoo-commits
commit: e60e2847a130d359466ecbedfb777fdf31aad486
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sat Jun 17 15:19:05 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 19:37:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e60e2847
games-action/prismlauncher: add 7.1
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-7.1.ebuild | 148 +++++++++++++++++++++
2 files changed, 149 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 82fe13df953a..b003b97381f6 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,2 +1,3 @@
DIST prismlauncher-6.3.tar.gz 15675450 BLAKE2B 6117172ad13c56c809755230cc9acd1a3987c9cc40bf80e853bfdcb319811ab5fd67cfe981a5301ac8a7bed7ef43f8d93fef31a368095fc8933d4782be7038fd SHA512 ccd37df6113b4c0460a6a2be6babed8d977d07a94f04e0dde65e185008158a4c99a6a991222de66756200b9aafcae8c441e4c30375306affcbe8e158b9242fc4
DIST prismlauncher-7.0.tar.gz 17921335 BLAKE2B ed3c5e89ff6787ab3df8832f1b8f7381f27bf850fda296c056df5f891c180fcd82071727814a911f573905570637c192fbfad590491f75f6802e53b7564b1b43 SHA512 472eb12c10a68e914f11bba4b720f7f05930db2b33ef44d50962eec4ee88ecdb9ba43de1730bda81e3fdb8bbd2ea97bf1caa0da35af285b99307949b20f94d55
+DIST prismlauncher-7.1.tar.gz 8277729 BLAKE2B 7bbb21339ecb36d26815ba75345f36df041c8343b073d4a241efd8f6439fa7dc166c0126c74fa58b33547ffe3eca9d77bcf143b29961a0b0d755434c3148a8d9 SHA512 64807c49c4b8eb527c7be53616463a95a990ff2118dde8889157acf90b7086a81b504c48c1ce2f46499fe31d95ee44795dded652e07dcfc09d5f55440c0d34a6
diff --git a/games-action/prismlauncher/prismlauncher-7.1.ebuild b/games-action/prismlauncher/prismlauncher-7.1.ebuild
new file mode 100644
index 000000000000..19ea1c798175
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-7.1.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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-07-29 12:17 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-07-29 12:17 UTC (permalink / raw
To: gentoo-commits
commit: dd5c9bec1c2ffae140f8774ad7baa1415b57cca5
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Wed Jul 26 12:34:10 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 12:12:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd5c9bec
games-action/prismlauncher: drop 7.0
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 -
.../prismlauncher/prismlauncher-7.0.ebuild | 148 ---------------------
2 files changed, 149 deletions(-)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index ba5a27e42141..41936f8dd49c 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,2 +1 @@
-DIST prismlauncher-7.0.tar.gz 17921335 BLAKE2B ed3c5e89ff6787ab3df8832f1b8f7381f27bf850fda296c056df5f891c180fcd82071727814a911f573905570637c192fbfad590491f75f6802e53b7564b1b43 SHA512 472eb12c10a68e914f11bba4b720f7f05930db2b33ef44d50962eec4ee88ecdb9ba43de1730bda81e3fdb8bbd2ea97bf1caa0da35af285b99307949b20f94d55
DIST prismlauncher-7.1.tar.gz 8277729 BLAKE2B 7bbb21339ecb36d26815ba75345f36df041c8343b073d4a241efd8f6439fa7dc166c0126c74fa58b33547ffe3eca9d77bcf143b29961a0b0d755434c3148a8d9 SHA512 64807c49c4b8eb527c7be53616463a95a990ff2118dde8889157acf90b7086a81b504c48c1ce2f46499fe31d95ee44795dded652e07dcfc09d5f55440c0d34a6
diff --git a/games-action/prismlauncher/prismlauncher-7.0.ebuild b/games-action/prismlauncher/prismlauncher-7.0.ebuild
deleted file mode 100644
index 19ea1c798175..000000000000
--- a/games-action/prismlauncher/prismlauncher-7.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-07-29 12:17 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-07-29 12:17 UTC (permalink / raw
To: gentoo-commits
commit: c350b8fb90f0dd8c4414ec3c4e82809e4faf2441
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Wed Jul 26 12:37:14 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 12:12:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c350b8fb
games-action/prismlauncher: add 7.2
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32053
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-7.2.ebuild | 149 +++++++++++++++++++++
2 files changed, 150 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 41936f8dd49c..075ca8bb3bdf 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1 +1,2 @@
DIST prismlauncher-7.1.tar.gz 8277729 BLAKE2B 7bbb21339ecb36d26815ba75345f36df041c8343b073d4a241efd8f6439fa7dc166c0126c74fa58b33547ffe3eca9d77bcf143b29961a0b0d755434c3148a8d9 SHA512 64807c49c4b8eb527c7be53616463a95a990ff2118dde8889157acf90b7086a81b504c48c1ce2f46499fe31d95ee44795dded652e07dcfc09d5f55440c0d34a6
+DIST prismlauncher-7.2.tar.gz 8321071 BLAKE2B 393737d1f53d82986430ea8d77e65cd7f191a0ba73548ec4ff72ca62fe8bd8beae5b3718806e1c62c0f4339e02343e9f30aa851b0617685e3309bcb902d265a8 SHA512 f809434ff57b8bb10368c5a2e1c82f0082816fc8d45d8431f723fce1ea6b942e62fbb75be792c8ead8fc0828178330237ed0a1d2a24196e3afadc2678ba170ed
diff --git a/games-action/prismlauncher/prismlauncher-7.2.ebuild b/games-action/prismlauncher/prismlauncher-7.2.ebuild
new file mode 100644
index 000000000000..1d4b9a04996f
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-7.2.ebuild
@@ -0,0 +1,149 @@
+# 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_BUILD_PLATFORM="Gentoo"
+ -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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-07-29 12:17 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-07-29 12:17 UTC (permalink / raw
To: gentoo-commits
commit: e7c2f9adfb5c9e2f029b48b0b7aeb5c0f4b2ca9b
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Wed Jul 26 12:35:34 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 12:12:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c2f9ad
games-action/prismlauncher: add BUILD_PLATFORM information in CMake
This is used for showing the platform the package was builded on on
startup, to help troubleshooting issues on upstream.
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index 19ea1c798175..1d4b9a04996f 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -118,6 +118,7 @@ src_configure(){
-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)
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-09-12 6:44 Joonas Niilola
0 siblings, 0 replies; 46+ messages in thread
From: Joonas Niilola @ 2023-09-12 6:44 UTC (permalink / raw
To: gentoo-commits
commit: 4a076081a9243d6a47708f05a73069338c724026
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 06:43:59 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 06:44:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a076081
games-action/prismlauncher: Stabilize 7.1 amd64, #913952
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-7.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/prismlauncher/prismlauncher-7.1.ebuild b/games-action/prismlauncher/prismlauncher-7.1.ebuild
index 19ea1c798175..7871021897c4 100644
--- a/games-action/prismlauncher/prismlauncher-7.1.ebuild
+++ b/games-action/prismlauncher/prismlauncher-7.1.ebuild
@@ -28,7 +28,7 @@ else
# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
S="${WORKDIR}/${MY_PN}-${PV}"
- KEYWORDS="~amd64 ~arm64"
+ KEYWORDS="amd64 ~arm64"
fi
# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-11-09 7:47 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-11-09 7:47 UTC (permalink / raw
To: gentoo-commits
commit: 8ee1a6da5bba00a3483f99fca85b4398600ef4a4
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Wed Nov 8 22:51:31 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 07:47:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee1a6da
games-action/prismlauncher: add 8.0
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33731
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-8.0.ebuild | 152 +++++++++++++++++++++
2 files changed, 153 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 7bc80daf80f5..b05838236eec 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1 +1,2 @@
DIST prismlauncher-7.2.tar.gz 8321071 BLAKE2B 393737d1f53d82986430ea8d77e65cd7f191a0ba73548ec4ff72ca62fe8bd8beae5b3718806e1c62c0f4339e02343e9f30aa851b0617685e3309bcb902d265a8 SHA512 f809434ff57b8bb10368c5a2e1c82f0082816fc8d45d8431f723fce1ea6b942e62fbb75be792c8ead8fc0828178330237ed0a1d2a24196e3afadc2678ba170ed
+DIST prismlauncher-8.0.tar.gz 8430953 BLAKE2B 74fcc2d8105976cbba774ff8c727b3a57f36f6bd21ab7b3d8be98b26c0b456f78f941af192a76e170ad70fde3567358d0d8e7f47a402052503da19858bbab948 SHA512 a080d7262e2b284a1bab18c99f33e4bea7854fd946aff3f74d0a2e5c896bbf9ad90a3c4700c83162918f5269aa90b3f41e88fe94a89e197243ab3b38f8a7995c
diff --git a/games-action/prismlauncher/prismlauncher-8.0.ebuild b/games-action/prismlauncher/prismlauncher-8.0.ebuild
new file mode 100644
index 000000000000..06a89b80966d
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-8.0.ebuild
@@ -0,0 +1,152 @@
+# 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(-)] )
+
+ 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: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
+
+ 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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-11-09 7:47 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-11-09 7:47 UTC (permalink / raw
To: gentoo-commits
commit: cb0068bcd8e98dab40541ea21d63623a1a991bdb
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Wed Nov 8 22:32:04 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 07:47:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0068bc
games-action/prismlauncher: drop 7.1
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 -
.../prismlauncher/prismlauncher-7.1.ebuild | 148 ---------------------
2 files changed, 149 deletions(-)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 075ca8bb3bdf..7bc80daf80f5 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,2 +1 @@
-DIST prismlauncher-7.1.tar.gz 8277729 BLAKE2B 7bbb21339ecb36d26815ba75345f36df041c8343b073d4a241efd8f6439fa7dc166c0126c74fa58b33547ffe3eca9d77bcf143b29961a0b0d755434c3148a8d9 SHA512 64807c49c4b8eb527c7be53616463a95a990ff2118dde8889157acf90b7086a81b504c48c1ce2f46499fe31d95ee44795dded652e07dcfc09d5f55440c0d34a6
DIST prismlauncher-7.2.tar.gz 8321071 BLAKE2B 393737d1f53d82986430ea8d77e65cd7f191a0ba73548ec4ff72ca62fe8bd8beae5b3718806e1c62c0f4339e02343e9f30aa851b0617685e3309bcb902d265a8 SHA512 f809434ff57b8bb10368c5a2e1c82f0082816fc8d45d8431f723fce1ea6b942e62fbb75be792c8ead8fc0828178330237ed0a1d2a24196e3afadc2678ba170ed
diff --git a/games-action/prismlauncher/prismlauncher-7.1.ebuild b/games-action/prismlauncher/prismlauncher-7.1.ebuild
deleted file mode 100644
index 7871021897c4..000000000000
--- a/games-action/prismlauncher/prismlauncher-7.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-11-09 7:47 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-11-09 7:47 UTC (permalink / raw
To: gentoo-commits
commit: cdc160f3a48e2998cd72803e50e1a9dfcbbb10ca
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 9 07:46:44 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 07:47:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc160f3
games-action/prismlauncher: stabilize 7.2-r1 for amd64
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-7.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild b/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
index 06a89b80966d..86da806aab2e 100644
--- a/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
+++ b/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
@@ -28,7 +28,7 @@ else
# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
S="${WORKDIR}/${MY_PN}-${PV}"
- KEYWORDS="~amd64 ~arm64"
+ KEYWORDS="amd64 ~arm64"
fi
# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-11-09 7:47 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-11-09 7:47 UTC (permalink / raw
To: gentoo-commits
commit: 043bb654c00c67b66733b306b2bdf0c394330dc0
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Wed Nov 8 22:47:58 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 07:47:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043bb654
games-action/prismlauncher: add app-text/cmark to runtime dependencies
Closes: https://bugs.gentoo.org/917040
Co-authored-by: Mason Rocha <turret <AT> turret.cyou>
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-7.2-r1.ebuild | 2 +-
games-action/prismlauncher/prismlauncher-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild b/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
index 84e6796ee32f..06a89b80966d 100644
--- a/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
+++ b/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
@@ -74,6 +74,7 @@ COMMON_DEPENDS="
!qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
+ app-text/cmark
sys-libs/zlib
"
@@ -81,7 +82,6 @@ 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
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index c60586d65332..f3bc7a163f2f 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -74,6 +74,7 @@ COMMON_DEPENDS="
!qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
+ app-text/cmark
sys-libs/zlib
"
@@ -81,7 +82,6 @@ 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
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-11-09 7:47 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-11-09 7:47 UTC (permalink / raw
To: gentoo-commits
commit: e752292f0bf53e8d70caed92ddb1b3075209b5e8
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Wed Nov 8 22:42:36 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 07:47:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e752292f
games-action/prismlauncher: disable ASan in debug build
This caused issues with the tests on CI, and was already changed in a
new release. Disabling it is easier than making a mess of DEPENDs to
support it properly, particularly so since it shouldn't be an issue on
new releases going forward.
Closes: https://bugs.gentoo.org/911426
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-7.2-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild b/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
index c60586d65332..84e6796ee32f 100644
--- a/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
+++ b/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
@@ -125,6 +125,7 @@ src_configure(){
-DENABLE_LTO=$(usex lto)
-DBUILD_TESTING=$(usex test)
+ -DDEBUG_ADDRESS_SANITIZER=0
)
if use debug; then
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2023-11-09 7:47 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2023-11-09 7:47 UTC (permalink / raw
To: gentoo-commits
commit: 111127c008c0f37857692cb8ca86ad973a8c34cb
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Wed Nov 8 22:36:21 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 07:47:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111127c0
games-action/prismlauncher: remove CMAKE_CXX_FLAGS_RELEASE from upstream
According to the CMake documentation, the CMAKE_<LANG>_FLAGS_<CONFIG>
flags will always be added after the CMAKE_<LANG>_FLAGS, which are the
ones affected by the CXXFLAGS environment variable Gentoo uses.
So, as to not override the user settings, we remove the line that sets
that variable, handling both the -D_FORTIFY_SOURCE=2 and -O2 flags.
CMake reference:
https://cmake.org/cmake/help/v3.28/variable/CMAKE_LANG_FLAGS.html#variable:CMAKE_%3CLANG%3E_FLAGS
Closes: https://bugs.gentoo.org/911858
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../{prismlauncher-7.2.ebuild => prismlauncher-7.2-r1.ebuild} | 6 ++++--
games-action/prismlauncher/prismlauncher-9999.ebuild | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/games-action/prismlauncher/prismlauncher-7.2.ebuild b/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
similarity index 92%
rename from games-action/prismlauncher/prismlauncher-7.2.ebuild
rename to games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
index 1d4b9a04996f..c60586d65332 100644
--- a/games-action/prismlauncher/prismlauncher-7.2.ebuild
+++ b/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
@@ -108,9 +108,11 @@ RDEPEND="
src_prepare() {
cmake_src_prepare
+ 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 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'
+ # 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(){
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index 1d4b9a04996f..c60586d65332 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -108,9 +108,11 @@ RDEPEND="
src_prepare() {
cmake_src_prepare
+ 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 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'
+ # 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(){
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2024-03-14 19:34 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2024-03-14 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 8f1ae9c8fa91716a9b6ca9a98f8aaa93e829dcf2
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 19:34:17 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 19:34:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1ae9c8
games-action/prismlauncher: fix live
Bug: https://bugs.gentoo.org/917072
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index efba041135b9..02f607f83f6c 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -119,7 +119,7 @@ src_prepare() {
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"
+ eapply "${FILESDIR}/${PN}-8.2-openjdk21.patch"
fi
sed -i -e 's/-Werror//' CMakeLists.txt || die 'Failed to remove -Werror via sed'
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2024-04-11 9:00 Arthur Zamarin
0 siblings, 0 replies; 46+ messages in thread
From: Arthur Zamarin @ 2024-04-11 9:00 UTC (permalink / raw
To: gentoo-commits
commit: 18c3daebbb6074d651b7b781b2107f518076eeb4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 09:00:29 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 09:00:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c3daeb
games-action/prismlauncher: Stabilize 8.2 amd64, #929118
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/prismlauncher/prismlauncher-8.2.ebuild b/games-action/prismlauncher/prismlauncher-8.2.ebuild
index f8db7eaa5260..339a0532de76 100644
--- a/games-action/prismlauncher/prismlauncher-8.2.ebuild
+++ b/games-action/prismlauncher/prismlauncher-8.2.ebuild
@@ -28,7 +28,7 @@ else
# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
S="${WORKDIR}/${MY_PN}-${PV}"
- KEYWORDS="~amd64 ~arm64"
+ KEYWORDS="amd64 ~arm64"
fi
# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2024-04-11 9:14 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2024-04-11 9:14 UTC (permalink / raw
To: gentoo-commits
commit: e414156f2d87fb457934067d86dcd035fc9ffa39
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Apr 11 09:07:18 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 09:13:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e414156f
games-action/prismlauncher: drop 7.2-r1, 8.0
Closes: https://bugs.gentoo.org/917072
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36212
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 2 -
.../prismlauncher/prismlauncher-7.2-r1.ebuild | 152 ---------------------
.../prismlauncher/prismlauncher-8.0.ebuild | 152 ---------------------
3 files changed, 306 deletions(-)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 1ef436eaf319..b285ad9b5d7b 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,3 +1 @@
-DIST prismlauncher-7.2.tar.gz 8321071 BLAKE2B 393737d1f53d82986430ea8d77e65cd7f191a0ba73548ec4ff72ca62fe8bd8beae5b3718806e1c62c0f4339e02343e9f30aa851b0617685e3309bcb902d265a8 SHA512 f809434ff57b8bb10368c5a2e1c82f0082816fc8d45d8431f723fce1ea6b942e62fbb75be792c8ead8fc0828178330237ed0a1d2a24196e3afadc2678ba170ed
-DIST prismlauncher-8.0.tar.gz 8430953 BLAKE2B 74fcc2d8105976cbba774ff8c727b3a57f36f6bd21ab7b3d8be98b26c0b456f78f941af192a76e170ad70fde3567358d0d8e7f47a402052503da19858bbab948 SHA512 a080d7262e2b284a1bab18c99f33e4bea7854fd946aff3f74d0a2e5c896bbf9ad90a3c4700c83162918f5269aa90b3f41e88fe94a89e197243ab3b38f8a7995c
DIST prismlauncher-8.2.tar.gz 8437675 BLAKE2B 3eee060dbc80ca690b344875caa20b27d8949b1e972602d1d383e1ae394404408d74dece11b47f940948ac2c437bd73fadf56d4e492daa34adef1c1eade66bc9 SHA512 6a0988a83e36df0da328fed0efe93171f8b4c565622f8eddf885e6e019214b15b8f64485ce1d9982dd441fad7c4aac8d1647e1b4dbf2cdb8ebadc46f664857ad
diff --git a/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild b/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
deleted file mode 100644
index 3e8577caf63f..000000000000
--- a/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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(-)] )
-
- 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
-
- 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.0.ebuild b/games-action/prismlauncher/prismlauncher-8.0.ebuild
deleted file mode 100644
index d060f03df8d5..000000000000
--- a/games-action/prismlauncher/prismlauncher-8.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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(-)] )
-
- 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
-
- 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
-}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2024-04-16 13:49 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2024-04-16 13:49 UTC (permalink / raw
To: gentoo-commits
commit: 4b40923b258a34a63efe52e118153e3cb4231076
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 13:48:42 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 13:49:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b40923b
games-action/prismlauncher: add missing dependency
Bug: https://bugs.gentoo.org/930110
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../{prismlauncher-9999.ebuild => prismlauncher-8.2-r1.ebuild} | 6 ++++--
games-action/prismlauncher/prismlauncher-9999.ebuild | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-8.2-r1.ebuild
similarity index 97%
copy from games-action/prismlauncher/prismlauncher-9999.ebuild
copy to games-action/prismlauncher/prismlauncher-8.2-r1.ebuild
index 02f607f83f6c..9406f67dd88a 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-8.2-r1.ebuild
@@ -28,7 +28,7 @@ else
# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
S="${WORKDIR}/${MY_PN}-${PV}"
- KEYWORDS="~amd64 ~arm64"
+ KEYWORDS="amd64"
fi
# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
@@ -75,6 +75,7 @@ COMMON_DEPENDS="
qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
app-text/cmark
+ dev-cpp/tomlplusplus
sys-libs/zlib
"
@@ -119,7 +120,7 @@ src_prepare() {
elog
elog "If you experience any problems, install an older java compiler"
elog "and select it with \"eselect java\", then recompile ${PN}."
- eapply "${FILESDIR}/${PN}-8.2-openjdk21.patch"
+ eapply "${FILESDIR}/${P}-openjdk21.patch"
fi
sed -i -e 's/-Werror//' CMakeLists.txt || die 'Failed to remove -Werror via sed'
@@ -139,6 +140,7 @@ src_configure(){
-DENABLE_LTO=$(usex lto)
-DBUILD_TESTING=$(usex test)
+ -DDEBUG_ADDRESS_SANITIZER=0
)
if use debug; then
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
"
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2024-04-16 16:31 Arthur Zamarin
0 siblings, 0 replies; 46+ messages in thread
From: Arthur Zamarin @ 2024-04-16 16:31 UTC (permalink / raw
To: gentoo-commits
commit: f7a152a35f02ac27e80a6018ffe5626cd2d3d3bb
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 16:31:14 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 16:31:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a152a3
games-action/prismlauncher: Keyword 8.2-r1 arm64, #930110
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-8.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/prismlauncher/prismlauncher-8.2-r1.ebuild b/games-action/prismlauncher/prismlauncher-8.2-r1.ebuild
index 9406f67dd88a..862c412bfab6 100644
--- a/games-action/prismlauncher/prismlauncher-8.2-r1.ebuild
+++ b/games-action/prismlauncher/prismlauncher-8.2-r1.ebuild
@@ -28,7 +28,7 @@ else
# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
S="${WORKDIR}/${MY_PN}-${PV}"
- KEYWORDS="amd64"
+ KEYWORDS="amd64 ~arm64"
fi
# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2024-04-16 16:33 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2024-04-16 16:33 UTC (permalink / raw
To: gentoo-commits
commit: fe3cb060f9e323591a77fd5070c0e8a59133c448
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 16:33:01 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 16:33:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3cb060
games-action/prismlauncher: drop 8.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../prismlauncher/prismlauncher-8.2.ebuild | 166 ---------------------
1 file changed, 166 deletions(-)
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
-}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2024-05-17 14:13 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2024-05-17 14:13 UTC (permalink / raw
To: gentoo-commits
commit: a64910a223de1a181413f72f0be224de905bae1f
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 14:10:35 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri May 17 14:12:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64910a2
games-action/prismlauncher: add 8.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-8.3.ebuild | 166 +++++++++++++++++++++
2 files changed, 167 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index b285ad9b5d7b..eb87ea7ae178 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1 +1,2 @@
DIST prismlauncher-8.2.tar.gz 8437675 BLAKE2B 3eee060dbc80ca690b344875caa20b27d8949b1e972602d1d383e1ae394404408d74dece11b47f940948ac2c437bd73fadf56d4e492daa34adef1c1eade66bc9 SHA512 6a0988a83e36df0da328fed0efe93171f8b4c565622f8eddf885e6e019214b15b8f64485ce1d9982dd441fad7c4aac8d1647e1b4dbf2cdb8ebadc46f664857ad
+DIST prismlauncher-8.3.tar.gz 8412178 BLAKE2B 47244a8ec09ad12bf902660d114835ef0c142dd7cf740e8fe3771c08dd39ff5ab5f9e043d17c03dce1986c0a37b421868d4d3d939b35bdb9c237b2f72925be79 SHA512 c4153fbfd5b6c09ecf2d78d95a629e78685a45a85ccbb5d7f8e4ec7bf7efb66d72f5eee0947ccb13090b4a8429b00cb92fdf96bb0dbe435b61a285d7517d37b2
diff --git a/games-action/prismlauncher/prismlauncher-8.3.ebuild b/games-action/prismlauncher/prismlauncher-8.3.ebuild
new file mode 100644
index 000000000000..5e485a25b6f6
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-8.3.ebuild
@@ -0,0 +1,166 @@
+# 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}/${PN}-8.2-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)
+ )
+
+ 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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2024-07-20 13:12 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2024-07-20 13:12 UTC (permalink / raw
To: gentoo-commits
commit: 4fc16bd6900c8b5f04f8ae131981cfcb49510908
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Fri Jul 19 15:01:28 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 13:05:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc16bd6
games-action/prismlauncher: add 8.4
Remove unnecessary lto and debug useflags which allows removing
workarounds. Users are generally supposed to use CXXFLAGS for this.
Explicitly unbundle tomlplusplus.
Drop nonworking -Werror sed. Last time codebase had a -Werror in
CMakeLists.txt the year was 2022.
Minor dependency tweaking and reorder eclasses to give cmake priority
over java-pkg-2.
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/Manifest | 1 +
.../prismlauncher/prismlauncher-8.4.ebuild | 154 +++++++++++++++++++++
2 files changed, 155 insertions(+)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index eb87ea7ae178..c9c9b2fb19ad 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,2 +1,3 @@
DIST prismlauncher-8.2.tar.gz 8437675 BLAKE2B 3eee060dbc80ca690b344875caa20b27d8949b1e972602d1d383e1ae394404408d74dece11b47f940948ac2c437bd73fadf56d4e492daa34adef1c1eade66bc9 SHA512 6a0988a83e36df0da328fed0efe93171f8b4c565622f8eddf885e6e019214b15b8f64485ce1d9982dd441fad7c4aac8d1647e1b4dbf2cdb8ebadc46f664857ad
DIST prismlauncher-8.3.tar.gz 8412178 BLAKE2B 47244a8ec09ad12bf902660d114835ef0c142dd7cf740e8fe3771c08dd39ff5ab5f9e043d17c03dce1986c0a37b421868d4d3d939b35bdb9c237b2f72925be79 SHA512 c4153fbfd5b6c09ecf2d78d95a629e78685a45a85ccbb5d7f8e4ec7bf7efb66d72f5eee0947ccb13090b4a8429b00cb92fdf96bb0dbe435b61a285d7517d37b2
+DIST prismlauncher-8.4.tar.gz 8444486 BLAKE2B c7950df3d843e370914e2a72c71847a71ab0446508a464ce04ded007b0b3170e8119bb30455d1022fda98cd49f16528a63f5589766561cfc15950c6823779b6f SHA512 24307e6f2a34c459153def5ee639c9a37d3ec3e54bf81dc7d7da8263ee58e16f2391101732889d3b00a1b923704aa21756fad4ee288665e45962032b1d9e8de9
diff --git a/games-action/prismlauncher/prismlauncher-8.4.ebuild b/games-action/prismlauncher/prismlauncher-8.4.ebuild
new file mode 100644
index 000000000000..82820693349e
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-8.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake java-pkg-2 optfeature toolchain-funcs 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
+ "
+
+ EGIT_SUBMODULES=(
+ '*' '-libraries/cmark' '-libraries/extra-cmake-modules' '-libraries/filesystem' '-libraries/quazip'
+ '-libraries/tomlplusplus' '-libraries/zlib'
+ )
+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
+# 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+"
+
+SLOT="0"
+
+IUSE="qt6 test"
+
+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
+"
+
+BDEPEND="
+ app-text/scdoc
+ kde-frameworks/extra-cmake-modules:0
+ virtual/pkgconfig
+"
+
+# 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.
+DEPEND="
+ ${COMMON_DEPENDS}
+ dev-cpp/gulrak-filesystem
+ media-libs/libglvnd
+ >=virtual/jdk-1.8.0:*
+"
+
+# QtSvg imageplugin needed at runtime for svg icons. Its used via QIcon.
+# 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}/${PN}-8.2-openjdk21.patch"
+ fi
+}
+
+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=$(tc-is-lto)
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ 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
+}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2024-07-20 13:12 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2024-07-20 13:12 UTC (permalink / raw
To: gentoo-commits
commit: af8759beb9b9985a419213e8247e87806709b2bd
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Fri Jul 19 15:02:52 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 13:05:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af8759be
games-action/prismlauncher: update live
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37618
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../prismlauncher/prismlauncher-9999.ebuild | 46 ++++++++--------------
1 file changed, 17 insertions(+), 29 deletions(-)
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index 5e485a25b6f6..82820693349e 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake java-pkg-2 optfeature xdg
+inherit cmake java-pkg-2 optfeature toolchain-funcs xdg
DESCRIPTION="A custom, open source Minecraft launcher"
HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"
@@ -15,8 +15,10 @@ if [[ ${PV} == 9999 ]]; then
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' )
+ EGIT_SUBMODULES=(
+ '*' '-libraries/cmark' '-libraries/extra-cmake-modules' '-libraries/filesystem' '-libraries/quazip'
+ '-libraries/tomlplusplus' '-libraries/zlib'
+ )
else
MY_PN="PrismLauncher"
@@ -34,16 +36,12 @@ 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"
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+"
SLOT="0"
-IUSE="debug lto qt6 test"
-REQUIRED_USE="
- lto? ( !debug )
-"
+IUSE="qt6 test"
RESTRICT="!test? ( test )"
@@ -74,26 +72,28 @@ COMMON_DEPENDS="
!qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
- app-text/cmark
+ 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
+ virtual/pkgconfig
"
+# 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.
DEPEND="
${COMMON_DEPENDS}
+ dev-cpp/gulrak-filesystem
media-libs/libglvnd
>=virtual/jdk-1.8.0:*
"
+# QtSvg imageplugin needed at runtime for svg icons. Its used via QIcon.
# At run-time we don't depend on JDK, only JRE
# And we need more than just the GL headers
RDEPEND="
@@ -122,15 +122,9 @@ src_prepare() {
elog "and select it with \"eselect java\", then recompile ${PN}."
eapply "${FILESDIR}/${PN}-8.2-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(){
+src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_PREFIX="/usr"
# Resulting binary is named prismlauncher
@@ -138,20 +132,14 @@ src_configure(){
-DLauncher_BUILD_PLATFORM="Gentoo"
-DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5)
- -DENABLE_LTO=$(usex lto)
+ -DENABLE_LTO=$(tc-is-lto)
-DBUILD_TESTING=$(usex test)
)
- if use debug; then
- CMAKE_BUILD_TYPE=Debug
- else
- CMAKE_BUILD_TYPE=Release
- fi
-
cmake_src_configure
}
-src_compile(){
+src_compile() {
cmake_src_compile
}
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
@ 2024-08-31 13:31 Andrew Ammerlaan
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Ammerlaan @ 2024-08-31 13:31 UTC (permalink / raw
To: gentoo-commits
commit: 1f0efd961719bee417e558d43905bcf330ba3673
Author: Username404-59 <53659497+Username404-59 <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Aug 31 13:15:11 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 13:30:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f0efd96
games-action/prismlauncher-9999: Add missing dependency on dev-qt/qtnetworkauth
Signed-off-by: Username404-59 <53659497+Username404-59 <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/38357
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/prismlauncher/prismlauncher-9999.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index 82820693349e..ef648a1d8811 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -54,6 +54,7 @@ QT_DEPS="
>=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/qtnetworkauth-${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
@@ -62,6 +63,7 @@ QT_DEPS="
qt6? (
>=dev-qt/qtbase-${MIN_QT_6_VERSION}:6[concurrent,gui,network,widgets,xml(+)]
>=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6
+ >=dev-qt/qtnetworkauth-${MIN_QT_6_VERSION}:6
)
"
^ permalink raw reply related [flat|nested] 46+ messages in thread
end of thread, other threads:[~2024-08-31 13:31 UTC | newest]
Thread overview: 46+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-11 9:00 [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2024-08-31 13:31 Andrew Ammerlaan
2024-07-20 13:12 Andrew Ammerlaan
2024-07-20 13:12 Andrew Ammerlaan
2024-05-17 14:13 Andrew Ammerlaan
2024-04-16 16:33 Andrew Ammerlaan
2024-04-16 16:31 Arthur Zamarin
2024-04-16 13:49 Andrew Ammerlaan
2024-04-11 9:14 Andrew Ammerlaan
2024-03-14 19:34 Andrew Ammerlaan
2023-11-09 7:47 Andrew Ammerlaan
2023-11-09 7:47 Andrew Ammerlaan
2023-11-09 7:47 Andrew Ammerlaan
2023-11-09 7:47 Andrew Ammerlaan
2023-11-09 7:47 Andrew Ammerlaan
2023-11-09 7:47 Andrew Ammerlaan
2023-09-12 6:44 Joonas Niilola
2023-07-29 12:17 Andrew Ammerlaan
2023-07-29 12:17 Andrew Ammerlaan
2023-07-29 12:17 Andrew Ammerlaan
2023-06-18 19:37 Andrew Ammerlaan
2023-06-18 19:37 Andrew Ammerlaan
2023-06-13 19:51 Andrew Ammerlaan
2023-06-13 19:51 Andrew Ammerlaan
2023-06-13 19:51 Andrew Ammerlaan
2023-02-03 19:33 Andrew Ammerlaan
2023-02-03 19:33 Andrew Ammerlaan
2022-12-20 9:54 Andrew Ammerlaan
2022-12-20 9:54 Andrew Ammerlaan
2022-12-12 17:56 Andrew Ammerlaan
2022-12-12 17:56 Andrew Ammerlaan
2022-12-12 17:56 Andrew Ammerlaan
2022-11-16 9:26 Andrew Ammerlaan
2022-11-16 9:26 Andrew Ammerlaan
2022-11-15 22:24 Sam James
2022-11-15 22:24 Sam James
2022-11-15 21:03 Andrew Ammerlaan
2022-11-15 21:03 Andrew Ammerlaan
2022-11-02 11:49 Andrew Ammerlaan
2022-11-02 11:49 Andrew Ammerlaan
2022-11-02 11:49 Andrew Ammerlaan
2022-10-20 12:23 Jakov Smolić
2022-10-20 4:25 Sam James
2022-10-20 4:25 Sam James
2022-10-20 4:25 Sam James
2022-10-20 4:25 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox