[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/files/, media-libs/phonon/
commit: e19b5baf43e3cd90783b2bd89785b63b164ef843
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Aug 25 08:37:51 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Aug 25 08:39:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e19b5baf
media-libs/phonon: Fix cmake.patch
Closes: https://bugs.gentoo.org/938342
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/phonon/files/phonon-4.12.0-cmake.patch | 11 ++-
.../{phonon-4.12.0-r3.ebuild => phonon-4.12.0-r4.ebuild} | 0
2 files changed, 2 insertions(+), 9 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
index f21256f1..26805cb18267 100644
--- a/media-libs/phonon/files/phonon-4.12.0-cmake.patch
+++ b/media-libs/phonon/files/phonon-4.12.0-cmake.patch
@@ -9,20 +9,13 @@ potentially fail even if PHONON_BUILD_DESIGNER_PLUGIN was not
requested.
Signed-off-by: Andreas Sturmlechner
---
- CMakeLists.txt | 32 ++--
- 1 file changed, 18 insertions(+), 14 deletions(-)
+ CMakeLists.txt | 32 +-
+ 1 file changed, 17 insertions(+), 13 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)
diff --git a/media-libs/phonon/phonon-4.12.0-r3.ebuild
b/media-libs/phonon/phonon-4.12.0-r4.ebuild
similarity index 100%
rename from media-libs/phonon/phonon-4.12.0-r3.ebuild
rename to media-libs/phonon/phonon-4.12.0-r4.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/files/, media-libs/phonon/
commit: b7cd10a1f1569227186bc9d22b0aa66376f446b9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 9 18:39:31 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 9 18:39:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7cd10a1
media-libs/phonon: Drop 4.10.1-r1
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/phonon-4.10.1-pulseaudio-qt-5.12.patch | 28 ---
media-libs/phonon/phonon-4.10.1-r1.ebuild | 58 --
2 files changed, 86 deletions(-)
diff --git a/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch
b/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch
deleted file mode 100644
index 4b1dc5b6fbc..000
--- a/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From eef6dae58a19da4c6af90a0b7cce6378e527683d Mon Sep 17 00:00:00 2001
-From: Antonio Rojas
-Date: Mon, 10 Dec 2018 21:10:13 +0100
-Subject: Fix PulseAudio support with Qt 5.12
-
-QAbstractEventDispatcher::instance()->metaObject()->className() now returns
"QXcbGlibEventDispatcher", so the glib event loop test fails
-
-Differential Revision: https://phabricator.kde.org/D17486
- phonon/pulsesupport.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp
-index b7009b1..d324084 100644
a/phonon/pulsesupport.cpp
-+++ b/phonon/pulsesupport.cpp
-@@ -840,7 +840,8 @@ PulseSupport::PulseSupport()
- }
-
- // We require a glib event loop
--if
(!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib"))
{
-+if
(!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")
&&
-+
!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("GlibEventDispatcher"))
{
- qWarning("WARNING: Disabling PulseAudio integration for lack of GLib
event loop.");
- return;
- }
---
-cgit v1.1
diff --git a/media-libs/phonon/phonon-4.10.1-r1.ebuild
b/media-libs/phonon/phonon-4.10.1-r1.ebuild
deleted file mode 100644
index 011e7d0ba88..000
--- a/media-libs/phonon/phonon-4.10.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != ** ]]; 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}"
-BDEPEND="
- 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}-pulseaudio-qt-5.12.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
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/files/, media-libs/phonon/
commit: 46f93cc2348710d2f8a90b35423dedf5fa5d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 16 19:13:20 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 16 19:29:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f9
media-libs/phonon: Fix PulseAudio support with Qt 5.12, EAPI-7 bump
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/phonon-4.10.1-pulseaudio-qt-5.12.patch | 28 ++
...{phonon-.ebuild => phonon-4.10.1-r1.ebuild} | 9 ---
media-libs/phonon/phonon-.ebuild | 7 +++---
3 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch
b/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch
new file mode 100644
index 000..4b1dc5b6fbc
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch
@@ -0,0 +1,28 @@
+From eef6dae58a19da4c6af90a0b7cce6378e527683d Mon Sep 17 00:00:00 2001
+From: Antonio Rojas
+Date: Mon, 10 Dec 2018 21:10:13 +0100
+Subject: Fix PulseAudio support with Qt 5.12
+
+QAbstractEventDispatcher::instance()->metaObject()->className() now returns
"QXcbGlibEventDispatcher", so the glib event loop test fails
+
+Differential Revision: https://phabricator.kde.org/D17486
+---
+ phonon/pulsesupport.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp
+index b7009b1..d324084 100644
+--- a/phonon/pulsesupport.cpp
b/phonon/pulsesupport.cpp
+@@ -840,7 +840,8 @@ PulseSupport::PulseSupport()
+ }
+
+ // We require a glib event loop
+-if
(!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib"))
{
++if
(!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")
&&
++
!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("GlibEventDispatcher"))
{
+ qWarning("WARNING: Disabling PulseAudio integration for lack of GLib
event loop.");
+ return;
+ }
+--
+cgit v1.1
diff --git a/media-libs/phonon/phonon-.ebuild
b/media-libs/phonon/phonon-4.10.1-r1.ebuild
similarity index 90%
copy from media-libs/phonon/phonon-.ebuild
copy to media-libs/phonon/phonon-4.10.1-r1.ebuild
index 478b0d3bb95..011e7d0ba88 100644
--- a/media-libs/phonon/phonon-.ebuild
+++ b/media-libs/phonon/phonon-4.10.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
if [[ ${PV} != ** ]]; then
SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
@@ -32,7 +32,8 @@ RDEPEND="
>=media-sound/pulseaudio-0.9.21[glib]
)
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
kde-frameworks/extra-cmake-modules:5
virtual/pkgconfig
"
@@ -41,6 +42,8 @@ PDEPEND="
vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
"
+PATCHES=( "${FILESDIR}/${P}-pulseaudio-qt-5.12.patch" )
+
src_configure() {
local mycmakeargs=(
-DPHONON_BUILD_PHONON4QT5=ON
diff --git a/media-libs/phonon/phonon-.ebuild
b/media-libs/phonon/phonon-.ebuild
index 478b0d3bb95..abf73992ab1 100644
--- a/media-libs/phonon/phonon-.ebuild
+++ b/media-libs/phonon/phonon-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
if [[ ${PV} != ** ]]; then
SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
@@ -32,7 +32,8 @@ RDEPEND="
>=media-sound/pulseaudio-0.9.21[glib]
)
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
kde-frameworks/extra-cmake-modules:5
virtual/pkgconfig
"
[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/files/, media-libs/phonon/
commit: 4b3032d2c6f882d416e153672660988aa626ce3c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Apr 13 21:02:15 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Apr 13 23:01:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3032d2
media-libs/phonon: Fix build with Qt 5.11_beta3
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../phonon/files/phonon-4.10.0-qt-5.11.patch | 190 +
media-libs/phonon/phonon-4.10.0.ebuild | 2 +
2 files changed, 192 insertions(+)
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
new file mode 100644
index 000..f8444b343a4
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch
@@ -0,0 +1,190 @@
+From 2670e33c418acdf6c08fd0cf5d238a4d93cc12e6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+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
[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/files/, media-libs/phonon/
commit: 530ab1e60ae5a831e45bf68527471dc4f40685a8
Author: Michael Palimaka gentoo org>
AuthorDate: Tue Dec 15 13:13:10 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Tue Dec 15 13:13:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=530ab1e6
media-libs/phonon: add patch by Ryan Hill gentoo.org> to fix build
with GCC5.
Gentoo-bug: 555866
Package-Manager: portage-2.2.26
media-libs/phonon/files/phonon-4.8.3-gcc5.patch | 34 +
media-libs/phonon/phonon-4.8.3-r1.ebuild| 5 +++-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/media-libs/phonon/files/phonon-4.8.3-gcc5.patch
b/media-libs/phonon/files/phonon-4.8.3-gcc5.patch
new file mode 100644
index 000..5038d73
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.8.3-gcc5.patch
@@ -0,0 +1,34 @@
+commit e966180fbba1812f8050a743351036d573c19b1f
+Author: Ryan Hill
+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
index d308940..c1b5b0e 100644
--- a/media-libs/phonon/phonon-4.8.3-r1.ebuild
+++ b/media-libs/phonon/phonon-4.8.3-r1.ebuild
@@ -58,7 +58,10 @@ PDEPEND="
vlc? ( >=media-libs/phonon-vlc-0.8.0[qt4?,qt5?] )
"
-PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.7.0-plugin-install.patch"
+ "${FILESDIR}/${P}-gcc5.patch"
+)
pkg_setup() {
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
