commit: 9f436137120dc986dbe0edf637914dbc4381b12c Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com> AuthorDate: Tue Feb 16 04:31:47 2021 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Tue Feb 16 17:27:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f436137
media-libs/libprojectm: fix deps&USEs with revbump Fix jack support: it requires qt enabled Make pulseaudio support optional Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19483 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> ...bprojectm-9999.ebuild => libprojectm-3.1.8-r1.ebuild} | 16 ++++++++++------ media-libs/libprojectm/libprojectm-9999.ebuild | 16 ++++++++++------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/media-libs/libprojectm/libprojectm-9999.ebuild b/media-libs/libprojectm/libprojectm-3.1.8-r1.ebuild similarity index 83% copy from media-libs/libprojectm/libprojectm-9999.ebuild copy to media-libs/libprojectm/libprojectm-3.1.8-r1.ebuild index cd148676740..a273f50c063 100644 --- a/media-libs/libprojectm/libprojectm-9999.ebuild +++ b/media-libs/libprojectm/libprojectm-3.1.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,21 +14,22 @@ if [[ ${PV} == *9999 ]] ; then else MY_PV="${PV/_/-}" SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" S=${WORKDIR}/projectm-${MY_PV}/ fi LICENSE="LGPL-2" SLOT="0/2" -IUSE="gles2 jack qt5 sdl" +IUSE="gles2 jack pulseaudio qt5 sdl" +REQUIRED_USE=" + jack? ( qt5 ) + pulseaudio? ( qt5 ) +" RDEPEND="gles2? ( media-libs/mesa[gles2] ) media-libs/glm media-libs/mesa[X(+)] jack? ( - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtopengl:5 virtual/jack ) qt5? ( @@ -37,6 +38,8 @@ RDEPEND="gles2? ( media-libs/mesa[gles2] ) dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtopengl:5 + ) + pulseaudio? ( media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.5 ) @@ -57,6 +60,7 @@ src_configure() { $(use_enable gles2 gles) $(use_enable jack) $(use_enable qt5 qt) + $(use_enable pulseaudio) $(use_enable sdl) --enable-emscripten=no ) diff --git a/media-libs/libprojectm/libprojectm-9999.ebuild b/media-libs/libprojectm/libprojectm-9999.ebuild index cd148676740..a273f50c063 100644 --- a/media-libs/libprojectm/libprojectm-9999.ebuild +++ b/media-libs/libprojectm/libprojectm-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,21 +14,22 @@ if [[ ${PV} == *9999 ]] ; then else MY_PV="${PV/_/-}" SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" S=${WORKDIR}/projectm-${MY_PV}/ fi LICENSE="LGPL-2" SLOT="0/2" -IUSE="gles2 jack qt5 sdl" +IUSE="gles2 jack pulseaudio qt5 sdl" +REQUIRED_USE=" + jack? ( qt5 ) + pulseaudio? ( qt5 ) +" RDEPEND="gles2? ( media-libs/mesa[gles2] ) media-libs/glm media-libs/mesa[X(+)] jack? ( - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtopengl:5 virtual/jack ) qt5? ( @@ -37,6 +38,8 @@ RDEPEND="gles2? ( media-libs/mesa[gles2] ) dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtopengl:5 + ) + pulseaudio? ( media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.5 ) @@ -57,6 +60,7 @@ src_configure() { $(use_enable gles2 gles) $(use_enable jack) $(use_enable qt5 qt) + $(use_enable pulseaudio) $(use_enable sdl) --enable-emscripten=no )
