* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-04-15 18:13 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-04-15 18:13 UTC (permalink / raw
To: gentoo-commits
commit: 0fa539b364d9e3fca1d9fdf2a164e413afb1cb43
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sat Apr 9 22:05:06 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 18:12:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa539b3
games-action/polymc: initial import from ::guru, version 1.1.1
Closes: https://github.com/gentoo/gentoo/pull/24966
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 1 +
games-action/polymc/metadata.xml | 26 ++++++++
games-action/polymc/polymc-1.1.1.ebuild | 108 ++++++++++++++++++++++++++++++++
games-action/polymc/polymc-9999.ebuild | 108 ++++++++++++++++++++++++++++++++
4 files changed, 243 insertions(+)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
new file mode 100644
index 000000000000..b44203e704b5
--- /dev/null
+++ b/games-action/polymc/Manifest
@@ -0,0 +1 @@
+DIST polymc-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5
diff --git a/games-action/polymc/metadata.xml b/games-action/polymc/metadata.xml
new file mode 100644
index 000000000000..78a705414ef3
--- /dev/null
+++ b/games-action/polymc/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="yes">
+ <email>swurl@swurl.xyz</email>
+ <name>Carson Rueter</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/PolyMC/PolyMC/issues</bugs-to>
+ <doc>https://polymc.org/wiki/</doc>
+ <remote-id type="github">PolyMC/PolyMC</remote-id>
+ </upstream>
+ <longdescription>PolyMC is a multi-instance Minecraft launcher focused on user freedom, redistributability, and simplicity.</longdescription>
+</pkgmetadata>
diff --git a/games-action/polymc/polymc-1.1.1.ebuild b/games-action/polymc/polymc-1.1.1.ebuild
new file mode 100644
index 000000000000..d036cb15c635
--- /dev/null
+++ b/games-action/polymc/polymc-1.1.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake java-pkg-2 optfeature xdg
+
+HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/MultiMC/libnbtplusplus
+ https://github.com/stachenov/quazip
+ "
+
+ # Include all submodules
+ EGIT_SUBMODULES=( '*' )
+else
+ MY_PN="PolyMC"
+
+ # Let's use the vendored tarball to avoid dealing with the submodules directly
+ SRC_URI="
+ https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
+ "
+
+ # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
+ S="${WORKDIR}/${MY_PN}-${PV}"
+
+ KEYWORDS="~amd64"
+fi
+
+# Apache-2.0 for MultiMC (PolyMC is forked from it)
+# GPL-3 for PolyMC
+# LGPL-3 for libnbtplusplus
+# LGPL-2.1 with linking exception for Quazip
+# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 LGPL-2.1-with-linking-exception OFL-1.1 MIT"
+
+SLOT="0"
+
+IUSE="debug"
+
+MIN_QT="5.6.0"
+
+QT_DEPS="
+ >=dev-qt/qtconcurrent-${MIN_QT}:5
+ >=dev-qt/qtcore-${MIN_QT}:5
+ >=dev-qt/qtgui-${MIN_QT}:5
+ >=dev-qt/qtnetwork-${MIN_QT}:5
+ >=dev-qt/qttest-${MIN_QT}:5
+ >=dev-qt/qtwidgets-${MIN_QT}:5
+ >=dev-qt/qtxml-${MIN_QT}:5
+"
+
+DEPEND="
+ ${QT_DEPS}
+ media-libs/libglvnd
+ sys-libs/zlib
+ >=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="
+ ${QT_DEPS}
+ sys-libs/zlib
+ >=virtual/jre-1.8.0:*
+ virtual/opengl
+"
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure(){
+ if use debug; then
+ CMAKE_BUILD_TYPE=Debug
+ else
+ # Prepare for LTO in 1.2.0 (?)
+ # See https://github.com/PolyMC/PolyMC/pull/333
+ CMAKE_BUILD_TYPE=Release
+ fi
+
+ local mycmakeargs=(
+ # Do a system install
+ -DLauncher_PORTABLE=0
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ # Resulting binary is named polymc
+ -DLauncher_APP_BINARY_NAME="${PN}"
+ )
+
+ cmake_src_configure
+}
+
+src_compile(){
+ cmake_src_compile
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ # https://github.com/PolyMC/PolyMC/issues/227
+ optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+}
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
new file mode 100644
index 000000000000..d036cb15c635
--- /dev/null
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake java-pkg-2 optfeature xdg
+
+HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/MultiMC/libnbtplusplus
+ https://github.com/stachenov/quazip
+ "
+
+ # Include all submodules
+ EGIT_SUBMODULES=( '*' )
+else
+ MY_PN="PolyMC"
+
+ # Let's use the vendored tarball to avoid dealing with the submodules directly
+ SRC_URI="
+ https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
+ "
+
+ # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
+ S="${WORKDIR}/${MY_PN}-${PV}"
+
+ KEYWORDS="~amd64"
+fi
+
+# Apache-2.0 for MultiMC (PolyMC is forked from it)
+# GPL-3 for PolyMC
+# LGPL-3 for libnbtplusplus
+# LGPL-2.1 with linking exception for Quazip
+# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 LGPL-2.1-with-linking-exception OFL-1.1 MIT"
+
+SLOT="0"
+
+IUSE="debug"
+
+MIN_QT="5.6.0"
+
+QT_DEPS="
+ >=dev-qt/qtconcurrent-${MIN_QT}:5
+ >=dev-qt/qtcore-${MIN_QT}:5
+ >=dev-qt/qtgui-${MIN_QT}:5
+ >=dev-qt/qtnetwork-${MIN_QT}:5
+ >=dev-qt/qttest-${MIN_QT}:5
+ >=dev-qt/qtwidgets-${MIN_QT}:5
+ >=dev-qt/qtxml-${MIN_QT}:5
+"
+
+DEPEND="
+ ${QT_DEPS}
+ media-libs/libglvnd
+ sys-libs/zlib
+ >=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="
+ ${QT_DEPS}
+ sys-libs/zlib
+ >=virtual/jre-1.8.0:*
+ virtual/opengl
+"
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure(){
+ if use debug; then
+ CMAKE_BUILD_TYPE=Debug
+ else
+ # Prepare for LTO in 1.2.0 (?)
+ # See https://github.com/PolyMC/PolyMC/pull/333
+ CMAKE_BUILD_TYPE=Release
+ fi
+
+ local mycmakeargs=(
+ # Do a system install
+ -DLauncher_PORTABLE=0
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ # Resulting binary is named polymc
+ -DLauncher_APP_BINARY_NAME="${PN}"
+ )
+
+ cmake_src_configure
+}
+
+src_compile(){
+ cmake_src_compile
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ # https://github.com/PolyMC/PolyMC/issues/227
+ optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-05-02 9:09 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-05-02 9:09 UTC (permalink / raw
To: gentoo-commits
commit: 272a7c5789520776d0ab1b2758580c815d2cadd5
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sun May 1 20:35:41 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 2 09:05:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=272a7c57
games-action/polymc: update live version
The patch that was previously required was merged in upstream.
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/polymc-1.2.1.ebuild | 4 +++-
games-action/polymc/polymc-9999.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/games-action/polymc/polymc-1.2.1.ebuild b/games-action/polymc/polymc-1.2.1.ebuild
index d488a775fb9a..00e26da2635e 100644
--- a/games-action/polymc/polymc-1.2.1.ebuild
+++ b/games-action/polymc/polymc-1.2.1.ebuild
@@ -77,7 +77,9 @@ RDEPEND="
virtual/opengl
"
-PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
+if [[ ${PV} != 9999 ]]; then
+ PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
+fi
src_prepare() {
cmake_src_prepare
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index d488a775fb9a..00e26da2635e 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -77,7 +77,9 @@ RDEPEND="
virtual/opengl
"
-PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
+if [[ ${PV} != 9999 ]]; then
+ PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
+fi
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-05-02 9:09 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-05-02 9:09 UTC (permalink / raw
To: gentoo-commits
commit: 44225d2d8ac8d653cf9578627ca27d453f8cade4
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sun May 1 20:39:31 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 2 09:05:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44225d2d
games-action/polymc: remove 1.1.1
This version seems to have a really weird bug (#839789) that got fixed
in newer versions, besides being already pretty old.
Thus, users shouldn't use this anymore.
Bug: https://bugs.gentoo.org/839789
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25280
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 1 -
games-action/polymc/polymc-1.1.1.ebuild | 108 --------------------------------
2 files changed, 109 deletions(-)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 98093b7fbfd2..3ec18031f066 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,2 +1 @@
-DIST polymc-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5
DIST polymc-1.2.1.tar.gz 5157547 BLAKE2B 92a65cd1303b4f2dce299d2a40824de54babd47bd21a894827e7a0e94276551fc747873ba44e63ac13b3ca46649c3d5280ec9eecd92eb63678f8cbc3c27e4f69 SHA512 193415b552dbc3f540f481c22e36c2b9d0604757cb12283ec0fc2979246757937648b76821818f0742b3f5201ed7af8e535dff9ef3d5efcb22f7a1ddf9ee67d2
diff --git a/games-action/polymc/polymc-1.1.1.ebuild b/games-action/polymc/polymc-1.1.1.ebuild
deleted file mode 100644
index d036cb15c635..000000000000
--- a/games-action/polymc/polymc-1.1.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake java-pkg-2 optfeature xdg
-
-HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
-DESCRIPTION="A custom, open source Minecraft launcher"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="
- https://github.com/PolyMC/PolyMC
- https://github.com/MultiMC/libnbtplusplus
- https://github.com/stachenov/quazip
- "
-
- # Include all submodules
- EGIT_SUBMODULES=( '*' )
-else
- MY_PN="PolyMC"
-
- # Let's use the vendored tarball to avoid dealing with the submodules directly
- SRC_URI="
- https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
- "
-
- # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
- S="${WORKDIR}/${MY_PN}-${PV}"
-
- KEYWORDS="~amd64"
-fi
-
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# GPL-3 for PolyMC
-# LGPL-3 for libnbtplusplus
-# LGPL-2.1 with linking exception for Quazip
-# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 LGPL-2.1-with-linking-exception OFL-1.1 MIT"
-
-SLOT="0"
-
-IUSE="debug"
-
-MIN_QT="5.6.0"
-
-QT_DEPS="
- >=dev-qt/qtconcurrent-${MIN_QT}:5
- >=dev-qt/qtcore-${MIN_QT}:5
- >=dev-qt/qtgui-${MIN_QT}:5
- >=dev-qt/qtnetwork-${MIN_QT}:5
- >=dev-qt/qttest-${MIN_QT}:5
- >=dev-qt/qtwidgets-${MIN_QT}:5
- >=dev-qt/qtxml-${MIN_QT}:5
-"
-
-DEPEND="
- ${QT_DEPS}
- media-libs/libglvnd
- sys-libs/zlib
- >=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="
- ${QT_DEPS}
- sys-libs/zlib
- >=virtual/jre-1.8.0:*
- virtual/opengl
-"
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure(){
- if use debug; then
- CMAKE_BUILD_TYPE=Debug
- else
- # Prepare for LTO in 1.2.0 (?)
- # See https://github.com/PolyMC/PolyMC/pull/333
- CMAKE_BUILD_TYPE=Release
- fi
-
- local mycmakeargs=(
- # Do a system install
- -DLauncher_PORTABLE=0
- -DCMAKE_INSTALL_PREFIX="/usr"
- # Resulting binary is named polymc
- -DLauncher_APP_BINARY_NAME="${PN}"
- )
-
- cmake_src_configure
-}
-
-src_compile(){
- cmake_src_compile
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- # https://github.com/PolyMC/PolyMC/issues/227
- optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
-}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-05-09 15:39 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-05-09 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 3d1d827516136da18b783a1e46534fe73b05384a
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sun May 8 20:39:22 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 9 15:39:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1d8275
games-action/polymc: add 1.2.2
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25392
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 1 +
games-action/polymc/polymc-1.2.2.ebuild | 115 ++++++++++++++++++++++++++++++++
2 files changed, 116 insertions(+)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 3ec18031f066..8d911f723887 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1 +1,2 @@
DIST polymc-1.2.1.tar.gz 5157547 BLAKE2B 92a65cd1303b4f2dce299d2a40824de54babd47bd21a894827e7a0e94276551fc747873ba44e63ac13b3ca46649c3d5280ec9eecd92eb63678f8cbc3c27e4f69 SHA512 193415b552dbc3f540f481c22e36c2b9d0604757cb12283ec0fc2979246757937648b76821818f0742b3f5201ed7af8e535dff9ef3d5efcb22f7a1ddf9ee67d2
+DIST polymc-1.2.2.tar.gz 5167667 BLAKE2B 5cc26d1650f9cf851ad01d3bc75a0ec3f19b3aa50031a91a3c9c16e9bc73dabfc495e408b8c83559026f3af03b86fdd5c83815f04c62121b71c144d1548d764c SHA512 d81d1aaba5361c8ad664bbecffd9869dda637002a5c1288142f40d21abca974d6cc03a50685be5f70a01d5b1ae8bcff4e48c5b849f6c3dcd959e5977582ada58
diff --git a/games-action/polymc/polymc-1.2.2.ebuild b/games-action/polymc/polymc-1.2.2.ebuild
new file mode 100644
index 000000000000..00e26da2635e
--- /dev/null
+++ b/games-action/polymc/polymc-1.2.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake java-pkg-2 optfeature xdg
+
+HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/PolyMC/libnbtplusplus
+ "
+
+ EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
+else
+ MY_PN="PolyMC"
+
+ # Let's use the vendored tarball to avoid dealing with the submodules directly
+ SRC_URI="
+ https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
+ "
+
+ # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
+ S="${WORKDIR}/${MY_PN}-${PV}"
+
+ KEYWORDS="~amd64"
+fi
+
+# Apache-2.0 for MultiMC (PolyMC is forked from it)
+# GPL-3 for PolyMC
+# LGPL-3 for libnbtplusplus
+# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
+
+SLOT="0"
+
+IUSE="debug lto"
+REQUIRED_USE="
+ lto? ( !debug )
+"
+
+MIN_QT="5.6.0"
+
+QT_DEPS="
+ >=dev-qt/qtconcurrent-${MIN_QT}:5
+ >=dev-qt/qtcore-${MIN_QT}:5
+ >=dev-qt/qtgui-${MIN_QT}:5
+ >=dev-qt/qtnetwork-${MIN_QT}:5
+ >=dev-qt/qttest-${MIN_QT}:5
+ >=dev-qt/qtwidgets-${MIN_QT}:5
+ >=dev-qt/qtxml-${MIN_QT}:5
+"
+
+# Required at both build-time and run-time
+COMMON_DEPENDS="
+ ${QT_DEPS}
+ >=dev-libs/quazip-1.3:=
+ sys-libs/zlib
+"
+
+DEPEND="
+ ${COMMON_DEPENDS}
+ media-libs/libglvnd
+ >=virtual/jdk-1.8.0:*
+"
+
+# At run-time we don't depend on JDK, only JRE
+# And we need more than just the GL headers
+RDEPEND="
+ ${COMMON_DEPENDS}
+ >=virtual/jre-1.8.0:*
+ virtual/opengl
+"
+
+if [[ ${PV} != 9999 ]]; then
+ PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
+fi
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure(){
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ # Resulting binary is named polymc
+ -DLauncher_APP_BINARY_NAME="${PN}"
+
+ -DENABLE_LTO=$(usex lto)
+ )
+
+ if use debug; then
+ CMAKE_BUILD_TYPE=Debug
+ else
+ CMAKE_BUILD_TYPE=Release
+ fi
+
+ cmake_src_configure
+}
+
+src_compile(){
+ cmake_src_compile
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ # https://github.com/PolyMC/PolyMC/issues/227
+ optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-05-23 10:22 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-05-23 10:22 UTC (permalink / raw
To: gentoo-commits
commit: c357062659809ea808cb32c2d41c50770a2dbe6e
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Mon May 16 20:44:48 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 23 10:21:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3570626
games-action/polymc: drop 1.2.1
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 1 -
games-action/polymc/polymc-1.2.1.ebuild | 115 --------------------------------
2 files changed, 116 deletions(-)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 8d911f723887..ad7aefc1e7e7 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,2 +1 @@
-DIST polymc-1.2.1.tar.gz 5157547 BLAKE2B 92a65cd1303b4f2dce299d2a40824de54babd47bd21a894827e7a0e94276551fc747873ba44e63ac13b3ca46649c3d5280ec9eecd92eb63678f8cbc3c27e4f69 SHA512 193415b552dbc3f540f481c22e36c2b9d0604757cb12283ec0fc2979246757937648b76821818f0742b3f5201ed7af8e535dff9ef3d5efcb22f7a1ddf9ee67d2
DIST polymc-1.2.2.tar.gz 5167667 BLAKE2B 5cc26d1650f9cf851ad01d3bc75a0ec3f19b3aa50031a91a3c9c16e9bc73dabfc495e408b8c83559026f3af03b86fdd5c83815f04c62121b71c144d1548d764c SHA512 d81d1aaba5361c8ad664bbecffd9869dda637002a5c1288142f40d21abca974d6cc03a50685be5f70a01d5b1ae8bcff4e48c5b849f6c3dcd959e5977582ada58
diff --git a/games-action/polymc/polymc-1.2.1.ebuild b/games-action/polymc/polymc-1.2.1.ebuild
deleted file mode 100644
index 00e26da2635e..000000000000
--- a/games-action/polymc/polymc-1.2.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake java-pkg-2 optfeature xdg
-
-HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
-DESCRIPTION="A custom, open source Minecraft launcher"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="
- https://github.com/PolyMC/PolyMC
- https://github.com/PolyMC/libnbtplusplus
- "
-
- EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
-else
- MY_PN="PolyMC"
-
- # Let's use the vendored tarball to avoid dealing with the submodules directly
- SRC_URI="
- https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
- "
-
- # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
- S="${WORKDIR}/${MY_PN}-${PV}"
-
- KEYWORDS="~amd64"
-fi
-
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# GPL-3 for PolyMC
-# LGPL-3 for libnbtplusplus
-# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
-
-SLOT="0"
-
-IUSE="debug lto"
-REQUIRED_USE="
- lto? ( !debug )
-"
-
-MIN_QT="5.6.0"
-
-QT_DEPS="
- >=dev-qt/qtconcurrent-${MIN_QT}:5
- >=dev-qt/qtcore-${MIN_QT}:5
- >=dev-qt/qtgui-${MIN_QT}:5
- >=dev-qt/qtnetwork-${MIN_QT}:5
- >=dev-qt/qttest-${MIN_QT}:5
- >=dev-qt/qtwidgets-${MIN_QT}:5
- >=dev-qt/qtxml-${MIN_QT}:5
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
- ${QT_DEPS}
- >=dev-libs/quazip-1.3:=
- sys-libs/zlib
-"
-
-DEPEND="
- ${COMMON_DEPENDS}
- media-libs/libglvnd
- >=virtual/jdk-1.8.0:*
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
- ${COMMON_DEPENDS}
- >=virtual/jre-1.8.0:*
- virtual/opengl
-"
-
-if [[ ${PV} != 9999 ]]; then
- PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
-fi
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure(){
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="/usr"
- # Resulting binary is named polymc
- -DLauncher_APP_BINARY_NAME="${PN}"
-
- -DENABLE_LTO=$(usex lto)
- )
-
- if use debug; then
- CMAKE_BUILD_TYPE=Debug
- else
- CMAKE_BUILD_TYPE=Release
- fi
-
- cmake_src_configure
-}
-
-src_compile(){
- cmake_src_compile
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- # https://github.com/PolyMC/PolyMC/issues/227
- optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
-}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-05-23 10:22 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-05-23 10:22 UTC (permalink / raw
To: gentoo-commits
commit: 9740fcba09532df03abf94e0610918cb5c0c8d6e
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Mon May 16 20:50:43 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 23 10:21:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9740fcba
games-action/polymc: add version 1.3.0
This also bumps the minimum required Qt version to 5.12
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/{polymc-9999.ebuild => polymc-1.3.0.ebuild} | 6 +-----
games-action/polymc/polymc-9999.ebuild | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-1.3.0.ebuild
similarity index 95%
copy from games-action/polymc/polymc-9999.ebuild
copy to games-action/polymc/polymc-1.3.0.ebuild
index 00e26da2635e..abe73ed34f30 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-1.3.0.ebuild
@@ -44,7 +44,7 @@ REQUIRED_USE="
lto? ( !debug )
"
-MIN_QT="5.6.0"
+MIN_QT="5.12.0"
QT_DEPS="
>=dev-qt/qtconcurrent-${MIN_QT}:5
@@ -77,10 +77,6 @@ RDEPEND="
virtual/opengl
"
-if [[ ${PV} != 9999 ]]; then
- PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
-fi
-
src_prepare() {
cmake_src_prepare
}
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 00e26da2635e..abe73ed34f30 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -44,7 +44,7 @@ REQUIRED_USE="
lto? ( !debug )
"
-MIN_QT="5.6.0"
+MIN_QT="5.12.0"
QT_DEPS="
>=dev-qt/qtconcurrent-${MIN_QT}:5
@@ -77,10 +77,6 @@ RDEPEND="
virtual/opengl
"
-if [[ ${PV} != 9999 ]]; then
- PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
-fi
-
src_prepare() {
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-05-29 18:44 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-05-29 18:44 UTC (permalink / raw
To: gentoo-commits
commit: c48ba2907738cf5163ffc95e738709425d1d33f4
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 18:39:10 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun May 29 18:44:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c48ba290
games-action/polymc: add 1.3.1
Closes: https://github.com/gentoo/gentoo/pull/25679
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 1 +
games-action/polymc/polymc-1.3.1.ebuild | 111 ++++++++++++++++++++++++++++++++
2 files changed, 112 insertions(+)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index ac7ab8450067..53f0d3f4fada 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1 +1,2 @@
DIST polymc-1.3.0.tar.gz 5115480 BLAKE2B ac818b899d25f1545ceafd109a8eb48acd6a2d4b09b8d7f5365de0fc1b6ce0171ed053bc19785192ab781a2d7f506167599e3f3747e94fe1cf62b9989208e685 SHA512 b33660dfc7026f1153aaffd4429b9047bffa9cc80a3231bb19c0f3a7d4046654c49f278d9c07ae3ac631172ed147fa06065c2713fb59221ff9131406d8c6df46
+DIST polymc-1.3.1.tar.gz 5651471 BLAKE2B ee36d6f046959932c72d6b3320704bbc565afd56e03f715db0f9270148b7ced80ff46d4e2ad33167e77e9b95d5dbe3316d9c7b5f9b36c15e28989555fddf0239 SHA512 8cfd644574a588a0b8dca6adbd9aee21bd603fc29649bbf55ad713dc37a1a9d7a8720031a6952d97c6a597c082f7437315044926d7da2d50e58a3da096343c7b
diff --git a/games-action/polymc/polymc-1.3.1.ebuild b/games-action/polymc/polymc-1.3.1.ebuild
new file mode 100644
index 000000000000..abe73ed34f30
--- /dev/null
+++ b/games-action/polymc/polymc-1.3.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake java-pkg-2 optfeature xdg
+
+HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/PolyMC/libnbtplusplus
+ "
+
+ EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
+else
+ MY_PN="PolyMC"
+
+ # Let's use the vendored tarball to avoid dealing with the submodules directly
+ SRC_URI="
+ https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
+ "
+
+ # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
+ S="${WORKDIR}/${MY_PN}-${PV}"
+
+ KEYWORDS="~amd64"
+fi
+
+# Apache-2.0 for MultiMC (PolyMC is forked from it)
+# GPL-3 for PolyMC
+# LGPL-3 for libnbtplusplus
+# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
+
+SLOT="0"
+
+IUSE="debug lto"
+REQUIRED_USE="
+ lto? ( !debug )
+"
+
+MIN_QT="5.12.0"
+
+QT_DEPS="
+ >=dev-qt/qtconcurrent-${MIN_QT}:5
+ >=dev-qt/qtcore-${MIN_QT}:5
+ >=dev-qt/qtgui-${MIN_QT}:5
+ >=dev-qt/qtnetwork-${MIN_QT}:5
+ >=dev-qt/qttest-${MIN_QT}:5
+ >=dev-qt/qtwidgets-${MIN_QT}:5
+ >=dev-qt/qtxml-${MIN_QT}:5
+"
+
+# Required at both build-time and run-time
+COMMON_DEPENDS="
+ ${QT_DEPS}
+ >=dev-libs/quazip-1.3:=
+ sys-libs/zlib
+"
+
+DEPEND="
+ ${COMMON_DEPENDS}
+ media-libs/libglvnd
+ >=virtual/jdk-1.8.0:*
+"
+
+# At run-time we don't depend on JDK, only JRE
+# And we need more than just the GL headers
+RDEPEND="
+ ${COMMON_DEPENDS}
+ >=virtual/jre-1.8.0:*
+ virtual/opengl
+"
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure(){
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ # Resulting binary is named polymc
+ -DLauncher_APP_BINARY_NAME="${PN}"
+
+ -DENABLE_LTO=$(usex lto)
+ )
+
+ if use debug; then
+ CMAKE_BUILD_TYPE=Debug
+ else
+ CMAKE_BUILD_TYPE=Release
+ fi
+
+ cmake_src_configure
+}
+
+src_compile(){
+ cmake_src_compile
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ # https://github.com/PolyMC/PolyMC/issues/227
+ optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-06-01 0:10 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-06-01 0:10 UTC (permalink / raw
To: gentoo-commits
commit: 69101d81e5b71f22cf39afe6cf3a01a2e670ca08
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Tue May 31 23:47:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 00:10:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69101d81
games-action/polymc: remove some troublesome compile flags
Remove -Werror and -D_FORTIFY_SOURCE from the upstream CMakeLists, to
prevent breakage with user-defined flags.
Closes: https://bugs.gentoo.org/848765
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25713
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/polymc-1.3.0.ebuild | 4 ++++
games-action/polymc/polymc-1.3.1.ebuild | 4 ++++
games-action/polymc/polymc-9999.ebuild | 4 ++++
3 files changed, 12 insertions(+)
diff --git a/games-action/polymc/polymc-1.3.0.ebuild b/games-action/polymc/polymc-1.3.0.ebuild
index abe73ed34f30..1034a30e5df0 100644
--- a/games-action/polymc/polymc-1.3.0.ebuild
+++ b/games-action/polymc/polymc-1.3.0.ebuild
@@ -79,6 +79,10 @@ RDEPEND="
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(){
diff --git a/games-action/polymc/polymc-1.3.1.ebuild b/games-action/polymc/polymc-1.3.1.ebuild
index abe73ed34f30..1034a30e5df0 100644
--- a/games-action/polymc/polymc-1.3.1.ebuild
+++ b/games-action/polymc/polymc-1.3.1.ebuild
@@ -79,6 +79,10 @@ RDEPEND="
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(){
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index abe73ed34f30..1034a30e5df0 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -79,6 +79,10 @@ RDEPEND="
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(){
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-06-12 20:24 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-06-12 20:24 UTC (permalink / raw
To: gentoo-commits
commit: c34f6f006a82b286fc110e543e2d1197676196ea
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sun Jun 12 17:56:44 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 20:24:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c34f6f00
games-action/polymc: drop 1.3.0
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25866
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 1 -
games-action/polymc/polymc-1.3.0.ebuild | 115 --------------------------------
2 files changed, 116 deletions(-)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 4d5e3fd4d0bc..bc9c75eb737d 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,3 +1,2 @@
-DIST polymc-1.3.0.tar.gz 5115480 BLAKE2B ac818b899d25f1545ceafd109a8eb48acd6a2d4b09b8d7f5365de0fc1b6ce0171ed053bc19785192ab781a2d7f506167599e3f3747e94fe1cf62b9989208e685 SHA512 b33660dfc7026f1153aaffd4429b9047bffa9cc80a3231bb19c0f3a7d4046654c49f278d9c07ae3ac631172ed147fa06065c2713fb59221ff9131406d8c6df46
DIST polymc-1.3.1.tar.gz 5651471 BLAKE2B ee36d6f046959932c72d6b3320704bbc565afd56e03f715db0f9270148b7ced80ff46d4e2ad33167e77e9b95d5dbe3316d9c7b5f9b36c15e28989555fddf0239 SHA512 8cfd644574a588a0b8dca6adbd9aee21bd603fc29649bbf55ad713dc37a1a9d7a8720031a6952d97c6a597c082f7437315044926d7da2d50e58a3da096343c7b
DIST polymc-1.3.2.tar.gz 5641952 BLAKE2B f1014c79c394db79e07bcd55c65c930ace80274a83cffc4c8adff58547f3ddf9baa5685ecd7b860c8ec21e4ae4ebf407233d3cb2b8d9ae2a81abd31248b1cebf SHA512 f272248631e76e2cb3b74f3bc91ab3d4f7e7cf4fb7396a09b8bcaf65d928076f49e436e3d7c1a34c32a2cbcf10760709f86cd9c0eca285b66790f25b1c466ea0
diff --git a/games-action/polymc/polymc-1.3.0.ebuild b/games-action/polymc/polymc-1.3.0.ebuild
deleted file mode 100644
index 1034a30e5df0..000000000000
--- a/games-action/polymc/polymc-1.3.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake java-pkg-2 optfeature xdg
-
-HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
-DESCRIPTION="A custom, open source Minecraft launcher"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="
- https://github.com/PolyMC/PolyMC
- https://github.com/PolyMC/libnbtplusplus
- "
-
- EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
-else
- MY_PN="PolyMC"
-
- # Let's use the vendored tarball to avoid dealing with the submodules directly
- SRC_URI="
- https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
- "
-
- # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
- S="${WORKDIR}/${MY_PN}-${PV}"
-
- KEYWORDS="~amd64"
-fi
-
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# GPL-3 for PolyMC
-# LGPL-3 for libnbtplusplus
-# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
-
-SLOT="0"
-
-IUSE="debug lto"
-REQUIRED_USE="
- lto? ( !debug )
-"
-
-MIN_QT="5.12.0"
-
-QT_DEPS="
- >=dev-qt/qtconcurrent-${MIN_QT}:5
- >=dev-qt/qtcore-${MIN_QT}:5
- >=dev-qt/qtgui-${MIN_QT}:5
- >=dev-qt/qtnetwork-${MIN_QT}:5
- >=dev-qt/qttest-${MIN_QT}:5
- >=dev-qt/qtwidgets-${MIN_QT}:5
- >=dev-qt/qtxml-${MIN_QT}:5
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
- ${QT_DEPS}
- >=dev-libs/quazip-1.3:=
- sys-libs/zlib
-"
-
-DEPEND="
- ${COMMON_DEPENDS}
- media-libs/libglvnd
- >=virtual/jdk-1.8.0:*
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
- ${COMMON_DEPENDS}
- >=virtual/jre-1.8.0:*
- virtual/opengl
-"
-
-src_prepare() {
- cmake_src_prepare
-
- # Prevent conflicting with the user's flags
- # See https://bugs.gentoo.org/848765 for more info
- sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
-}
-
-src_configure(){
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="/usr"
- # Resulting binary is named polymc
- -DLauncher_APP_BINARY_NAME="${PN}"
-
- -DENABLE_LTO=$(usex lto)
- )
-
- if use debug; then
- CMAKE_BUILD_TYPE=Debug
- else
- CMAKE_BUILD_TYPE=Release
- fi
-
- cmake_src_configure
-}
-
-src_compile(){
- cmake_src_compile
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- # https://github.com/PolyMC/PolyMC/issues/227
- optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
-}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-06-12 20:24 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-06-12 20:24 UTC (permalink / raw
To: gentoo-commits
commit: be3446362bb0b3c6008274f258da0a33ffcf34f8
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sun Jun 12 17:56:05 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 20:24:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be344636
games-action/polymc: add 1.3.2
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 1 +
games-action/polymc/polymc-1.3.2.ebuild | 115 ++++++++++++++++++++++++++++++++
2 files changed, 116 insertions(+)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 53f0d3f4fada..4d5e3fd4d0bc 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,2 +1,3 @@
DIST polymc-1.3.0.tar.gz 5115480 BLAKE2B ac818b899d25f1545ceafd109a8eb48acd6a2d4b09b8d7f5365de0fc1b6ce0171ed053bc19785192ab781a2d7f506167599e3f3747e94fe1cf62b9989208e685 SHA512 b33660dfc7026f1153aaffd4429b9047bffa9cc80a3231bb19c0f3a7d4046654c49f278d9c07ae3ac631172ed147fa06065c2713fb59221ff9131406d8c6df46
DIST polymc-1.3.1.tar.gz 5651471 BLAKE2B ee36d6f046959932c72d6b3320704bbc565afd56e03f715db0f9270148b7ced80ff46d4e2ad33167e77e9b95d5dbe3316d9c7b5f9b36c15e28989555fddf0239 SHA512 8cfd644574a588a0b8dca6adbd9aee21bd603fc29649bbf55ad713dc37a1a9d7a8720031a6952d97c6a597c082f7437315044926d7da2d50e58a3da096343c7b
+DIST polymc-1.3.2.tar.gz 5641952 BLAKE2B f1014c79c394db79e07bcd55c65c930ace80274a83cffc4c8adff58547f3ddf9baa5685ecd7b860c8ec21e4ae4ebf407233d3cb2b8d9ae2a81abd31248b1cebf SHA512 f272248631e76e2cb3b74f3bc91ab3d4f7e7cf4fb7396a09b8bcaf65d928076f49e436e3d7c1a34c32a2cbcf10760709f86cd9c0eca285b66790f25b1c466ea0
diff --git a/games-action/polymc/polymc-1.3.2.ebuild b/games-action/polymc/polymc-1.3.2.ebuild
new file mode 100644
index 000000000000..1034a30e5df0
--- /dev/null
+++ b/games-action/polymc/polymc-1.3.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake java-pkg-2 optfeature xdg
+
+HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/PolyMC/libnbtplusplus
+ "
+
+ EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
+else
+ MY_PN="PolyMC"
+
+ # Let's use the vendored tarball to avoid dealing with the submodules directly
+ SRC_URI="
+ https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
+ "
+
+ # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
+ S="${WORKDIR}/${MY_PN}-${PV}"
+
+ KEYWORDS="~amd64"
+fi
+
+# Apache-2.0 for MultiMC (PolyMC is forked from it)
+# GPL-3 for PolyMC
+# LGPL-3 for libnbtplusplus
+# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
+
+SLOT="0"
+
+IUSE="debug lto"
+REQUIRED_USE="
+ lto? ( !debug )
+"
+
+MIN_QT="5.12.0"
+
+QT_DEPS="
+ >=dev-qt/qtconcurrent-${MIN_QT}:5
+ >=dev-qt/qtcore-${MIN_QT}:5
+ >=dev-qt/qtgui-${MIN_QT}:5
+ >=dev-qt/qtnetwork-${MIN_QT}:5
+ >=dev-qt/qttest-${MIN_QT}:5
+ >=dev-qt/qtwidgets-${MIN_QT}:5
+ >=dev-qt/qtxml-${MIN_QT}:5
+"
+
+# Required at both build-time and run-time
+COMMON_DEPENDS="
+ ${QT_DEPS}
+ >=dev-libs/quazip-1.3:=
+ sys-libs/zlib
+"
+
+DEPEND="
+ ${COMMON_DEPENDS}
+ media-libs/libglvnd
+ >=virtual/jdk-1.8.0:*
+"
+
+# At run-time we don't depend on JDK, only JRE
+# And we need more than just the GL headers
+RDEPEND="
+ ${COMMON_DEPENDS}
+ >=virtual/jre-1.8.0:*
+ virtual/opengl
+"
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Prevent conflicting with the user's flags
+ # See https://bugs.gentoo.org/848765 for more info
+ sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
+}
+
+src_configure(){
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ # Resulting binary is named polymc
+ -DLauncher_APP_BINARY_NAME="${PN}"
+
+ -DENABLE_LTO=$(usex lto)
+ )
+
+ if use debug; then
+ CMAKE_BUILD_TYPE=Debug
+ else
+ CMAKE_BUILD_TYPE=Release
+ fi
+
+ cmake_src_configure
+}
+
+src_compile(){
+ cmake_src_compile
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ # https://github.com/PolyMC/PolyMC/issues/227
+ optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-07-29 3:16 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-07-29 3:16 UTC (permalink / raw
To: gentoo-commits
commit: fe9a6474343edf62aceb3bee003310d5522d9ab4
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sun Jul 3 15:48:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9a6474
games-action/polymc: add new optional features
PolyMC now has optional support for MangoHud and Feral's Gamemode, so
we'll add those to the `optfeatures`.
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/polymc-9999.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 1034a30e5df0..96537440ecbc 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -112,4 +112,7 @@ pkg_postinst() {
# https://github.com/PolyMC/PolyMC/issues/227
optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+
+ optfeature "built-in MangoHud support" games-util/mangohud
+ optfeature "built-in Feral Gamemode support" games-util/gamemode
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-07-29 3:16 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-07-29 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 97eea01e7dc71b8f4df61830bd0e6b420734d61a
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sun Jul 3 17:25:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97eea01e
games-action/polymc: add ECM dependency
As per https://github.com/PolyMC/PolyMC/pull/784, we now need ECM as a
build-time dependency.
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/polymc-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index cc17908560c9..cf43c1ce025e 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -67,6 +67,7 @@ COMMON_DEPENDS="
DEPEND="
${COMMON_DEPENDS}
+ kde-frameworks/extra-cmake-modules
media-libs/libglvnd
>=virtual/jdk-1.8.0:*
"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-07-29 3:16 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-07-29 3:16 UTC (permalink / raw
To: gentoo-commits
commit: ad64df30768a8a05b492b000ddccf58d7008aeb2
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Thu Jul 14 11:33:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad64df30
games-action/polymc: add app-text/scdoc as a build-time dependency
We changed how our man page is built, so now we also need this extra
dependency.
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/polymc-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index cf43c1ce025e..eec654ffacd7 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -67,6 +67,7 @@ COMMON_DEPENDS="
DEPEND="
${COMMON_DEPENDS}
+ app-text/scdoc
kde-frameworks/extra-cmake-modules
media-libs/libglvnd
>=virtual/jdk-1.8.0:*
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-07-29 3:16 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-07-29 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 7d1bfe7604fa0f9f40e82430053df5f71e2cb8d7
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sun Jul 3 17:22:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d1bfe76
games-action/polymc: add tests
Following fixes by upstream, we can now run tests too :)
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/polymc-9999.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 96537440ecbc..cc17908560c9 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -39,11 +39,13 @@ LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
SLOT="0"
-IUSE="debug lto"
+IUSE="debug lto test"
REQUIRED_USE="
lto? ( !debug )
"
+RESTRICT="!test? ( test )"
+
MIN_QT="5.12.0"
QT_DEPS="
@@ -92,6 +94,7 @@ src_configure(){
-DLauncher_APP_BINARY_NAME="${PN}"
-DENABLE_LTO=$(usex lto)
+ -DBUILD_TESTING=$(usex test)
)
if use debug; then
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-07-29 3:16 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-07-29 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 2ee47f8b8e1dd38985816afe5ef76213eada857a
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sat Jul 23 14:07:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee47f8b
games-action/polymc: explicitly add Qt5 build config
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/polymc-9999.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index eec654ffacd7..79439b22ba10 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -94,6 +94,8 @@ src_configure(){
-DCMAKE_INSTALL_PREFIX="/usr"
# Resulting binary is named polymc
-DLauncher_APP_BINARY_NAME="${PN}"
+ # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things
+ -DLauncher_QT_VERSION_MAJOR=5
-DENABLE_LTO=$(usex lto)
-DBUILD_TESTING=$(usex test)
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-07-29 3:16 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-07-29 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 5d63961c59578a8886e3deb7d4c8882dbde44ec2
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sat Jul 23 14:08:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d63961c
games-action/polymc: add 1.4.0
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/Manifest | 1 +
games-action/polymc/polymc-1.4.0.ebuild | 125 ++++++++++++++++++++++++++++++++
2 files changed, 126 insertions(+)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 18eb23870758..0edfec45ad29 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1 +1,2 @@
DIST polymc-1.3.2.tar.gz 5641952 BLAKE2B f1014c79c394db79e07bcd55c65c930ace80274a83cffc4c8adff58547f3ddf9baa5685ecd7b860c8ec21e4ae4ebf407233d3cb2b8d9ae2a81abd31248b1cebf SHA512 f272248631e76e2cb3b74f3bc91ab3d4f7e7cf4fb7396a09b8bcaf65d928076f49e436e3d7c1a34c32a2cbcf10760709f86cd9c0eca285b66790f25b1c466ea0
+DIST polymc-1.4.0.tar.gz 5766980 BLAKE2B 2588f9bade8dcd1e6bc4a9eb8a496448562a05428121e5547e5f66213b178e906b557b4636d30125aaa203e2cb00c6dfcc351f8bf038d352693adfb5811112d6 SHA512 5492310bb382a08bfef01843e476839723c33734cca46f850f08538f5b2c2d421d40fcb57bc207d36e08337230e5f29a594f33bd354d3a9bee5c801a1cd77fe0
diff --git a/games-action/polymc/polymc-1.4.0.ebuild b/games-action/polymc/polymc-1.4.0.ebuild
new file mode 100644
index 000000000000..79439b22ba10
--- /dev/null
+++ b/games-action/polymc/polymc-1.4.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake java-pkg-2 optfeature xdg
+
+HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/PolyMC/libnbtplusplus
+ "
+
+ EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
+else
+ MY_PN="PolyMC"
+
+ # Let's use the vendored tarball to avoid dealing with the submodules directly
+ SRC_URI="
+ https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
+ "
+
+ # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
+ S="${WORKDIR}/${MY_PN}-${PV}"
+
+ KEYWORDS="~amd64"
+fi
+
+# Apache-2.0 for MultiMC (PolyMC is forked from it)
+# GPL-3 for PolyMC
+# LGPL-3 for libnbtplusplus
+# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
+
+SLOT="0"
+
+IUSE="debug lto test"
+REQUIRED_USE="
+ lto? ( !debug )
+"
+
+RESTRICT="!test? ( test )"
+
+MIN_QT="5.12.0"
+
+QT_DEPS="
+ >=dev-qt/qtconcurrent-${MIN_QT}:5
+ >=dev-qt/qtcore-${MIN_QT}:5
+ >=dev-qt/qtgui-${MIN_QT}:5
+ >=dev-qt/qtnetwork-${MIN_QT}:5
+ >=dev-qt/qttest-${MIN_QT}:5
+ >=dev-qt/qtwidgets-${MIN_QT}:5
+ >=dev-qt/qtxml-${MIN_QT}:5
+"
+
+# Required at both build-time and run-time
+COMMON_DEPENDS="
+ ${QT_DEPS}
+ >=dev-libs/quazip-1.3:=
+ sys-libs/zlib
+"
+
+DEPEND="
+ ${COMMON_DEPENDS}
+ app-text/scdoc
+ kde-frameworks/extra-cmake-modules
+ media-libs/libglvnd
+ >=virtual/jdk-1.8.0:*
+"
+
+# At run-time we don't depend on JDK, only JRE
+# And we need more than just the GL headers
+RDEPEND="
+ ${COMMON_DEPENDS}
+ >=virtual/jre-1.8.0:*
+ virtual/opengl
+"
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Prevent conflicting with the user's flags
+ # See https://bugs.gentoo.org/848765 for more info
+ sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
+}
+
+src_configure(){
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ # Resulting binary is named polymc
+ -DLauncher_APP_BINARY_NAME="${PN}"
+ # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things
+ -DLauncher_QT_VERSION_MAJOR=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
+
+ # https://github.com/PolyMC/PolyMC/issues/227
+ optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+
+ optfeature "built-in MangoHud support" games-util/mangohud
+ optfeature "built-in Feral Gamemode support" games-util/gamemode
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-07-29 3:16 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-07-29 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 70df83fbc85b83b5debcfdda87892faca36619c9
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Thu Jul 28 14:49:55 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70df83fb
games-action/polymc: drop 1.4.0
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/Manifest | 1 -
games-action/polymc/polymc-1.4.0.ebuild | 129 --------------------------------
2 files changed, 130 deletions(-)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 0edfec45ad29..18eb23870758 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,2 +1 @@
DIST polymc-1.3.2.tar.gz 5641952 BLAKE2B f1014c79c394db79e07bcd55c65c930ace80274a83cffc4c8adff58547f3ddf9baa5685ecd7b860c8ec21e4ae4ebf407233d3cb2b8d9ae2a81abd31248b1cebf SHA512 f272248631e76e2cb3b74f3bc91ab3d4f7e7cf4fb7396a09b8bcaf65d928076f49e436e3d7c1a34c32a2cbcf10760709f86cd9c0eca285b66790f25b1c466ea0
-DIST polymc-1.4.0.tar.gz 5766980 BLAKE2B 2588f9bade8dcd1e6bc4a9eb8a496448562a05428121e5547e5f66213b178e906b557b4636d30125aaa203e2cb00c6dfcc351f8bf038d352693adfb5811112d6 SHA512 5492310bb382a08bfef01843e476839723c33734cca46f850f08538f5b2c2d421d40fcb57bc207d36e08337230e5f29a594f33bd354d3a9bee5c801a1cd77fe0
diff --git a/games-action/polymc/polymc-1.4.0.ebuild b/games-action/polymc/polymc-1.4.0.ebuild
deleted file mode 100644
index 508b1bf1a3e7..000000000000
--- a/games-action/polymc/polymc-1.4.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake java-pkg-2 optfeature xdg
-
-HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
-DESCRIPTION="A custom, open source Minecraft launcher"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="
- https://github.com/PolyMC/PolyMC
- https://github.com/PolyMC/libnbtplusplus
- "
-
- EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
-else
- MY_PN="PolyMC"
-
- # Let's use the vendored tarball to avoid dealing with the submodules directly
- SRC_URI="
- https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
- "
-
- # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
- S="${WORKDIR}/${MY_PN}-${PV}"
-
- KEYWORDS="~amd64"
-fi
-
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# GPL-3 for PolyMC
-# LGPL-3 for libnbtplusplus
-# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
-
-SLOT="0"
-
-IUSE="debug lto test"
-REQUIRED_USE="
- lto? ( !debug )
-"
-
-RESTRICT="!test? ( test )"
-
-MIN_QT="5.12.0"
-QT_SLOT=5
-
-QT_DEPS="
- >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qttest-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT}
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
- ${QT_DEPS}
- >=dev-libs/quazip-1.3:=
- sys-libs/zlib
-"
-
-BDEPEND="
- app-text/scdoc
- kde-frameworks/extra-cmake-modules:5
-"
-
-DEPEND="
- ${COMMON_DEPENDS}
- media-libs/libglvnd
- >=virtual/jdk-1.8.0:*
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
- ${COMMON_DEPENDS}
- >=virtual/jre-1.8.0:*
- virtual/opengl
-"
-
-src_prepare() {
- cmake_src_prepare
-
- # Prevent conflicting with the user's flags
- # See https://bugs.gentoo.org/848765 for more info
- sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
-}
-
-src_configure(){
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="/usr"
- # Resulting binary is named polymc
- -DLauncher_APP_BINARY_NAME="${PN}"
- # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things
- -DLauncher_QT_VERSION_MAJOR=${QT_SLOT}
-
- -DENABLE_LTO=$(usex lto)
- -DBUILD_TESTING=$(usex test)
- )
-
- if use debug; then
- CMAKE_BUILD_TYPE=Debug
- else
- CMAKE_BUILD_TYPE=Release
- fi
-
- cmake_src_configure
-}
-
-src_compile(){
- cmake_src_compile
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- # https://github.com/PolyMC/PolyMC/issues/227
- optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
-
- optfeature "built-in MangoHud support" games-util/mangohud
- optfeature "built-in Feral Gamemode support" games-util/gamemode
-}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-07-29 3:16 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-07-29 3:16 UTC (permalink / raw
To: gentoo-commits
commit: a8746c40b3e880596eed2c45f33445e740c44d88
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sat Jul 23 20:36:44 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8746c40
games-action/polymc: add `QT_SLOT` variable to simplify maintenance
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/polymc-1.4.0.ebuild | 17 +++++++++--------
games-action/polymc/polymc-9999.ebuild | 17 +++++++++--------
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/games-action/polymc/polymc-1.4.0.ebuild b/games-action/polymc/polymc-1.4.0.ebuild
index 04335972d1f2..508b1bf1a3e7 100644
--- a/games-action/polymc/polymc-1.4.0.ebuild
+++ b/games-action/polymc/polymc-1.4.0.ebuild
@@ -47,15 +47,16 @@ REQUIRED_USE="
RESTRICT="!test? ( test )"
MIN_QT="5.12.0"
+QT_SLOT=5
QT_DEPS="
- >=dev-qt/qtconcurrent-${MIN_QT}:5
- >=dev-qt/qtcore-${MIN_QT}:5
- >=dev-qt/qtgui-${MIN_QT}:5
- >=dev-qt/qtnetwork-${MIN_QT}:5
- >=dev-qt/qttest-${MIN_QT}:5
- >=dev-qt/qtwidgets-${MIN_QT}:5
- >=dev-qt/qtxml-${MIN_QT}:5
+ >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qttest-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT}
"
# Required at both build-time and run-time
@@ -98,7 +99,7 @@ src_configure(){
# Resulting binary is named polymc
-DLauncher_APP_BINARY_NAME="${PN}"
# Force Qt5 to avoid accidentaly building the Qt6 version and breaking things
- -DLauncher_QT_VERSION_MAJOR=5
+ -DLauncher_QT_VERSION_MAJOR=${QT_SLOT}
-DENABLE_LTO=$(usex lto)
-DBUILD_TESTING=$(usex test)
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 04335972d1f2..508b1bf1a3e7 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -47,15 +47,16 @@ REQUIRED_USE="
RESTRICT="!test? ( test )"
MIN_QT="5.12.0"
+QT_SLOT=5
QT_DEPS="
- >=dev-qt/qtconcurrent-${MIN_QT}:5
- >=dev-qt/qtcore-${MIN_QT}:5
- >=dev-qt/qtgui-${MIN_QT}:5
- >=dev-qt/qtnetwork-${MIN_QT}:5
- >=dev-qt/qttest-${MIN_QT}:5
- >=dev-qt/qtwidgets-${MIN_QT}:5
- >=dev-qt/qtxml-${MIN_QT}:5
+ >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qttest-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT}
"
# Required at both build-time and run-time
@@ -98,7 +99,7 @@ src_configure(){
# Resulting binary is named polymc
-DLauncher_APP_BINARY_NAME="${PN}"
# Force Qt5 to avoid accidentaly building the Qt6 version and breaking things
- -DLauncher_QT_VERSION_MAJOR=5
+ -DLauncher_QT_VERSION_MAJOR=${QT_SLOT}
-DENABLE_LTO=$(usex lto)
-DBUILD_TESTING=$(usex test)
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-07-29 3:16 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-07-29 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 7ad933061a3e909099b695d13269bc27f3428387
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sat Jul 23 20:30:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad93306
games-action/polymc: move scdoc and ECM deps to BDEPEND
Those are only needed on the building machine.
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/polymc-1.4.0.ebuild | 7 +++++--
games-action/polymc/polymc-9999.ebuild | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/games-action/polymc/polymc-1.4.0.ebuild b/games-action/polymc/polymc-1.4.0.ebuild
index 79439b22ba10..04335972d1f2 100644
--- a/games-action/polymc/polymc-1.4.0.ebuild
+++ b/games-action/polymc/polymc-1.4.0.ebuild
@@ -65,10 +65,13 @@ COMMON_DEPENDS="
sys-libs/zlib
"
+BDEPEND="
+ app-text/scdoc
+ kde-frameworks/extra-cmake-modules:5
+"
+
DEPEND="
${COMMON_DEPENDS}
- app-text/scdoc
- kde-frameworks/extra-cmake-modules
media-libs/libglvnd
>=virtual/jdk-1.8.0:*
"
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 79439b22ba10..04335972d1f2 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -65,10 +65,13 @@ COMMON_DEPENDS="
sys-libs/zlib
"
+BDEPEND="
+ app-text/scdoc
+ kde-frameworks/extra-cmake-modules:5
+"
+
DEPEND="
${COMMON_DEPENDS}
- app-text/scdoc
- kde-frameworks/extra-cmake-modules
media-libs/libglvnd
>=virtual/jdk-1.8.0:*
"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-07-29 3:16 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-07-29 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 8a50ae891be6e0c2dc7987997d383f42f5517649
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sun Jul 3 17:21:40 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a50ae89
games-action/polymc: drop 1.3.1
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/Manifest | 1 -
games-action/polymc/polymc-1.3.1.ebuild | 115 --------------------------------
2 files changed, 116 deletions(-)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index bc9c75eb737d..18eb23870758 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,2 +1 @@
-DIST polymc-1.3.1.tar.gz 5651471 BLAKE2B ee36d6f046959932c72d6b3320704bbc565afd56e03f715db0f9270148b7ced80ff46d4e2ad33167e77e9b95d5dbe3316d9c7b5f9b36c15e28989555fddf0239 SHA512 8cfd644574a588a0b8dca6adbd9aee21bd603fc29649bbf55ad713dc37a1a9d7a8720031a6952d97c6a597c082f7437315044926d7da2d50e58a3da096343c7b
DIST polymc-1.3.2.tar.gz 5641952 BLAKE2B f1014c79c394db79e07bcd55c65c930ace80274a83cffc4c8adff58547f3ddf9baa5685ecd7b860c8ec21e4ae4ebf407233d3cb2b8d9ae2a81abd31248b1cebf SHA512 f272248631e76e2cb3b74f3bc91ab3d4f7e7cf4fb7396a09b8bcaf65d928076f49e436e3d7c1a34c32a2cbcf10760709f86cd9c0eca285b66790f25b1c466ea0
diff --git a/games-action/polymc/polymc-1.3.1.ebuild b/games-action/polymc/polymc-1.3.1.ebuild
deleted file mode 100644
index 1034a30e5df0..000000000000
--- a/games-action/polymc/polymc-1.3.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake java-pkg-2 optfeature xdg
-
-HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
-DESCRIPTION="A custom, open source Minecraft launcher"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="
- https://github.com/PolyMC/PolyMC
- https://github.com/PolyMC/libnbtplusplus
- "
-
- EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
-else
- MY_PN="PolyMC"
-
- # Let's use the vendored tarball to avoid dealing with the submodules directly
- SRC_URI="
- https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
- "
-
- # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
- S="${WORKDIR}/${MY_PN}-${PV}"
-
- KEYWORDS="~amd64"
-fi
-
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# GPL-3 for PolyMC
-# LGPL-3 for libnbtplusplus
-# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
-
-SLOT="0"
-
-IUSE="debug lto"
-REQUIRED_USE="
- lto? ( !debug )
-"
-
-MIN_QT="5.12.0"
-
-QT_DEPS="
- >=dev-qt/qtconcurrent-${MIN_QT}:5
- >=dev-qt/qtcore-${MIN_QT}:5
- >=dev-qt/qtgui-${MIN_QT}:5
- >=dev-qt/qtnetwork-${MIN_QT}:5
- >=dev-qt/qttest-${MIN_QT}:5
- >=dev-qt/qtwidgets-${MIN_QT}:5
- >=dev-qt/qtxml-${MIN_QT}:5
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
- ${QT_DEPS}
- >=dev-libs/quazip-1.3:=
- sys-libs/zlib
-"
-
-DEPEND="
- ${COMMON_DEPENDS}
- media-libs/libglvnd
- >=virtual/jdk-1.8.0:*
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
- ${COMMON_DEPENDS}
- >=virtual/jre-1.8.0:*
- virtual/opengl
-"
-
-src_prepare() {
- cmake_src_prepare
-
- # Prevent conflicting with the user's flags
- # See https://bugs.gentoo.org/848765 for more info
- sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
-}
-
-src_configure(){
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="/usr"
- # Resulting binary is named polymc
- -DLauncher_APP_BINARY_NAME="${PN}"
-
- -DENABLE_LTO=$(usex lto)
- )
-
- if use debug; then
- CMAKE_BUILD_TYPE=Debug
- else
- CMAKE_BUILD_TYPE=Release
- fi
-
- cmake_src_configure
-}
-
-src_compile(){
- cmake_src_compile
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- # https://github.com/PolyMC/PolyMC/issues/227
- optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
-}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-07-29 3:16 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-07-29 3:16 UTC (permalink / raw
To: gentoo-commits
commit: bad052b11048d34474621bae5320d7f79a6f508d
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Thu Jul 28 14:50:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad052b1
games-action/polymc: add 1.4.1
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26538
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/Manifest | 1 +
games-action/polymc/polymc-1.4.1.ebuild | 129 ++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 18eb23870758..1b50bf038e81 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1 +1,2 @@
DIST polymc-1.3.2.tar.gz 5641952 BLAKE2B f1014c79c394db79e07bcd55c65c930ace80274a83cffc4c8adff58547f3ddf9baa5685ecd7b860c8ec21e4ae4ebf407233d3cb2b8d9ae2a81abd31248b1cebf SHA512 f272248631e76e2cb3b74f3bc91ab3d4f7e7cf4fb7396a09b8bcaf65d928076f49e436e3d7c1a34c32a2cbcf10760709f86cd9c0eca285b66790f25b1c466ea0
+DIST polymc-1.4.1.tar.gz 5771113 BLAKE2B d55907770d913c814015c4337c0442cb3fdaf92815f3e2f1f496b7869b6da8ee2295260efc3df67e7407ee27d300c4e89900603281e69163c07df216193c05d9 SHA512 170d03b61d3e9edbe1a0b27812e52fb90963d09769327f2d95eab6c4b7c88291136f47a44b7c206808fcc2e0e9ddf4aeb3a3f267ccbdc6b70b44d91c4642bf75
diff --git a/games-action/polymc/polymc-1.4.1.ebuild b/games-action/polymc/polymc-1.4.1.ebuild
new file mode 100644
index 000000000000..508b1bf1a3e7
--- /dev/null
+++ b/games-action/polymc/polymc-1.4.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake java-pkg-2 optfeature xdg
+
+HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/PolyMC/libnbtplusplus
+ "
+
+ EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
+else
+ MY_PN="PolyMC"
+
+ # Let's use the vendored tarball to avoid dealing with the submodules directly
+ SRC_URI="
+ https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
+ "
+
+ # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
+ S="${WORKDIR}/${MY_PN}-${PV}"
+
+ KEYWORDS="~amd64"
+fi
+
+# Apache-2.0 for MultiMC (PolyMC is forked from it)
+# GPL-3 for PolyMC
+# LGPL-3 for libnbtplusplus
+# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
+
+SLOT="0"
+
+IUSE="debug lto test"
+REQUIRED_USE="
+ lto? ( !debug )
+"
+
+RESTRICT="!test? ( test )"
+
+MIN_QT="5.12.0"
+QT_SLOT=5
+
+QT_DEPS="
+ >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qttest-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT}
+"
+
+# Required at both build-time and run-time
+COMMON_DEPENDS="
+ ${QT_DEPS}
+ >=dev-libs/quazip-1.3:=
+ sys-libs/zlib
+"
+
+BDEPEND="
+ app-text/scdoc
+ kde-frameworks/extra-cmake-modules:5
+"
+
+DEPEND="
+ ${COMMON_DEPENDS}
+ media-libs/libglvnd
+ >=virtual/jdk-1.8.0:*
+"
+
+# At run-time we don't depend on JDK, only JRE
+# And we need more than just the GL headers
+RDEPEND="
+ ${COMMON_DEPENDS}
+ >=virtual/jre-1.8.0:*
+ virtual/opengl
+"
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Prevent conflicting with the user's flags
+ # See https://bugs.gentoo.org/848765 for more info
+ sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
+}
+
+src_configure(){
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ # Resulting binary is named polymc
+ -DLauncher_APP_BINARY_NAME="${PN}"
+ # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things
+ -DLauncher_QT_VERSION_MAJOR=${QT_SLOT}
+
+ -DENABLE_LTO=$(usex lto)
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ if use debug; then
+ CMAKE_BUILD_TYPE=Debug
+ else
+ CMAKE_BUILD_TYPE=Release
+ fi
+
+ cmake_src_configure
+}
+
+src_compile(){
+ cmake_src_compile
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ # https://github.com/PolyMC/PolyMC/issues/227
+ optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+
+ optfeature "built-in MangoHud support" games-util/mangohud
+ optfeature "built-in Feral Gamemode support" games-util/gamemode
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-09-09 16:09 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-09-09 16:09 UTC (permalink / raw
To: gentoo-commits
commit: ebe7b655971a63e3e94aa6e98b2f659578fb072a
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 9 16:01:55 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 16:09:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebe7b655
games-action/polymc: depend on quazip[qt5(+)]
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/polymc-1.3.2.ebuild | 2 +-
games-action/polymc/polymc-1.4.1.ebuild | 2 +-
games-action/polymc/polymc-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/games-action/polymc/polymc-1.3.2.ebuild b/games-action/polymc/polymc-1.3.2.ebuild
index 1034a30e5df0..e59146da7e6f 100644
--- a/games-action/polymc/polymc-1.3.2.ebuild
+++ b/games-action/polymc/polymc-1.3.2.ebuild
@@ -59,7 +59,7 @@ QT_DEPS="
# Required at both build-time and run-time
COMMON_DEPENDS="
${QT_DEPS}
- >=dev-libs/quazip-1.3:=
+ >=dev-libs/quazip-1.3:=[qt5(+)]
sys-libs/zlib
"
diff --git a/games-action/polymc/polymc-1.4.1.ebuild b/games-action/polymc/polymc-1.4.1.ebuild
index 508b1bf1a3e7..9b4f9e5b4a5b 100644
--- a/games-action/polymc/polymc-1.4.1.ebuild
+++ b/games-action/polymc/polymc-1.4.1.ebuild
@@ -62,7 +62,7 @@ QT_DEPS="
# Required at both build-time and run-time
COMMON_DEPENDS="
${QT_DEPS}
- >=dev-libs/quazip-1.3:=
+ >=dev-libs/quazip-1.3:=[qt5(+)]
sys-libs/zlib
"
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 508b1bf1a3e7..9b4f9e5b4a5b 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -62,7 +62,7 @@ QT_DEPS="
# Required at both build-time and run-time
COMMON_DEPENDS="
${QT_DEPS}
- >=dev-libs/quazip-1.3:=
+ >=dev-libs/quazip-1.3:=[qt5(+)]
sys-libs/zlib
"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-09-09 16:38 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-09-09 16:38 UTC (permalink / raw
To: gentoo-commits
commit: ce76782b3700cce6d311ad975173256d1b7ef5a4
Author: flow <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Thu Sep 8 18:52:06 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 16:33:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce76782b
games-action/polymc: add 1.4.2
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 1 +
games-action/polymc/polymc-1.4.2.ebuild | 129 ++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 0b23addb2f04..ec41e2572d21 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1 +1,2 @@
DIST polymc-1.4.1.tar.gz 5771113 BLAKE2B d55907770d913c814015c4337c0442cb3fdaf92815f3e2f1f496b7869b6da8ee2295260efc3df67e7407ee27d300c4e89900603281e69163c07df216193c05d9 SHA512 170d03b61d3e9edbe1a0b27812e52fb90963d09769327f2d95eab6c4b7c88291136f47a44b7c206808fcc2e0e9ddf4aeb3a3f267ccbdc6b70b44d91c4642bf75
+DIST polymc-1.4.2.tar.gz 5766773 BLAKE2B 0d40f2b1fc6df28089d874a2de949b24a719936b0961fa08a0e909a82931b411926464328ada8ec05c148ba39e405ff9f4d336fc4ade316725756e235231eb60 SHA512 6212752a176e0d3414f66b013b46adc500c5d9e7fa250646aaf9b6bd42b9cbaa7c23282c7da6105e37d6ae77f790cd0036ad4e07b8aa50b611d41045035bc533
diff --git a/games-action/polymc/polymc-1.4.2.ebuild b/games-action/polymc/polymc-1.4.2.ebuild
new file mode 100644
index 000000000000..9b4f9e5b4a5b
--- /dev/null
+++ b/games-action/polymc/polymc-1.4.2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake java-pkg-2 optfeature xdg
+
+HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/PolyMC/libnbtplusplus
+ "
+
+ EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
+else
+ MY_PN="PolyMC"
+
+ # Let's use the vendored tarball to avoid dealing with the submodules directly
+ SRC_URI="
+ https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
+ "
+
+ # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
+ S="${WORKDIR}/${MY_PN}-${PV}"
+
+ KEYWORDS="~amd64"
+fi
+
+# Apache-2.0 for MultiMC (PolyMC is forked from it)
+# GPL-3 for PolyMC
+# LGPL-3 for libnbtplusplus
+# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
+
+SLOT="0"
+
+IUSE="debug lto test"
+REQUIRED_USE="
+ lto? ( !debug )
+"
+
+RESTRICT="!test? ( test )"
+
+MIN_QT="5.12.0"
+QT_SLOT=5
+
+QT_DEPS="
+ >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qttest-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT}
+ >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT}
+"
+
+# Required at both build-time and run-time
+COMMON_DEPENDS="
+ ${QT_DEPS}
+ >=dev-libs/quazip-1.3:=[qt5(+)]
+ sys-libs/zlib
+"
+
+BDEPEND="
+ app-text/scdoc
+ kde-frameworks/extra-cmake-modules:5
+"
+
+DEPEND="
+ ${COMMON_DEPENDS}
+ media-libs/libglvnd
+ >=virtual/jdk-1.8.0:*
+"
+
+# At run-time we don't depend on JDK, only JRE
+# And we need more than just the GL headers
+RDEPEND="
+ ${COMMON_DEPENDS}
+ >=virtual/jre-1.8.0:*
+ virtual/opengl
+"
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Prevent conflicting with the user's flags
+ # See https://bugs.gentoo.org/848765 for more info
+ sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
+}
+
+src_configure(){
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ # Resulting binary is named polymc
+ -DLauncher_APP_BINARY_NAME="${PN}"
+ # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things
+ -DLauncher_QT_VERSION_MAJOR=${QT_SLOT}
+
+ -DENABLE_LTO=$(usex lto)
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ if use debug; then
+ CMAKE_BUILD_TYPE=Debug
+ else
+ CMAKE_BUILD_TYPE=Release
+ fi
+
+ cmake_src_configure
+}
+
+src_compile(){
+ cmake_src_compile
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ # https://github.com/PolyMC/PolyMC/issues/227
+ optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+
+ optfeature "built-in MangoHud support" games-util/mangohud
+ optfeature "built-in Feral Gamemode support" games-util/gamemode
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-09-09 16:38 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-09-09 16:38 UTC (permalink / raw
To: gentoo-commits
commit: df27101c265358f58d1a45e7328708de385b62c7
Author: flow <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Thu Sep 8 18:22:34 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 16:33:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df27101c
games-action/polymc: drop 1.3.2
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 1 -
games-action/polymc/polymc-1.3.2.ebuild | 115 --------------------------------
2 files changed, 116 deletions(-)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 1b50bf038e81..0b23addb2f04 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,2 +1 @@
-DIST polymc-1.3.2.tar.gz 5641952 BLAKE2B f1014c79c394db79e07bcd55c65c930ace80274a83cffc4c8adff58547f3ddf9baa5685ecd7b860c8ec21e4ae4ebf407233d3cb2b8d9ae2a81abd31248b1cebf SHA512 f272248631e76e2cb3b74f3bc91ab3d4f7e7cf4fb7396a09b8bcaf65d928076f49e436e3d7c1a34c32a2cbcf10760709f86cd9c0eca285b66790f25b1c466ea0
DIST polymc-1.4.1.tar.gz 5771113 BLAKE2B d55907770d913c814015c4337c0442cb3fdaf92815f3e2f1f496b7869b6da8ee2295260efc3df67e7407ee27d300c4e89900603281e69163c07df216193c05d9 SHA512 170d03b61d3e9edbe1a0b27812e52fb90963d09769327f2d95eab6c4b7c88291136f47a44b7c206808fcc2e0e9ddf4aeb3a3f267ccbdc6b70b44d91c4642bf75
diff --git a/games-action/polymc/polymc-1.3.2.ebuild b/games-action/polymc/polymc-1.3.2.ebuild
deleted file mode 100644
index e59146da7e6f..000000000000
--- a/games-action/polymc/polymc-1.3.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake java-pkg-2 optfeature xdg
-
-HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
-DESCRIPTION="A custom, open source Minecraft launcher"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="
- https://github.com/PolyMC/PolyMC
- https://github.com/PolyMC/libnbtplusplus
- "
-
- EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
-else
- MY_PN="PolyMC"
-
- # Let's use the vendored tarball to avoid dealing with the submodules directly
- SRC_URI="
- https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
- "
-
- # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
- S="${WORKDIR}/${MY_PN}-${PV}"
-
- KEYWORDS="~amd64"
-fi
-
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# GPL-3 for PolyMC
-# LGPL-3 for libnbtplusplus
-# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
-
-SLOT="0"
-
-IUSE="debug lto"
-REQUIRED_USE="
- lto? ( !debug )
-"
-
-MIN_QT="5.12.0"
-
-QT_DEPS="
- >=dev-qt/qtconcurrent-${MIN_QT}:5
- >=dev-qt/qtcore-${MIN_QT}:5
- >=dev-qt/qtgui-${MIN_QT}:5
- >=dev-qt/qtnetwork-${MIN_QT}:5
- >=dev-qt/qttest-${MIN_QT}:5
- >=dev-qt/qtwidgets-${MIN_QT}:5
- >=dev-qt/qtxml-${MIN_QT}:5
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
- ${QT_DEPS}
- >=dev-libs/quazip-1.3:=[qt5(+)]
- sys-libs/zlib
-"
-
-DEPEND="
- ${COMMON_DEPENDS}
- media-libs/libglvnd
- >=virtual/jdk-1.8.0:*
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
- ${COMMON_DEPENDS}
- >=virtual/jre-1.8.0:*
- virtual/opengl
-"
-
-src_prepare() {
- cmake_src_prepare
-
- # Prevent conflicting with the user's flags
- # See https://bugs.gentoo.org/848765 for more info
- sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
-}
-
-src_configure(){
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="/usr"
- # Resulting binary is named polymc
- -DLauncher_APP_BINARY_NAME="${PN}"
-
- -DENABLE_LTO=$(usex lto)
- )
-
- if use debug; then
- CMAKE_BUILD_TYPE=Debug
- else
- CMAKE_BUILD_TYPE=Release
- fi
-
- cmake_src_configure
-}
-
-src_compile(){
- cmake_src_compile
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- # https://github.com/PolyMC/PolyMC/issues/227
- optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
-}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-09-09 16:38 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-09-09 16:38 UTC (permalink / raw
To: gentoo-commits
commit: 1e1b86aa7c9436df38d69ce564e8ef312bb50149
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Fri Sep 9 09:47:42 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 16:33:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1b86aa
games-action/polymc: update LICENSE
Removes Boost-1.0, since the dependency that introduced it,
optional-bare, got removed in the newer versions.
Correct libnbtplusplus's license, since it's LGPL-3 or later, as stated
by https://github.com/PolyMC/PolyMC/blob/develop/libraries/README.md
Add missing licenses and remove missing license (OFL), following
https://github.com/PolyMC/PolyMC/blob/develop/libraries/README.md
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27192
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/polymc-1.4.2.ebuild | 4 ++--
games-action/polymc/polymc-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/games-action/polymc/polymc-1.4.2.ebuild b/games-action/polymc/polymc-1.4.2.ebuild
index 9b4f9e5b4a5b..69555a54cb97 100644
--- a/games-action/polymc/polymc-1.4.2.ebuild
+++ b/games-action/polymc/polymc-1.4.2.ebuild
@@ -33,9 +33,9 @@ fi
# Apache-2.0 for MultiMC (PolyMC is forked from it)
# GPL-3 for PolyMC
-# LGPL-3 for libnbtplusplus
+# LGPL-3+ for libnbtplusplus
# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT"
SLOT="0"
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 9b4f9e5b4a5b..69555a54cb97 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -33,9 +33,9 @@ fi
# Apache-2.0 for MultiMC (PolyMC is forked from it)
# GPL-3 for PolyMC
-# LGPL-3 for libnbtplusplus
+# LGPL-3+ for libnbtplusplus
# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT"
SLOT="0"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-09-10 0:29 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-09-10 0:29 UTC (permalink / raw
To: gentoo-commits
commit: 5f0610655945304bff64f4ff1e5fd078acb2bcb6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 00:24:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 00:24:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f061065
games-action/polymc: revbump for quazip USE-dep change
Fixes: ebe7b655971a63e3e94aa6e98b2f659578fb072a
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/{polymc-1.4.1.ebuild => polymc-1.4.1-r1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/games-action/polymc/polymc-1.4.1.ebuild b/games-action/polymc/polymc-1.4.1-r1.ebuild
similarity index 100%
rename from games-action/polymc/polymc-1.4.1.ebuild
rename to games-action/polymc/polymc-1.4.1-r1.ebuild
^ permalink raw reply [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-09-14 14:16 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-09-14 14:16 UTC (permalink / raw
To: gentoo-commits
commit: ece8c3c5db656af60a3415fcd375d0500f22a213
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 14:15:57 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 14:16:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece8c3c5
games-action/polymc: we need the full xrandr, not just the lib
Closes: https://bugs.gentoo.org/869857
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/polymc-1.4.1-r2.ebuild | 2 +-
games-action/polymc/polymc-1.4.2-r1.ebuild | 2 +-
games-action/polymc/polymc-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/games-action/polymc/polymc-1.4.1-r2.ebuild b/games-action/polymc/polymc-1.4.1-r2.ebuild
index 8be887f9adeb..826e2e11a7aa 100644
--- a/games-action/polymc/polymc-1.4.1-r2.ebuild
+++ b/games-action/polymc/polymc-1.4.1-r2.ebuild
@@ -126,7 +126,7 @@ pkg_postinst() {
xdg_pkg_postinst
# https://github.com/PolyMC/PolyMC/issues/227
- optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+ 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/polymc/polymc-1.4.2-r1.ebuild b/games-action/polymc/polymc-1.4.2-r1.ebuild
index be9731e0416c..0f99fa720844 100644
--- a/games-action/polymc/polymc-1.4.2-r1.ebuild
+++ b/games-action/polymc/polymc-1.4.2-r1.ebuild
@@ -126,7 +126,7 @@ pkg_postinst() {
xdg_pkg_postinst
# https://github.com/PolyMC/PolyMC/issues/227
- optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+ 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/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index be9731e0416c..0f99fa720844 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -126,7 +126,7 @@ pkg_postinst() {
xdg_pkg_postinst
# https://github.com/PolyMC/PolyMC/issues/227
- optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+ 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] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-09-22 10:14 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-09-22 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 5d9d7066d2cff588b590e09f029fed9066a62bdc
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Tue Sep 20 21:25:12 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 10:14:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9d7066
games-action/polymc: drop 1.4.1-r2
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 1 -
games-action/polymc/polymc-1.4.1-r2.ebuild | 133 -----------------------------
2 files changed, 134 deletions(-)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index ec41e2572d21..a1bac66848dd 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,2 +1 @@
-DIST polymc-1.4.1.tar.gz 5771113 BLAKE2B d55907770d913c814015c4337c0442cb3fdaf92815f3e2f1f496b7869b6da8ee2295260efc3df67e7407ee27d300c4e89900603281e69163c07df216193c05d9 SHA512 170d03b61d3e9edbe1a0b27812e52fb90963d09769327f2d95eab6c4b7c88291136f47a44b7c206808fcc2e0e9ddf4aeb3a3f267ccbdc6b70b44d91c4642bf75
DIST polymc-1.4.2.tar.gz 5766773 BLAKE2B 0d40f2b1fc6df28089d874a2de949b24a719936b0961fa08a0e909a82931b411926464328ada8ec05c148ba39e405ff9f4d336fc4ade316725756e235231eb60 SHA512 6212752a176e0d3414f66b013b46adc500c5d9e7fa250646aaf9b6bd42b9cbaa7c23282c7da6105e37d6ae77f790cd0036ad4e07b8aa50b611d41045035bc533
diff --git a/games-action/polymc/polymc-1.4.1-r2.ebuild b/games-action/polymc/polymc-1.4.1-r2.ebuild
deleted file mode 100644
index 826e2e11a7aa..000000000000
--- a/games-action/polymc/polymc-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake java-pkg-2 optfeature xdg
-
-HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
-DESCRIPTION="A custom, open source Minecraft launcher"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="
- https://github.com/PolyMC/PolyMC
- https://github.com/PolyMC/libnbtplusplus
- "
-
- EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
-else
- MY_PN="PolyMC"
-
- # Let's use the vendored tarball to avoid dealing with the submodules directly
- SRC_URI="
- https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
- "
-
- # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
- S="${WORKDIR}/${MY_PN}-${PV}"
-
- KEYWORDS="~amd64"
-fi
-
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# GPL-3 for PolyMC
-# LGPL-3 for libnbtplusplus
-# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
-
-SLOT="0"
-
-IUSE="debug lto test"
-REQUIRED_USE="
- lto? ( !debug )
-"
-
-RESTRICT="!test? ( test )"
-
-MIN_QT="5.12.0"
-QT_SLOT=5
-
-QT_DEPS="
- >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qttest-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT}
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
- ${QT_DEPS}
- >=dev-libs/quazip-1.3:=[qt5(+)]
- sys-libs/zlib
-"
-
-BDEPEND="
- app-text/scdoc
- kde-frameworks/extra-cmake-modules:5
-"
-
-DEPEND="
- ${COMMON_DEPENDS}
- media-libs/libglvnd
- >=virtual/jdk-1.8.0:*
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
- ${COMMON_DEPENDS}
- >=virtual/jre-1.8.0:*
- virtual/opengl
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-include_QDebug.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # Prevent conflicting with the user's flags
- # See https://bugs.gentoo.org/848765 for more info
- sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
-}
-
-src_configure(){
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="/usr"
- # Resulting binary is named polymc
- -DLauncher_APP_BINARY_NAME="${PN}"
- # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things
- -DLauncher_QT_VERSION_MAJOR=${QT_SLOT}
-
- -DENABLE_LTO=$(usex lto)
- -DBUILD_TESTING=$(usex test)
- )
-
- if use debug; then
- CMAKE_BUILD_TYPE=Debug
- else
- CMAKE_BUILD_TYPE=Release
- fi
-
- cmake_src_configure
-}
-
-src_compile(){
- cmake_src_compile
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- # https://github.com/PolyMC/PolyMC/issues/227
- optfeature "old Minecraft (<= 1.12.2) support" x11-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] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-09-22 10:14 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-09-22 10:14 UTC (permalink / raw
To: gentoo-commits
commit: a82c2165fbc03843f69d955e3ea8228d20ca4815
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Mon Sep 19 23:02:42 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 10:14:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82c2165
games-action/polymc: add dev-qt/qtsvg as a RDEPEND
This is needed because most icons in the app are SVGs that don't show up
without this dependency.
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../polymc/{polymc-1.4.2-r1.ebuild => polymc-1.4.2-r2.ebuild} | 3 +++
games-action/polymc/polymc-9999.ebuild | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/games-action/polymc/polymc-1.4.2-r1.ebuild b/games-action/polymc/polymc-1.4.2-r2.ebuild
similarity index 98%
rename from games-action/polymc/polymc-1.4.2-r1.ebuild
rename to games-action/polymc/polymc-1.4.2-r2.ebuild
index 0f99fa720844..cfd8180bf564 100644
--- a/games-action/polymc/polymc-1.4.2-r1.ebuild
+++ b/games-action/polymc/polymc-1.4.2-r2.ebuild
@@ -81,6 +81,9 @@ DEPEND="
# And we need more than just the GL headers
RDEPEND="
${COMMON_DEPENDS}
+
+ >=dev-qt/qtsvg-${MIN_QT}:${QT_SLOT}
+
>=virtual/jre-1.8.0:*
virtual/opengl
"
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index c9733e891936..5f9c909ad33a 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -62,7 +62,6 @@ QT_DEPS="
qt6? (
>=dev-qt/qtbase-${MIN_QT_6_VERSION}:6[concurrent,gui,network,widgets,xml(+)]
- >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6
>=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6
)
"
@@ -92,6 +91,10 @@ DEPEND="
# 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
"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-09-22 10:14 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-09-22 10:14 UTC (permalink / raw
To: gentoo-commits
commit: ff08079716399cafe5aad20e334b9b8c09ca709d
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sun Sep 18 22:24:11 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 10:14:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff080797
games-action/polymc: add qt6 USE flag to the live ebuild
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/metadata.xml | 1 +
games-action/polymc/polymc-9999.ebuild | 36 ++++++++++++++++++++++------------
2 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/games-action/polymc/metadata.xml b/games-action/polymc/metadata.xml
index f704149126f6..7ba4aabb75f4 100644
--- a/games-action/polymc/metadata.xml
+++ b/games-action/polymc/metadata.xml
@@ -25,5 +25,6 @@
<longdescription>PolyMC 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/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 0f99fa720844..c9733e891936 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -39,30 +39,41 @@ LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT"
SLOT="0"
-IUSE="debug lto test"
+IUSE="debug lto qt6 test"
REQUIRED_USE="
lto? ( !debug )
"
RESTRICT="!test? ( test )"
-MIN_QT="5.12.0"
-QT_SLOT=5
+MIN_QT_5_VERSION="5.12.0"
+MIN_QT_6_VERSION="6.0.0"
QT_DEPS="
- >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qttest-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT}
- >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT}
+ !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/qtsvg-${MIN_QT_6_VERSION}:6
+ >=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6
+ )
"
# Required at both build-time and run-time
COMMON_DEPENDS="
${QT_DEPS}
- >=dev-libs/quazip-1.3:=[qt5(+)]
+
+ !qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
+ qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
+
sys-libs/zlib
"
@@ -102,8 +113,7 @@ src_configure(){
-DCMAKE_INSTALL_PREFIX="/usr"
# Resulting binary is named polymc
-DLauncher_APP_BINARY_NAME="${PN}"
- # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things
- -DLauncher_QT_VERSION_MAJOR=${QT_SLOT}
+ -DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5)
-DENABLE_LTO=$(usex lto)
-DBUILD_TESTING=$(usex test)
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-10-03 8:23 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-10-03 8:23 UTC (permalink / raw
To: gentoo-commits
commit: d374704ae53bce8292c9ef71d6571741689cc438
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 14:37:16 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 3 08:22:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d374704a
games-action/polymc: add tomlplusplus as a git submodule
This is done by excluding quazip from the submodule list, instead of
adding the tomlplusplus module directly, so that new modules in the
future won't need a separate commit.
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27560
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/polymc-9999.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 2d6984fe72b0..6ab0be6f326b 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -15,7 +15,8 @@ if [[ ${PV} == 9999 ]]; then
https://github.com/PolyMC/PolyMC
"
- EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
+ # TODO: Add tomlplusplus as a system library, like quazip
+ EGIT_SUBMODULES=( '*' '-libraries/quazip' )
else
MY_PN="PolyMC"
@@ -33,6 +34,7 @@ fi
# Apache-2.0 for MultiMC (PolyMC is forked from it)
# GPL-3 for PolyMC
# LGPL-3+ for libnbtplusplus
+# MIT for tomlplusplus
# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-10-03 8:23 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-10-03 8:23 UTC (permalink / raw
To: gentoo-commits
commit: d452fbb5f8901a67d2d92e5d7e76726a00fc2163
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Thu Sep 22 16:32:32 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 3 08:22:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d452fbb5
games-action/polymc: remove submodule from EGIT_REPO_URI
Closes: https://bugs.gentoo.org/872248
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/polymc-1.4.2-r2.ebuild | 1 -
games-action/polymc/polymc-9999.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/games-action/polymc/polymc-1.4.2-r2.ebuild b/games-action/polymc/polymc-1.4.2-r2.ebuild
index cfd8180bf564..b14fd617e73b 100644
--- a/games-action/polymc/polymc-1.4.2-r2.ebuild
+++ b/games-action/polymc/polymc-1.4.2-r2.ebuild
@@ -13,7 +13,6 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="
https://github.com/PolyMC/PolyMC
- https://github.com/PolyMC/libnbtplusplus
"
EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 5f9c909ad33a..2d6984fe72b0 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -13,7 +13,6 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="
https://github.com/PolyMC/PolyMC
- https://github.com/PolyMC/libnbtplusplus
"
EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-10-17 20:10 Andrew Ammerlaan
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Ammerlaan @ 2022-10-17 20:10 UTC (permalink / raw
To: gentoo-commits
commit: 4b211050943eeda2974b0f54538b6e9245825a7e
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 20:09:14 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 20:09:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b211050
games-action/polymc: drop 9999
Bug: https://bugs.gentoo.org/877495
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/polymc-9999.ebuild | 147 ---------------------------------
1 file changed, 147 deletions(-)
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
deleted file mode 100644
index 6ab0be6f326b..000000000000
--- a/games-action/polymc/polymc-9999.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://polymc.org/ https://github.com/PolyMC/PolyMC"
-DESCRIPTION="A custom, open source Minecraft launcher"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="
- https://github.com/PolyMC/PolyMC
- "
-
- # TODO: Add tomlplusplus as a system library, like quazip
- EGIT_SUBMODULES=( '*' '-libraries/quazip' )
-else
- MY_PN="PolyMC"
-
- # Let's use the vendored tarball to avoid dealing with the submodules directly
- SRC_URI="
- https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
- "
-
- # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
- S="${WORKDIR}/${MY_PN}-${PV}"
-
- KEYWORDS="~amd64"
-fi
-
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# GPL-3 for PolyMC
-# LGPL-3+ for libnbtplusplus
-# MIT for tomlplusplus
-# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/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
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.1-include_QDebug.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # Prevent conflicting with the user's flags
- # See https://bugs.gentoo.org/848765 for more info
- sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
-}
-
-src_configure(){
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="/usr"
- # Resulting binary is named polymc
- -DLauncher_APP_BINARY_NAME="${PN}"
- -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
-
- # 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] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/
@ 2022-10-18 2:55 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-10-18 2:55 UTC (permalink / raw
To: gentoo-commits
commit: 345700a4d12027040367fb9010c79dc15b8338b2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 02:51:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 02:51:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=345700a4
games-action/polymc: Fix UnusedLocalUse
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/polymc/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/games-action/polymc/metadata.xml b/games-action/polymc/metadata.xml
index 7ba4aabb75f4..f704149126f6 100644
--- a/games-action/polymc/metadata.xml
+++ b/games-action/polymc/metadata.xml
@@ -25,6 +25,5 @@
<longdescription>PolyMC 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>
^ permalink raw reply related [flat|nested] 34+ messages in thread
end of thread, other threads:[~2022-10-18 2:55 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-29 3:16 [gentoo-commits] repo/gentoo:master commit in: games-action/polymc/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-10-18 2:55 Sam James
2022-10-17 20:10 Andrew Ammerlaan
2022-10-03 8:23 Andrew Ammerlaan
2022-10-03 8:23 Andrew Ammerlaan
2022-09-22 10:14 Andrew Ammerlaan
2022-09-22 10:14 Andrew Ammerlaan
2022-09-22 10:14 Andrew Ammerlaan
2022-09-14 14:16 Andrew Ammerlaan
2022-09-10 0:29 Sam James
2022-09-09 16:38 Andrew Ammerlaan
2022-09-09 16:38 Andrew Ammerlaan
2022-09-09 16:38 Andrew Ammerlaan
2022-09-09 16:09 Andrew Ammerlaan
2022-07-29 3:16 Sam James
2022-07-29 3:16 Sam James
2022-07-29 3:16 Sam James
2022-07-29 3:16 Sam James
2022-07-29 3:16 Sam James
2022-07-29 3:16 Sam James
2022-07-29 3:16 Sam James
2022-07-29 3:16 Sam James
2022-07-29 3:16 Sam James
2022-07-29 3:16 Sam James
2022-06-12 20:24 Andrew Ammerlaan
2022-06-12 20:24 Andrew Ammerlaan
2022-06-01 0:10 Sam James
2022-05-29 18:44 Andrew Ammerlaan
2022-05-23 10:22 Andrew Ammerlaan
2022-05-23 10:22 Andrew Ammerlaan
2022-05-09 15:39 Andrew Ammerlaan
2022-05-02 9:09 Andrew Ammerlaan
2022-05-02 9:09 Andrew Ammerlaan
2022-04-15 18:13 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox