public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/
@ 2013-10-13 17:03 Johannes Huber
  0 siblings, 0 replies; 12+ messages in thread
From: Johannes Huber @ 2013-10-13 17:03 UTC (permalink / raw
  To: gentoo-commits

commit:     db1b1f0cd3f93bc0bb42748bd5f190cd82063907
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 18:59:04 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 18:59:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=db1b1f0c

[media-libs/phonon-vlc] Move to git-r3 eclass.

Package-Manager: portage-2.2.7

---
 media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 71b1c57..6a7e2ce 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 
 MY_PN="phonon-backend-vlc"
 MY_P="${MY_PN}-${PV}"
-EGIT_REPO_URI="git://anongit.kde.org/${PN}"
-[[ ${PV} == 9999 ]] && git_eclass=git-2
+EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+[[ ${PV} == 9999 ]] && git_eclass=git-r3
 inherit cmake-utils multibuild ${git_eclass}
 unset git_eclass
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/
@ 2013-10-17 17:53 Johannes Huber
  0 siblings, 0 replies; 12+ messages in thread
From: Johannes Huber @ 2013-10-17 17:53 UTC (permalink / raw
  To: gentoo-commits

commit:     6c67c319e3838e93ff92300084c5376ddf34e416
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 17:53:12 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 17:53:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6c67c319

[media-libs/phonon-vlc] Fix build.

Package-Manager: portage-2.2.7

---
 media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 6a7e2ce..5a82033 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-S=${WORKDIR}/${MY_P}
+[[ ${PV} == 9999 ]] || S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS )
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/
@ 2013-11-09 17:47 Johannes Huber
  0 siblings, 0 replies; 12+ messages in thread
From: Johannes Huber @ 2013-11-09 17:47 UTC (permalink / raw
  To: gentoo-commits

commit:     57081a26beebabac8716ab371445b9cc6a703518
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 17:44:05 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 17:44:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=57081a26

[media-libs/phonon-vlc] Cleanup

Package-Manager: portage-2.2.7

---
 media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 5a82033..70f3e2a 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -26,17 +26,17 @@ IUSE="debug +qt4 qt5"
 REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
-	=media-libs/phonon-9999[qt4=,qt5=]
+	>=media-libs/phonon-4.7.0[qt4=,qt5=]
 	>=media-video/vlc-2.0.1[dbus,ogg,vorbis]
 	qt4? (
-		>=dev-qt/qtcore-4.6.0:4
-		>=dev-qt/qtdbus-4.6.0:4
-		>=dev-qt/qtgui-4.6.0:4
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
 	)
 	qt5? (
-		>=dev-qt/qtcore-5.0.0:5
-		>=dev-qt/qtdbus-5.0.0:5
-		>=dev-qt/qtgui-5.0.0:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
 	)
 "
 DEPEND="${RDEPEND}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/
@ 2014-08-13 19:43 Johannes Huber
  0 siblings, 0 replies; 12+ messages in thread
From: Johannes Huber @ 2014-08-13 19:43 UTC (permalink / raw
  To: gentoo-commits

commit:     c0a3fe2ad207572a78234915d423ebe11564bf19
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 13 19:42:42 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 13 19:42:42 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c0a3fe2a

[media-libs/phonon-vlc] Version bump

Package-Manager: portage-2.2.12

---
 media-libs/phonon-vlc/metadata.xml             |  5 ++
 media-libs/phonon-vlc/phonon-vlc-0.7.80.ebuild | 94 ++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)

diff --git a/media-libs/phonon-vlc/metadata.xml b/media-libs/phonon-vlc/metadata.xml
new file mode 100644
index 0000000..a23f444
--- /dev/null
+++ b/media-libs/phonon-vlc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>

diff --git a/media-libs/phonon-vlc/phonon-vlc-0.7.80.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.7.80.ebuild
new file mode 100644
index 0000000..90d0241
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.7.80.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+MY_PN="phonon-backend-vlc"
+MY_P="${MY_PN}-${PV}"
+EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+[[ ${PV} == 9999 ]] && git_eclass=git-r3
+inherit cmake-utils multibuild ${git_eclass}
+unset git_eclass
+
+DESCRIPTION="Phonon VLC backend"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-vlc"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+
+SLOT="0"
+IUSE="debug +qt4 qt5"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+	>=media-libs/phonon-4.7.80[qt4=,qt5=]
+	>=media-video/vlc-2.0.1:=[dbus,ogg,vorbis]
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	qt4? ( >=dev-util/automoc-0.9.87 )
+"
+
+[[ ${PV} == 9999 ]] || S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS )
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=()
+	if use qt4; then
+		MULTIBUILD_VARIANTS+=(qt4)
+	fi
+	if use qt5; then
+		MULTIBUILD_VARIANTS+=(qt5)
+	fi
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=()
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)
+		fi
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON)
+		fi
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+src_test() {
+	multibuild_foreach_variant cmake-utils_src_test
+}
+
+pkg_postinst() {
+	elog "For more verbose debug information, export the following variables:"
+	elog "PHONON_DEBUG=1"
+	elog ""
+	elog "To make KDE detect the new backend without reboot, run:"
+	elog "kbuildsycoca4 --noincremental"
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/
@ 2019-11-14 16:51 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2019-11-14 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     a1f0ca40ebbc7c0184a1c693bfd816f80789f8be
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 20:52:29 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 16:41:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a1f0ca40

media-libs/phonon-vlc: Add missing BDEPEND

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 9aef61bb41..1b550080bb 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -18,6 +18,7 @@ SLOT="0"
 IUSE="debug"
 
 BDEPEND="
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 "
 DEPEND="


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/
@ 2021-05-15 20:50 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2021-05-15 20:50 UTC (permalink / raw
  To: gentoo-commits

commit:     63d6005fb7184ecd1157fded7bfb97d39e992bb9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue May 11 12:30:59 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 15 20:50:29 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=63d6005f

media-libs/phonon-vlc: >=media-video/vlc-3.0.14 now always depend on vorbis

Since commit 61e99a621f6a8e0ad3085838ec618102c906f6cb, VLC is now always
depending on vorbis and USE=vorbis is gone.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index b192ec6ef2..7f9bcbb9a0 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -25,6 +25,6 @@ DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	>=media-libs/phonon-4.11.0
-	media-video/vlc:=[dbus,ogg,vorbis]
+	media-video/vlc:=[dbus,ogg,vorbis(+)]
 "
 RDEPEND="${DEPEND}"


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/
@ 2023-11-27 23:22 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2023-11-27 23:22 UTC (permalink / raw
  To: gentoo-commits

commit:     c3ed941cae94ce7185dabf062caaedafa6dea7a1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 21:39:48 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 23:21:35 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c3ed941c

media-libs/phonon-vlc: Add IUSE="qt5,qt6"

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 29 ++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index d4a1e66c48..ec7f0c54a8 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -15,16 +15,29 @@ fi
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-IUSE="debug"
+IUSE="+qt5 qt6"
+REQUIRED_USE="|| ( qt5 qt6 )"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
 DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=media-libs/phonon-4.11.0
+	>=media-libs/phonon-4.12.0[qt5=,qt6=]
 	media-video/vlc:=[dbus,ogg,vorbis(+)]
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="
+	qt5? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPHONON_BUILD_QT5=$(usex qt5)
+		-DPHONON_BUILD_QT6=$(usex qt6)
+	)
+	ecm_src_configure
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/
@ 2023-11-28 22:57 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2023-11-28 22:57 UTC (permalink / raw
  To: gentoo-commits

commit:     8052643bbddc5d732e24b5ebd1f285bf29b5800f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 20:36:35 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 28 22:52:18 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8052643b

media-libs/phonon-vlc: add 0.12.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild | 43 ++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
new file mode 100644
index 0000000000..4017e5e068
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ecm kde.org
+
+DESCRIPTION="VLC backend for the Phonon multimedia library"
+HOMEPAGE="https://community.kde.org/Phonon"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="+qt5 qt6"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+DEPEND="
+	>=media-libs/phonon-4.12.0[qt5=,qt6=]
+	media-video/vlc:=[dbus,ogg,vorbis(+)]
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	qt5? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPHONON_BUILD_QT5=$(usex qt5)
+		-DPHONON_BUILD_QT6=$(usex qt6)
+	)
+	ecm_src_configure
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/
@ 2023-11-29  3:19 Sam James
  0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2023-11-29  3:19 UTC (permalink / raw
  To: gentoo-commits

commit:     6719012606ef35c6385c40a5b491a7d7d0bcd96e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 03:19:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 03:19:34 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=67190126

media-libs/phonon-vlc: fix S

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild | 1 +
 media-libs/phonon-vlc/phonon-vlc-9999.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
index 4017e5e068..62401f9834 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
@@ -10,6 +10,7 @@ HOMEPAGE="https://community.kde.org/Phonon"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
+	S="${WORKDIR}"/phonon-backend-vlc-${PV}
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 

diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index ec7f0c54a8..62f22baad0 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -10,6 +10,7 @@ HOMEPAGE="https://community.kde.org/Phonon"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
+	S="${WORKDIR}"/phonon-backend-vlc-${PV}
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/
@ 2023-12-22  9:26 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2023-12-22  9:26 UTC (permalink / raw
  To: gentoo-commits

commit:     2e598005d4d0cca22cd78660fea15ee2febe145e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 09:24:20 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 09:26:25 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e598005

media-libs/phonon-vlc: drop 0.12.0, moved to ::gentoo

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild | 44 --------------------------
 1 file changed, 44 deletions(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
deleted file mode 100644
index 62401f9834..0000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit ecm kde.org
-
-DESCRIPTION="VLC backend for the Phonon multimedia library"
-HOMEPAGE="https://community.kde.org/Phonon"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
-	S="${WORKDIR}"/phonon-backend-vlc-${PV}
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="+qt5 qt6"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-DEPEND="
-	>=media-libs/phonon-4.12.0[qt5=,qt6=]
-	media-video/vlc:=[dbus,ogg,vorbis(+)]
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_QT5=$(usex qt5)
-		-DPHONON_BUILD_QT6=$(usex qt6)
-	)
-	ecm_src_configure
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/
@ 2024-03-03 16:16 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2024-03-03 16:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f36f623ce0b2566c299233d684bd722be9396b3e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 16:09:23 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 16:16:15 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f36f623c

media-libs/phonon-vlc: Use cmake.eclass and multibuild instead of ecm.eclass

Simultanous build of Qt5 and Qt6 is broken, installing Qt6 plugins
in Qt5 paths and vice versa.

ebuild was barely using ecm facilities anyway, this makes sure only those
deps that are needed are also used.

Bug: https://bugs.gentoo.org/923502
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 53 +++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 3f2110698e..4753dd1660 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit ecm kde.org
+inherit cmake flag-o-matic kde.org multibuild
 
 DESCRIPTION="VLC backend for the Phonon multimedia library"
 HOMEPAGE="https://community.kde.org/Phonon"
@@ -16,13 +16,14 @@ fi
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-IUSE="+qt5 qt6"
+IUSE="debug +qt5 qt6"
 REQUIRED_USE="|| ( qt5 qt6 )"
 
 DEPEND="
 	>=media-libs/phonon-4.12.0[qt5=,qt6=]
 	media-video/vlc:=[dbus,ogg,vorbis(+)]
 	qt5? (
+		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
@@ -30,15 +31,49 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
+	dev-libs/libpcre2:*
 	virtual/pkgconfig
+	qt5? (
+		dev-qt/linguist-tools:5
+		>=kde-frameworks/extra-cmake-modules-5.115.0:*
+	)
+	qt6? (
+		dev-qt/qttools:6[linguist]
+		>=kde-frameworks/extra-cmake-modules-6.0.0:*
+	)
 "
 
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
 src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_QT5=$(usex qt5)
-		-DPHONON_BUILD_QT6=$(usex qt6)
-	)
-	ecm_src_configure
+	use debug || append-cppflags -DQT_NO_DEBUG
+
+	myconfigure() {
+		local mycmakeargs=(
+			-DQT_MAJOR_VERSION=${MULTIBUILD_VARIANT/qt/}
+			-DPHONON_BUILD_${MULTIBUILD_VARIANT^^}=ON
+			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
+			-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+			mycmakeargs+=( -DPHONON_BUILD_QT5=OFF )
+		else
+			mycmakeargs+=( -DPHONON_BUILD_QT6=OFF )
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
 }


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/
@ 2024-09-09 14:39 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2024-09-09 14:39 UTC (permalink / raw
  To: gentoo-commits

commit:     58ecfd0f94c490ab8c6f688d24079acfb39d43fc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  9 14:39:27 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  9 14:39:27 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=58ecfd0f

media-libs/phonon-vlc: Switch IUSE default from +qt5 to +qt6

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 4753dd1660..ad53dc499b 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -16,7 +16,7 @@ fi
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-IUSE="debug +qt5 qt6"
+IUSE="debug qt5 +qt6"
 REQUIRED_USE="|| ( qt5 qt6 )"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-09-09 14:40 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-13 17:03 [gentoo-commits] proj/kde:master commit in: media-libs/phonon-vlc/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2013-10-17 17:53 Johannes Huber
2013-11-09 17:47 Johannes Huber
2014-08-13 19:43 Johannes Huber
2019-11-14 16:51 Andreas Sturmlechner
2021-05-15 20:50 Andreas Sturmlechner
2023-11-27 23:22 Andreas Sturmlechner
2023-11-28 22:57 Andreas Sturmlechner
2023-11-29  3:19 Sam James
2023-12-22  9:26 Andreas Sturmlechner
2024-03-03 16:16 Andreas Sturmlechner
2024-09-09 14:39 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox