public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/, media-libs/phonon/files/
@ 2016-07-24 17:21 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-07-24 17:21 UTC (permalink / raw
  To: gentoo-commits

commit:     7127a56fcd3b9bd242d77694fe1be601b7a3cad5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 17:20:10 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 17:21:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7127a56f

media-libs/phonon: remove old

Package-Manager: portage-2.3.0

 media-libs/phonon/Manifest                      |   1 -
 media-libs/phonon/files/phonon-4.8.3-gcc5.patch |  34 ------
 media-libs/phonon/phonon-4.8.3-r1.ebuild        | 132 ------------------------
 media-libs/phonon/phonon-4.8.3.ebuild           |  98 ------------------
 4 files changed, 265 deletions(-)

diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index f45ec5a..1a8edec 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,3 +1,2 @@
 DIST phonon-4.7.2.tar.xz 330244 SHA256 819e9734d20e254b4599d8ab45f15a68d95444c4e2088c7eb5769b58976a11be SHA512 b576b8f69ea2db58303dab3b6e64df4e3238a86610b4f549634a067ba680bd66a6df53285303a8e46df458e6da0b8e9c9112c917b054304397abb556de3a6bb5 WHIRLPOOL 2cc9a6a58d3449cc595a36c3742c03060c73a1efb10eceebf5554e504858f8d73c92c679babdc1d145d326c6024958868ee0e15fdd5eaafffcdbba98aba6f188
-DIST phonon-4.8.3.tar.xz 322012 SHA256 a1149c961ca1570968d070bbd23671e614aa506f847ca93748960e309f85da16 SHA512 368014e808fe9ac84cdb4caf99dec93470907ca959e9a900fd6a8d86b3a44603b91be06b64b0f484d199663647bf82e84f643900edcf6a0c90ea55c53f767701 WHIRLPOOL 12de8d3de919575f23b9acd8bddb8e594f755062e560617371f8614cb51fba7fb08c62549c28670cbde60b5f962a1953e5ae1bb9b64b166aa58c9b820c241868
 DIST phonon-4.9.0.tar.xz 321860 SHA256 bb74b40f18ade1d9ab89ffcd7aeb7555be797ca395f1224c488b394da6deb0e0 SHA512 6201b0fa8620cf2640f1488d2ea9605ddd9894af077be247bdcc1ee20f4f7352f6b42fa834bcc074ec3ede1281fdbc3bf137961591f8d954d02a29186ff17a5c WHIRLPOOL ac89bc5a01222662b28d48a8a8ce6db86dae76d200981761ec3de004c96c853944c40409716e4e9bcefb389e60c32981d6b5e2e7dee8fafd0662c1ae91e56ac3

diff --git a/media-libs/phonon/files/phonon-4.8.3-gcc5.patch b/media-libs/phonon/files/phonon-4.8.3-gcc5.patch
deleted file mode 100644
index 5038d73..0000000
--- a/media-libs/phonon/files/phonon-4.8.3-gcc5.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit e966180fbba1812f8050a743351036d573c19b1f
-Author: Ryan Hill <rhill@gentoo.org>
-Date:   Sun Sep 13 06:17:43 2015 -0600
-
-    Fix build failure with GCC 5 and Qt 5.4.2.
-    
-    Recent versions of GCC (>=5.1) will sometimes emit copy relocations when
-	compiling with -fPIE, which causes some Qt applications to crash.  As of
-	5.4.2 all code built against Qt must instead be compiled with -fPIC.
-    
-    Enabling CMAKE_POSITION_INDEPENDENT_CODE will cause cmake to add -fPIC or
-    -fPIE depending on the type of object being built.  The try_compile() test
-    for -fvisibility=hidden support is creating an executable so -fPIE is used
-    which makes Qt throw a fit.
-    
-    Gentoo-Bug: https://bugs.gentoo.org/555866
-    See-Also:   https://bugreports.qt.io/browse/QTBUG-45755
----
- cmake/FindPhononInternal.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/cmake/FindPhononInternal.cmake
-+++ b/cmake/FindPhononInternal.cmake
-@@ -109,8 +109,8 @@ else (NOT PHONON_BUILD_PHONON4QT5) # Qt5
-     find_package(Qt5Widgets)
-     macro_log_feature(Qt5Widgets_FOUND "Qt5 Widgets (qtbase)" "" "" TRUE)
- 
--    if (Qt5_POSITION_INDEPENDENT_CODE)
--      set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-+    if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC)
-+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_PIC}")
-     endif()
- 
-     #---- compat

diff --git a/media-libs/phonon/phonon-4.8.3-r1.ebuild b/media-libs/phonon/phonon-4.8.3-r1.ebuild
deleted file mode 100644
index 6b06e7f..0000000
--- a/media-libs/phonon/phonon-4.8.3-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-else
-	SCM_ECLASS="git-r3"
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	KEYWORDS=""
-fi
-
-inherit multibuild qmake-utils cmake-multilib ${SCM_ECLASS}
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"
-
-REQUIRED_USE="
-	|| ( qt4 qt5 )
-	zeitgeist? ( qt4 )
-"
-
-RDEPEND="
-	!!dev-qt/qtphonon:4
-	qt4? (
-		dev-qt/qtcore:4[${MULTILIB_USEDEP}]
-		dev-qt/qtdbus:4[${MULTILIB_USEDEP}]
-		dev-qt/qtgui:4[${MULTILIB_USEDEP}]
-		designer? ( dev-qt/designer:4[${MULTILIB_USEDEP}] )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		designer? ( dev-qt/designer:5 )
-	)
-	pulseaudio? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		>=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}]
-	)
-	zeitgeist? ( dev-libs/libqzeitgeist )
-"
-DEPEND="${RDEPEND}
-	qt4? ( >=dev-util/automoc-0.9.87 )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-PDEPEND="
-	aqua? ( media-libs/phonon-qt7 )
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.8.0[qt4?,qt5?] )
-	vlc? ( >=media-libs/phonon-vlc-0.8.0[qt4?,qt5?] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7.0-plugin-install.patch"
-	"${FILESDIR}/${P}-gcc5.patch"
-)
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-		$(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
-		$(cmake-utils_use_with pulseaudio GLIB2)
-		$(cmake-utils_use_with pulseaudio PulseAudio)
-		$(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist) || echo -DWITH_QZeitgeist=OFF)
-		-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
-	)
-	if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
-		mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)
-	fi
-	if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
-		mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON)
-	fi
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	myconfigure() {
-		local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
-		if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
-			cmake-multilib_src_configure
-		elif [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
-			multilib_src_configure
-		fi
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	mycompile() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			cmake-multilib_src_compile
-		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			cmake-utils_src_compile
-		fi
-	}
-	multibuild_foreach_variant mycompile
-}
-
-src_test() {
-	mytest() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			cmake-multilib_src_test
-		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			cmake-utils_src_test
-		fi
-	}
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	myinstall() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			cmake-multilib_src_install
-		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			cmake-utils_src_install
-		fi
-	}
-	multibuild_foreach_variant myinstall
-}

diff --git a/media-libs/phonon/phonon-4.8.3.ebuild b/media-libs/phonon/phonon-4.8.3.ebuild
deleted file mode 100644
index 27cb3fc..0000000
--- a/media-libs/phonon/phonon-4.8.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-else
-	SCM_ECLASS="git-r3"
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	KEYWORDS=""
-fi
-
-inherit cmake-utils multibuild ${SCM_ECLASS}
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"
-
-REQUIRED_USE="
-	|| ( qt4 qt5 )
-	zeitgeist? ( qt4 )
-"
-
-RDEPEND="
-	!!dev-qt/qtphonon:4
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		designer? ( dev-qt/designer:4 )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		designer? ( dev-qt/designer:5 )
-	)
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-	zeitgeist? ( dev-libs/libqzeitgeist )
-"
-DEPEND="${RDEPEND}
-	qt4? ( >=dev-util/automoc-0.9.87 )
-	virtual/pkgconfig
-"
-PDEPEND="
-	aqua? ( media-libs/phonon-qt7 )
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.8.0[qt4?,qt5?] )
-	vlc? ( >=media-libs/phonon-vlc-0.8.0[qt4?,qt5?] )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-			$(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
-			$(cmake-utils_use_with pulseaudio GLIB2)
-			$(cmake-utils_use_with pulseaudio PulseAudio)
-			$(cmake-utils_use_with zeitgeist QZeitgeist)
-		)
-		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_test() {
-	multibuild_foreach_variant cmake-utils_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/, media-libs/phonon/files/
@ 2018-04-27 21:42 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-04-27 21:42 UTC (permalink / raw
  To: gentoo-commits

commit:     3c7bc4f6c5fe8e362e315e30a98ddb7177ea839e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 27 19:29:35 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 21:42:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7bc4f6

media-libs/phonon: Drop 4.10.0

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-libs/phonon/Manifest                         |   1 -
 .../phonon/files/phonon-4.10.0-qt-5.11.patch       | 190 ---------------------
 media-libs/phonon/phonon-4.10.0.ebuild             |  57 -------
 3 files changed, 248 deletions(-)

diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 9731ecbd2fb..af16bdd2024 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,3 +1,2 @@
-DIST phonon-4.10.0.tar.xz 322072 BLAKE2B ba49893368fc13946e2e83a498787bf8fe605b2b3d8e2b1c28eacad5ec13d9679b8c9ddd2adc54c340bbc60a01c7c1143ccaca6f26b86be105cb7502de5f39fc SHA512 6074c7c33edcdfeed8a6199024f1faedebe09652cf5d01075f2d97146b54c4269924b69ca8298e2341c0cf6ca4d18f930a59a937697f6f282b6de8e976d097c4
 DIST phonon-4.10.1.tar.xz 322100 BLAKE2B 0040bcc82e68a52cb8056c29b5008daddfd8b985f95113e17f1c18d1b5bf1f81222a34ae45b2ee5bd3bc0f104614551638642a85e1770fc218cbe7e2209b5a0e SHA512 a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007
 DIST phonon-4.9.1.tar.xz 321872 BLAKE2B a315189f578ad71e241ebfbea1bc6c81f06cf041b2eb2914d66f82f35c69c3811d16dbf4303551aafdd1a63d6ff6da619b06a6f03274a9867393f6d032348673 SHA512 a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728

diff --git a/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch b/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch
deleted file mode 100644
index f8444b343a4..00000000000
--- a/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 2670e33c418acdf6c08fd0cf5d238a4d93cc12e6 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 13 Apr 2018 22:35:30 +0200
-Subject: [PATCH] Fix cmake with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- declarative/CMakeLists.txt          | 10 ++++-----
- demos/metadatareader/CMakeLists.txt |  7 ++++--
- demos/phota/CMakeLists.txt          |  7 ++++--
- demos/simplecapture/CMakeLists.txt  |  7 ++++--
- demos/simpleplayer/CMakeLists.txt   |  7 ++++--
- designer/CMakeLists.txt             | 10 ++++-----
- phonon/CMakeLists.txt               | 33 +++++++++++++++++------------
- phonon/experimental/CMakeLists.txt  |  9 ++++++--
- 9 files changed, 57 insertions(+), 58 deletions(-)
-
-diff --git a/declarative/CMakeLists.txt b/declarative/CMakeLists.txt
-index da2d2eb9..cdc1b842 100644
---- a/declarative/CMakeLists.txt
-+++ b/declarative/CMakeLists.txt
-@@ -19,11 +19,11 @@ set(declarative_SRCS
- 
- phonon_add_declarative_plugin(phononqmlplugin ${declarative_SRCS})
- 
--target_link_libraries(phononqmlplugin
--    ${PHONON_LIBS}
--)
--
--qt5_use_modules(phononqmlplugin Core Gui Declarative)
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phononqmlplugin Qt5::Core Qt5::Gui Qt5::Declarative ${PHONON_LIBS})
-+else()
-+    target_link_libraries(phononqmlplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${PHONON_LIBS})
-+endif()
- 
- install(TARGETS phononqmlplugin DESTINATION ${PHONON_QT_IMPORTS_INSTALL_DIR}/Phonon)
- install(FILES ${phonon_QMLS} DESTINATION ${PHONON_QT_IMPORTS_INSTALL_DIR}/Phonon)
-diff --git a/demos/metadatareader/CMakeLists.txt b/demos/metadatareader/CMakeLists.txt
-index a307c071..69e2b3a6 100644
---- a/demos/metadatareader/CMakeLists.txt
-+++ b/demos/metadatareader/CMakeLists.txt
-@@ -13,5 +13,8 @@ set(metadatareader_SRCS
- 
- phonon_add_executable(metadatareader ${metadatareader_SRCS})
- 
--qt5_use_modules(metadatareader Core Widgets)
--target_link_libraries(metadatareader ${PHONON_LIBRARY})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(metadatareader Qt5::Core Qt5::Widgets ${PHONON_LIBRARY})
-+else()
-+    target_link_libraries(metadatareader ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY})
-+endif()
-diff --git a/demos/phota/CMakeLists.txt b/demos/phota/CMakeLists.txt
-index e9a4ee34..aa70cf39 100644
---- a/demos/phota/CMakeLists.txt
-+++ b/demos/phota/CMakeLists.txt
-@@ -17,5 +17,8 @@ qt5_wrap_ui(phota_SRCS videoeffects.ui)
- 
- phonon_add_executable(phota ${phota_SRCS})
- 
--qt5_use_modules(phota Core Widgets)
--target_link_libraries(phota ${PHONON_LIBRARY})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phota Qt5::Core Qt5::Widgets ${PHONON_LIBRARY})
-+else()
-+    target_link_libraries(phota ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY})
-+endif()
-diff --git a/demos/simplecapture/CMakeLists.txt b/demos/simplecapture/CMakeLists.txt
-index cd910707..811d29c6 100644
---- a/demos/simplecapture/CMakeLists.txt
-+++ b/demos/simplecapture/CMakeLists.txt
-@@ -13,5 +13,8 @@ set(simplecapture_SRCS
- 
- phonon_add_executable(simplecapture ${simplecapture_SRCS})
- 
--qt5_use_modules(simplecapture Core Widgets)
--target_link_libraries(simplecapture ${PHONON_LIBRARY})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(simplecapture Qt5::Core Qt5::Widgets ${PHONON_LIBRARY})
-+else()
-+    target_link_libraries(simplecapture ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY})
-+endif()
-diff --git a/demos/simpleplayer/CMakeLists.txt b/demos/simpleplayer/CMakeLists.txt
-index 3d66c74e..f759224f 100644
---- a/demos/simpleplayer/CMakeLists.txt
-+++ b/demos/simpleplayer/CMakeLists.txt
-@@ -13,5 +13,8 @@ set(simpleplayer_SRCS
- 
- phonon_add_executable(simpleplayer ${simpleplayer_SRCS})
- 
--qt5_use_modules(simpleplayer Core Widgets)
--target_link_libraries(simpleplayer ${PHONON_LIBRARY})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(simpleplayer Qt5::Core Qt5::Widgets ${PHONON_LIBRARY})
-+else()
-+    target_link_libraries(simpleplayer ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY})
-+endif()
-diff --git a/designer/CMakeLists.txt b/designer/CMakeLists.txt
-index 9d437547..e9d2e982 100644
---- a/designer/CMakeLists.txt
-+++ b/designer/CMakeLists.txt
-@@ -11,10 +11,10 @@ set(phononwidgetsplugin_SRCS
- 
- phonon_add_designer_plugin(phononwidgets phononwidgets.qrc ${phononwidgetsplugin_SRCS})
- 
--qt5_use_modules(phononwidgets Core Gui Widgets Designer)
--
--target_link_libraries(phononwidgets
--    ${PHONON_LIBS}
--)
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phononwidgets Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Designer ${PHONON_LIBS})
-+else()
-+    target_link_libraries(phononwidgets ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${PHONON_LIBS})
-+endif()
- 
- install(TARGETS phononwidgets DESTINATION ${PHONON_QT_PLUGIN_INSTALL_DIR})
-diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt
-index f9ae09e5..b80c96d8 100644
---- a/phonon/CMakeLists.txt
-+++ b/phonon/CMakeLists.txt
-@@ -137,25 +137,32 @@ add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_
- add_definitions(-DPHONON_BACKEND_DIR_SUFFIX="/${PHONON_LIB_SONAME}_backend/")
- 
- add_library(${PHONON_LIB_SONAME} SHARED ${phonon_LIB_SRCS})
--qt5_use_modules(${PHONON_LIB_SONAME} Core Widgets)
- 
--if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
--    qt5_use_modules(${PHONON_LIB_SONAME} DBus)
--endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(${PHONON_LIB_SONAME} Qt5::Core Qt5::Widgets)
-+    if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+        target_link_libraries(${PHONON_LIB_SONAME} Qt5::DBus)
-+    endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+    if(NOT PHONON_NO_GRAPHICSVIEW)
-+        target_link_libraries(${PHONON_LIB_SONAME} Qt5::OpenGL ${OPENGL_gl_LIBRARY})
-+    endif()
-+else()
-+    target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+    if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+        target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTDBUS_LIBRARY})
-+    endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+    if(NOT PHONON_NO_GRAPHICSVIEW)
-+        target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
-+    endif()
-+    if (QZEITGEIST_FOUND)
-+        target_link_libraries(${PHONON_LIB_SONAME} ${QZEITGEIST_LIBRARY})
-+    endif(QZEITGEIST_FOUND)
-+endif()
- 
- if (PHONON_PULSESUPPORT)
-     target_link_libraries(${PHONON_LIB_SONAME} ${GOBJECT_LIBRARIES} ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY})
- endif (PHONON_PULSESUPPORT)
- 
--if(NOT PHONON_NO_GRAPHICSVIEW)
--    qt5_use_modules(${PHONON_LIB_SONAME} OpenGL)
--    target_link_libraries(${PHONON_LIB_SONAME} ${OPENGL_gl_LIBRARY})
--endif()
--
--if (QZEITGEIST_FOUND)
--    target_link_libraries(${PHONON_LIB_SONAME} ${QZEITGEIST_LIBRARY})
--endif(QZEITGEIST_FOUND)
--
- if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-   # We need to explicitly link libm to phonon in Solaris
-   target_link_libraries(${PHONON_LIB_SONAME} m)
-diff --git a/phonon/experimental/CMakeLists.txt b/phonon/experimental/CMakeLists.txt
-index e44cb7ac..13101ec9 100644
---- a/phonon/experimental/CMakeLists.txt
-+++ b/phonon/experimental/CMakeLists.txt
-@@ -20,8 +20,13 @@ set(phononexperimental_LIB_SRCS
-     ../abstractvideooutput_p.cpp
-    )
- add_library(${PHONON_LIB_SONAME}experimental SHARED ${phononexperimental_LIB_SRCS})
--qt5_use_modules(${PHONON_LIB_SONAME}experimental Core Widgets)
--target_link_libraries(${PHONON_LIB_SONAME}experimental ${PHONON_LIBS})
-+
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(${PHONON_LIB_SONAME}experimental Qt5::Core Qt5::Widgets ${PHONON_LIBS})
-+else()
-+    target_link_libraries(${PHONON_LIB_SONAME}experimental ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBS})
-+endif()
-+
- set_target_properties(${PHONON_LIB_SONAME}experimental PROPERTIES
-                                          VERSION ${PHONON_LIB_VERSION}
-                                          SOVERSION ${PHONON_LIB_SOVERSION}
--- 
-2.17.0
-

diff --git a/media-libs/phonon/phonon-4.10.0.ebuild b/media-libs/phonon/phonon-4.10.0.ebuild
deleted file mode 100644
index 5da7537646b..00000000000
--- a/media-libs/phonon/phonon-4.10.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils qmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug designer gstreamer pulseaudio +vlc"
-
-RDEPEND="
-	!!dev-qt/qtphonon:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig
-"
-PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
-	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_PHONON4QT5=ON
-		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-		-DWITH_GLIB2=$(usex pulseaudio)
-		-DWITH_PulseAudio=$(usex pulseaudio)
-		-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake
-	)
-	cmake-utils_src_configure
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/, media-libs/phonon/files/
@ 2023-08-20 14:37 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-08-20 14:37 UTC (permalink / raw
  To: gentoo-commits

commit:     c17f12094f895eab94115d8556bafe3df64d0c1b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 14:10:43 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 14:36:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17f1209

media-libs/phonon: Fix build with clang-16

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

 .../phonon/files/phonon-4.11.1-clang-16.patch      | 38 ++++++++++++++++++++++
 media-libs/phonon/phonon-4.11.1-r2.ebuild          |  4 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/media-libs/phonon/files/phonon-4.11.1-clang-16.patch b/media-libs/phonon/files/phonon-4.11.1-clang-16.patch
new file mode 100644
index 000000000000..a3fe704bba0d
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.11.1-clang-16.patch
@@ -0,0 +1,38 @@
+From 069d5a3eb81bcbc730e44c27a0d060a85cf9213d Mon Sep 17 00:00:00 2001
+From: Dimitry Andric <dimitry@andric.com>
+Date: Sun, 16 Jul 2023 15:17:39 +0200
+Subject: [PATCH] Future-proof build fix for clang > 16
+
+Clang is intending to remove the `-Wno-enum-constexpr-conversion` flag
+in the future, because it can invoke undefined behavior.
+
+To avoid the "integer value NNNN is outside the valid range of values
+[0, 7] for the enumeration type 'ObjectDescriptionType'" warnings,
+explicitly specify that the `ObjectDescriptionType` enum uses `unsigned`
+as the underlying type.
+
+This also allows to remove the CMake patch that added the
+`-Wno-enum-constexpr-conversion` flag.
+
+* asturm 2023-08-20: Drop adding of -Wno-enum-constexpr-conversion in
+  commit f685bdfdf30deeea2d1db01c1edf0c60cbda652e in the first place.
+
+---
+ phonon/objectdescription.h         | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h
+index 97fec2e79..6ce92de54 100644
+--- a/phonon/objectdescription.h
++++ b/phonon/objectdescription.h
+@@ -43,7 +43,7 @@ namespace Phonon
+      *
+      * \ingroup Backend
+      */
+-    enum ObjectDescriptionType
++    enum ObjectDescriptionType : unsigned
+     {
+         /**
+          * Audio output devices. This can be soundcards (with different drivers), soundservers or
+-- 
+GitLab

diff --git a/media-libs/phonon/phonon-4.11.1-r2.ebuild b/media-libs/phonon/phonon-4.11.1-r2.ebuild
index da2281950bf6..0fd2db131a67 100644
--- a/media-libs/phonon/phonon-4.11.1-r2.ebuild
+++ b/media-libs/phonon/phonon-4.11.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,8 @@ PDEPEND="
 	vlc? ( >=media-libs/phonon-vlc-0.9.60 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-clang-16.patch" ) # bug 894346
+
 src_configure() {
 	local mycmakeargs=(
 		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/, media-libs/phonon/files/
@ 2024-08-22 19:40 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2024-08-22 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     364bb9166135bf355c5d34556924daa692efb584
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 19:23:11 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 19:40:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=364bb916

media-libs/phonon: Fix upstream's cmake logic w/ IUSE -designer

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

 media-libs/phonon/files/phonon-4.12.0-cmake.patch | 69 +++++++++++++++++++++++
 media-libs/phonon/phonon-4.12.0-r3.ebuild         |  6 +-
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/media-libs/phonon/files/phonon-4.12.0-cmake.patch b/media-libs/phonon/files/phonon-4.12.0-cmake.patch
new file mode 100644
index 000000000000..f212567777f1
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.12.0-cmake.patch
@@ -0,0 +1,69 @@
+From 02bde730f0750ca751da81a7077a0f70bf9dd056 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 22 Aug 2024 21:19:07 +0200
+Subject: [PATCH] Hide QtDesigner cmake finding and workarounds behind existing
+ option
+
+Otherwise, `add_library(Qt::OpenGLWidgets ALIAS Qt6::OpenGLWidgets)` will
+potentially fail even if PHONON_BUILD_DESIGNER_PLUGIN was not requested.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 32 ++++++++++++++++++--------------
+ 1 file changed, 18 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c00760fc..babeb392 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+-project(Phonon VERSION "4.12.0")
++project(Phonon VERSION "4.11.1")
+ 
+ include(FeatureSummary)
+ 
+@@ -116,23 +116,27 @@ foreach(version ${VERSIONS})
+     # https://bugreports.qt.io/browse/QTBUG-114706
+     add_library(Qt::Widgets ALIAS Qt${QT_MAJOR_VERSION}::Widgets)
+ 
+-    # Designer Plugin
+-    find_package(Qt${QT_MAJOR_VERSION}Designer ${REQUIRED_QT_VERSION})
+-    set_package_properties(Qt${QT_MAJOR_VERSION}Designer PROPERTIES
+-        TYPE RECOMMENDED
+-        DESCRIPTION "Needed to build the Qt Designer plugin"
+-        URL "https://www.qt.io/download")
+-    # https://bugreports.qt.io/browse/QTBUG-114706
+-    if(Qt${QT_MAJOR_VERSION}Xml_FOUND)
+-        add_library(Qt::Xml ALIAS Qt${QT_MAJOR_VERSION}::Xml)
++    if(PHONON_BUILD_DESIGNER_PLUGIN)
++        # Designer Plugin
++        find_package(Qt${QT_MAJOR_VERSION}Designer ${REQUIRED_QT_VERSION})
++        set_package_properties(Qt${QT_MAJOR_VERSION}Designer PROPERTIES
++            TYPE RECOMMENDED
++            DESCRIPTION "Needed to build the Qt Designer plugin"
++            URL "https://www.qt.io/download")
++        # https://bugreports.qt.io/browse/QTBUG-114706
++        if(Qt${QT_MAJOR_VERSION}Xml_FOUND)
++            add_library(Qt::Xml ALIAS Qt${QT_MAJOR_VERSION}::Xml)
++        endif()
++        if(QT_MAJOR_VERSION STREQUAL "6")
++            # Qt6Designer links to OpenGLWidgets but doesnt find it
++            find_package(Qt6OpenGLWidgets ${REQUIRED_QT_VERSION})
++            # https://bugreports.qt.io/browse/QTBUG-114706
++            add_library(Qt::OpenGLWidgets ALIAS Qt6::OpenGLWidgets)
++        endif()
+     endif()
+ 
+     if(QT_MAJOR_VERSION STREQUAL "6")
+         find_package(Qt6Core5Compat REQUIRED)
+-        # Qt6Designer links to OpenGLWidgets but doesnt find it
+-        find_package(Qt6OpenGLWidgets ${REQUIRED_QT_VERSION})
+-        # https://bugreports.qt.io/browse/QTBUG-114706
+-        add_library(Qt::OpenGLWidgets ALIAS Qt6::OpenGLWidgets)
+     endif()
+ 
+     set(BUILDSYSTEM_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/${PHONON_LIB_SONAME}/buildsystem/)
+-- 
+2.46.0
+

diff --git a/media-libs/phonon/phonon-4.12.0-r3.ebuild b/media-libs/phonon/phonon-4.12.0-r3.ebuild
index 5ccc7cf1b081..545735c83895 100644
--- a/media-libs/phonon/phonon-4.12.0-r3.ebuild
+++ b/media-libs/phonon/phonon-4.12.0-r3.ebuild
@@ -49,9 +49,9 @@ BDEPEND="
 	qt5? ( dev-qt/linguist-tools:5 )
 	qt6? ( dev-qt/qttools:6[linguist] )
 "
-PDEPEND="
-	!minimal? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )
-"
+PDEPEND="!minimal? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 938315
 
 pkg_setup() {
 	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/, media-libs/phonon/files/
@ 2024-09-04 14:55 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2024-09-04 14:55 UTC (permalink / raw
  To: gentoo-commits

commit:     c8135a2378bb7faf7b1c4cfc1db8023bef65f821
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 28 21:07:43 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep  4 14:52:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8135a23

media-libs/phonon: drop 4.11.1-r2

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

 media-libs/phonon/Manifest                         |  1 -
 .../phonon/files/phonon-4.11.1-clang-16.patch      | 38 ---------------
 media-libs/phonon/metadata.xml                     |  1 -
 media-libs/phonon/phonon-4.11.1-r2.ebuild          | 55 ----------------------
 4 files changed, 95 deletions(-)

diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 57e453229456..65c56493213c 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,2 +1 @@
-DIST phonon-4.11.1.tar.xz 314732 BLAKE2B 9be341f8df643b352392a208c7f24d799edcc94146b71c73d93974a7ef02cc75b5baa1e2ddd037e7e2d3afeb52347d96caaa8b3a2319631802261735a3a751df SHA512 858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74
 DIST phonon-4.12.0.tar.xz 408996 BLAKE2B 568af4aec5247759e49db2137978b9f1828256f817bcb321f02e69d597d78e97c9ce437e89cd63b5a8b15c312f74ccee11b34270e74be2dc24c2af9ee97490f0 SHA512 0dbd88464985051f4c43e64a4d0b7e2d65e7f6b54fd2bae4ec1790fbdf9f79348aa91d4839c72a4f66297d5a9c7b379cc34923b99b97130a5443e5b2c0cc8a9a

diff --git a/media-libs/phonon/files/phonon-4.11.1-clang-16.patch b/media-libs/phonon/files/phonon-4.11.1-clang-16.patch
deleted file mode 100644
index a3fe704bba0d..000000000000
--- a/media-libs/phonon/files/phonon-4.11.1-clang-16.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 069d5a3eb81bcbc730e44c27a0d060a85cf9213d Mon Sep 17 00:00:00 2001
-From: Dimitry Andric <dimitry@andric.com>
-Date: Sun, 16 Jul 2023 15:17:39 +0200
-Subject: [PATCH] Future-proof build fix for clang > 16
-
-Clang is intending to remove the `-Wno-enum-constexpr-conversion` flag
-in the future, because it can invoke undefined behavior.
-
-To avoid the "integer value NNNN is outside the valid range of values
-[0, 7] for the enumeration type 'ObjectDescriptionType'" warnings,
-explicitly specify that the `ObjectDescriptionType` enum uses `unsigned`
-as the underlying type.
-
-This also allows to remove the CMake patch that added the
-`-Wno-enum-constexpr-conversion` flag.
-
-* asturm 2023-08-20: Drop adding of -Wno-enum-constexpr-conversion in
-  commit f685bdfdf30deeea2d1db01c1edf0c60cbda652e in the first place.
-
----
- phonon/objectdescription.h         | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h
-index 97fec2e79..6ce92de54 100644
---- a/phonon/objectdescription.h
-+++ b/phonon/objectdescription.h
-@@ -43,7 +43,7 @@ namespace Phonon
-      *
-      * \ingroup Backend
-      */
--    enum ObjectDescriptionType
-+    enum ObjectDescriptionType : unsigned
-     {
-         /**
-          * Audio output devices. This can be soundcards (with different drivers), soundservers or
--- 
-GitLab

diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index e90f046a5550..7cf9bf61194f 100644
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/metadata.xml
@@ -10,6 +10,5 @@
 	</upstream>
 	<use>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="vlc">Install VLC Phonon backend</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-libs/phonon/phonon-4.11.1-r2.ebuild b/media-libs/phonon/phonon-4.11.1-r2.ebuild
deleted file mode 100644
index cfad75fb1aed..000000000000
--- a/media-libs/phonon/phonon-4.11.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop ecm kde.org
-
-DESCRIPTION="KDE multimedia abstraction library"
-HOMEPAGE="https://community.kde.org/Phonon"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )"
-SLOT="0"
-IUSE="debug designer gstreamer pulseaudio +vlc"
-
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libpulse[glib]
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.60 )
-	vlc? ( >=media-libs/phonon-vlc-0.9.60[qt5(+)] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-clang-16.patch" ) # bug 894346
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
-		-DPHONON_BUILD_SETTINGS=ON
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	make_desktop_entry "${PN}settings" \
-		"Phonon Audio and Video" preferences-desktop-sound
-}


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

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

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-20 14:37 [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/, media-libs/phonon/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-09-04 14:55 Andreas Sturmlechner
2024-08-22 19:40 Andreas Sturmlechner
2018-04-27 21:42 Andreas Sturmlechner
2016-07-24 17:21 Michael Palimaka

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