* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-gstreamer/files/, media-libs/phonon-gstreamer/
@ 2015-10-27 15:45 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2015-10-27 15:45 UTC (permalink / raw
To: gentoo-commits
commit: 55eb518528a1627c0de95d9812c6d8defb7b6476
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 15:44:03 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 15:44:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55eb5185
media-libs/phonon-gstreamer: backport patch from upstream fixing build with media-libs/gstreamer-1.6.0
Gentoo-bug: 564206
Package-Manager: portage-2.2.20.1
.../phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch | 61 ++++++++++++++++++++++
.../phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild | 2 +
2 files changed, 63 insertions(+)
diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch
new file mode 100644
index 0000000..039aebc
--- /dev/null
+++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch
@@ -0,0 +1,61 @@
+From da48b7fceed0238884f341530b5f4d84005dab57 Mon Sep 17 00:00:00 2001
+From: Alex Merry <alex.merry@kde.org>
+Date: Sun, 18 Oct 2015 15:21:45 +0100
+Subject: [PATCH] Fix finding recent versions of GStreamer.
+
+Newer versions of GStreamer put gst-config.h under
+lib/gstreamer-1.0/include, so we need to make sure that directory will
+be added to the include path as well.
+
+REVIEW: 125690
+---
+ cmake/FindGStreamer.cmake | 26 +++++++++++++++++++++-----
+ 1 file changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake
+index d7243d4..e30c349 100644
+--- a/cmake/FindGStreamer.cmake
++++ b/cmake/FindGStreamer.cmake
+@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
+ PATH_SUFFIXES gstreamer-1.0
+ )
+
++IF (NOT GSTREAMER_INCLUDE_DIR)
++ MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
++ENDIF (NOT GSTREAMER_INCLUDE_DIR)
++
++# Newer versions of GStreamer put gst-config.h under lib/gstreamer-1.0/include
++FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
++ PATHS
++ ${PKG_GSTREAMER_INCLUDE_DIRS}
++ PATH_SUFFIXES gstreamer-1.0
++ )
++
++IF (NOT GSTREAMER_CONF_INCLUDE_DIR)
++ MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found")
++ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR)
++
++IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
++ IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR)
++ LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}")
++ ENDIF()
++ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
++
+ FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
+ PATHS
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
+@@ -51,11 +72,6 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES gstapp-1.0
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
+ )
+
+-IF (GSTREAMER_INCLUDE_DIR)
+-ELSE (GSTREAMER_INCLUDE_DIR)
+- MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
+-ENDIF (GSTREAMER_INCLUDE_DIR)
+-
+ IF (GSTREAMER_LIBRARIES)
+ ELSE (GSTREAMER_LIBRARIES)
+ MESSAGE(STATUS "GStreamer: WARNING: library not found")
+--
+2.4.10
+
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
index 9159564..4c6c7fd 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
@@ -54,6 +54,8 @@ DEPEND="${RDEPEND}
[[ ${PV} == 9999 ]] || S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}/${P}-gstreamer-1.6.0.patch" )
+
pkg_setup() {
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-gstreamer/files/, media-libs/phonon-gstreamer/
@ 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: 2b91cd8b4a15b221c509a402394abd478fe36012
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 17:20:35 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=2b91cd8b
media-libs/phonon-gstreamer: remove old
Package-Manager: portage-2.3.0
media-libs/phonon-gstreamer/Manifest | 1 -
.../phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch | 61 ---------------
.../phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild | 89 ----------------------
3 files changed, 151 deletions(-)
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 0811d1d..17d7b2d 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,3 +1,2 @@
DIST phonon-backend-gstreamer-4.7.2.tar.xz 75552 SHA256 80b72a9092f540dd0a2abd2898328f3d5f9febfa073b0b1d44592a050a99d2b1 SHA512 d8cf408261f80de7ac29101c3613002a0e838f07e6c8dad2d3922a522a27be167ef8f17a8ab0c99c06c1b75cb4d9d68acee03cb60cf4a44dc2248b7b0dafae08 WHIRLPOOL 368f9784d2ea6fbb3d105fe4645af308bca975bac4cf21908a344d04ab76dd56d5a83ce9a4347a3d664f1830b65de4d40e12b663bcdf91170a4df38bdeb479af
-DIST phonon-backend-gstreamer-4.8.2.tar.xz 76044 SHA256 20e0f71f2beb4f859db8385079a13aef5473863ee6f27aad7b065aa7bfe931e0 SHA512 a18534b89d424bb2cc9f8a7f63a794d9711d895ad1db6cd5f4bd8748ea38310ffeacd916d16443986f89d3097e108aaf5631eaba6dd37e76a7360d5f1d02ecea WHIRLPOOL 19e68e818acda9602bdc9f557c866943e8f74d83b5a3d3532a32daf10d6c4f70c3961ceaa2e3b373ed1810c438d595864a01e31514da7c7f569d3a630a625654
DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 SHA256 cec3e5ece1261d344b68363ef0606ebf49772628ba94bb55b0c0d18773b885f1 SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe WHIRLPOOL caaa0e3392e82e120b288d3714ec4987ba70f7b11b920049da9c26fea1b940c15e5e569c855c8b37a26cff8a04959ec5b2c238e6460b324a85c22e444265f136
diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch
deleted file mode 100644
index 039aebc..0000000
--- a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From da48b7fceed0238884f341530b5f4d84005dab57 Mon Sep 17 00:00:00 2001
-From: Alex Merry <alex.merry@kde.org>
-Date: Sun, 18 Oct 2015 15:21:45 +0100
-Subject: [PATCH] Fix finding recent versions of GStreamer.
-
-Newer versions of GStreamer put gst-config.h under
-lib/gstreamer-1.0/include, so we need to make sure that directory will
-be added to the include path as well.
-
-REVIEW: 125690
----
- cmake/FindGStreamer.cmake | 26 +++++++++++++++++++++-----
- 1 file changed, 21 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake
-index d7243d4..e30c349 100644
---- a/cmake/FindGStreamer.cmake
-+++ b/cmake/FindGStreamer.cmake
-@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
- PATH_SUFFIXES gstreamer-1.0
- )
-
-+IF (NOT GSTREAMER_INCLUDE_DIR)
-+ MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
-+ENDIF (NOT GSTREAMER_INCLUDE_DIR)
-+
-+# Newer versions of GStreamer put gst-config.h under lib/gstreamer-1.0/include
-+FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
-+ PATHS
-+ ${PKG_GSTREAMER_INCLUDE_DIRS}
-+ PATH_SUFFIXES gstreamer-1.0
-+ )
-+
-+IF (NOT GSTREAMER_CONF_INCLUDE_DIR)
-+ MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found")
-+ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR)
-+
-+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
-+ IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR)
-+ LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}")
-+ ENDIF()
-+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
-+
- FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
- PATHS
- ${PKG_GSTREAMER_LIBRARY_DIRS}
-@@ -51,11 +72,6 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES gstapp-1.0
- ${PKG_GSTREAMER_LIBRARY_DIRS}
- )
-
--IF (GSTREAMER_INCLUDE_DIR)
--ELSE (GSTREAMER_INCLUDE_DIR)
-- MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
--ENDIF (GSTREAMER_INCLUDE_DIR)
--
- IF (GSTREAMER_LIBRARIES)
- ELSE (GSTREAMER_LIBRARIES)
- MESSAGE(STATUS "GStreamer: WARNING: library not found")
---
-2.4.10
-
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
deleted file mode 100644
index d15aa5e..0000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-[[ ${PV} == *9999 ]] && git_eclass="git-r3"
-EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-
-MY_PN="phonon-backend-gstreamer"
-MY_P=${MY_PN}-${PV}
-
-inherit cmake-utils multibuild ${git_eclass}
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-if [[ ${PV} == *9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-fi
-SLOT="0"
-IUSE="alsa debug +network +qt4 qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/libxml2:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
- >=media-libs/phonon-4.7.80[qt4?,qt5?]
- qt4? (
- dev-qt/qtcore:4[glib]
- dev-qt/qtgui:4[glib]
- dev-qt/qtopengl:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
- virtual/opengl
- network? ( media-plugins/gst-plugins-soup:1.0 )
- !<dev-qt/qtwebkit-4.10.4:4[gstreamer]
-"
-DEPEND="${RDEPEND}
- qt4? ( >=dev-util/automoc-0.9.87 )
- virtual/pkgconfig
-"
-
-[[ ${PV} == 9999 ]] || S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-gstreamer-1.6.0.patch" )
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-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_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-gstreamer/files/, media-libs/phonon-gstreamer/
@ 2018-04-13 23:01 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-04-13 23:01 UTC (permalink / raw
To: gentoo-commits
commit: 55e92020241c75ab99daf2662062cc14709ddb36
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 21:53:17 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 23:01:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e92020
media-libs/phonon-gstreamer: Fix build with Qt 5.11_beta3
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../files/phonon-gstreamer-4.9.0-qt-5.11.patch | 62 ++++++++++++++++++++++
.../phonon-gstreamer-4.9.0-r2.ebuild | 2 +
2 files changed, 64 insertions(+)
diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-qt-5.11.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-qt-5.11.patch
new file mode 100644
index 00000000000..1e500058cf3
--- /dev/null
+++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-qt-5.11.patch
@@ -0,0 +1,62 @@
+From 38532b45ea32d5355cc19ff32ef69c2f462cad5d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 13 Apr 2018 23:47:34 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+Also replace automoc4_add_library with add_library.
+---
+ gstreamer/CMakeLists.txt | 26 +++++++++++++++-----------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/gstreamer/CMakeLists.txt b/gstreamer/CMakeLists.txt
+index cb01285c..4536d042 100644
+--- a/gstreamer/CMakeLists.txt
++++ b/gstreamer/CMakeLists.txt
+@@ -104,18 +104,26 @@ if (BUILD_X11RENDERER)
+ add_definitions(-DBUILD_X11RENDERER)
+ endif()
+
+-automoc4_add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS})
++add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS})
+ set_target_properties(phonon_gstreamer PROPERTIES
+ PREFIX ""
+ AUTOMOC_MOC_OPTIONS ${AUTOMOC_MOC_OPTIONS}
+ )
+
+-qt5_use_modules(phonon_gstreamer Core Widgets)
+-
+-if(Qt5X11Extras_FOUND)
+- qt5_use_modules(phonon_gstreamer X11Extras)
+- target_link_libraries(phonon_gstreamer Qt5::X11Extras)
+-endif(Qt5X11Extras_FOUND)
++if(PHONON_BUILD_PHONON4QT5)
++ target_link_libraries(phonon_gstreamer Qt5::Core Qt5::Widgets)
++ if(Qt5X11Extras_FOUND)
++ target_link_libraries(phonon_gstreamer Qt5::X11Extras)
++ endif()
++ if(OPENGL_FOUND)
++ target_link_libraries(phonon_gstreamer Qt5::OpenGL ${OPENGL_gl_LIBRARY})
++ endif()
++else()
++ target_link_libraries(phonon_gstreamer ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
++ if(OPENGL_FOUND)
++ target_link_libraries(phonon_gstreamer ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
++ endif()
++endif()
+
+ target_link_libraries(phonon_gstreamer
+ ${PHONON_LIBRARY}
+@@ -126,10 +134,6 @@ target_link_libraries(phonon_gstreamer
+ if(USE_INSTALL_PLUGIN)
+ target_link_libraries(phonon_gstreamer ${GSTREAMER_PLUGIN_PBUTILS_LIBRARIES})
+ endif(USE_INSTALL_PLUGIN)
+-if(OPENGL_FOUND)
+- qt5_use_modules(phonon_gstreamer OpenGL)
+- target_link_libraries(phonon_gstreamer ${OPENGL_gl_LIBRARY})
+-endif(OPENGL_FOUND)
+
+ install(TARGETS phonon_gstreamer DESTINATION ${BACKEND_INSTALL_DIR})
+
+--
+2.17.0
+
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
index cf14d133e9d..67c68221168 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
@@ -42,6 +42,8 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
src_configure() {
local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
cmake-utils_src_configure
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-gstreamer/files/, media-libs/phonon-gstreamer/
@ 2018-12-16 19:30 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-12-16 19:30 UTC (permalink / raw
To: gentoo-commits
commit: 469eb8e67ea448ca5f5a4b8e4da8674c83bbcdc7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 19:23:09 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 19:29:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469eb8e6
media-libs/phonon-gstreamer: No paused state on 0 vol, EAPI-7 bump
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...non-gstreamer-4.9.0-no-paused-on-zero-vol.patch | 30 ++++++++++++++++++++++
...999.ebuild => phonon-gstreamer-4.9.0-r3.ebuild} | 14 +++++++---
.../phonon-gstreamer/phonon-gstreamer-9999.ebuild | 9 ++++---
3 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch
new file mode 100644
index 00000000000..51887e99c8e
--- /dev/null
+++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch
@@ -0,0 +1,30 @@
+From fca0714fd37b2276eb663f649b6b9871a3973fa4 Mon Sep 17 00:00:00 2001
+From: Anthony Fieroni <bvbfan@abv.bg>
+Date: Mon, 10 Dec 2018 16:19:51 +0200
+Subject: Do not trigger paused state on 0 percentage
+
+Differential Revision: https://phabricator.kde.org/D14241
+
+Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
+---
+ gstreamer/pipeline.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/gstreamer/pipeline.cpp b/gstreamer/pipeline.cpp
+index 7025418..0d0b253 100644
+--- a/gstreamer/pipeline.cpp
++++ b/gstreamer/pipeline.cpp
+@@ -325,6 +325,11 @@ gboolean Pipeline::cb_buffering(GstBus *bus, GstMessage *gstMessage, gpointer da
+ gint percent = 0;
+ gst_message_parse_buffering(gstMessage, &percent);
+
++ // we should not trigger paused state or gstreamer will starts buffering again
++ if (percent == 0) {
++ return true;
++ }
++
+ debug() << Q_FUNC_INFO << "Buffering :" << percent;
+
+ // Instead of playing when the pipeline is still streaming, we pause
+--
+cgit v1.1
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
similarity index 80%
copy from media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
copy to media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
index cd3c7c7b418..cc7a98acb8d 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
@@ -1,14 +1,14 @@
-# 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
MY_PN="phonon-backend-gstreamer"
MY_P=${MY_PN}-${PV}
if [[ ${PV} != *9999* ]]; then
SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
else
EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
inherit git-r3
@@ -38,10 +38,16 @@ RDEPEND="
virtual/opengl
network? ( media-plugins/gst-plugins-soup:1.0 )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/${P}-qt-5.11.patch"
+ "${FILESDIR}/${P}-no-paused-on-zero-vol.patch"
+)
+
src_configure() {
local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
cmake-utils_src_configure
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index cd3c7c7b418..0d59d267cf7 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -1,14 +1,14 @@
-# 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
MY_PN="phonon-backend-gstreamer"
MY_P=${MY_PN}-${PV}
if [[ ${PV} != *9999* ]]; then
SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
else
EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
inherit git-r3
@@ -38,7 +38,8 @@ RDEPEND="
virtual/opengl
network? ( media-plugins/gst-plugins-soup:1.0 )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-gstreamer/files/, media-libs/phonon-gstreamer/
@ 2022-11-11 23:17 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2022-11-11 23:17 UTC (permalink / raw
To: gentoo-commits
commit: 6b50e652026faaf86a6703bc0757d7909accb31e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 20:59:08 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 23:17:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b50e652
media-libs/phonon-gstreamer: EAPI-8 bump, fix open/save dialog in Wayland
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=445196
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/phonon-gstreamer-4.10.0-wayland.patch | 46 ++++++++++++++++++++++
.../phonon-gstreamer-4.10.0-r1.ebuild | 43 ++++++++++++++++++++
2 files changed, 89 insertions(+)
diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.10.0-wayland.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.10.0-wayland.patch
new file mode 100644
index 000000000000..ef1697a8395a
--- /dev/null
+++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.10.0-wayland.patch
@@ -0,0 +1,46 @@
+From bbbb160f30a394655cff9398d17961142388b0f2 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 17 Nov 2021 15:20:08 +0000
+Subject: [PATCH] Only create window handles for actual windows
+
+winId() creates a platform window for the given widget. This makes sense
+for the topmost widget in a tree, we can't assume the parent widget is
+the topmost widget.
+
+Doing this on XCB is confusing and wrong, but apparently harmless. Doing
+this on wayland causes issues as we promote the parent window to a
+subsurface but never show that window leaving things in a bizarre
+corrupt state that leads to content not updating.
+
+BUG: 445196
+---
+ gstreamer/videowidget.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gstreamer/videowidget.cpp b/gstreamer/videowidget.cpp
+index bd27b21f..83fa9b9e 100644
+--- a/gstreamer/videowidget.cpp
++++ b/gstreamer/videowidget.cpp
+@@ -158,7 +158,7 @@ void VideoWidget::setupVideoBin()
+ gst_object_unref(videopad);
+ QWidget *parentWidget = qobject_cast<QWidget*>(parent());
+ if (parentWidget) {
+- parentWidget->winId(); // Due to some existing issues with alien in 4.4,
++ parentWidget->window()->winId(); // Due to some existing issues with alien in 4.4,
+ // we must currently force the creation of a parent widget.
+ }
+ m_isValid = true; //initialization ok, accept input
+@@ -171,8 +171,8 @@ void VideoWidget::setupVideoBin()
+ gst_object_unref(videopad);
+ QWidget *parentWidget = qobject_cast<QWidget*>(parent());
+ if (parentWidget) {
+- parentWidget->winId(); // Due to some existing issues with alien in 4.4,
+- // we must currently force the creation of a parent widget.
++ parentWidget->window()->winId(); // Due to some existing issues with alien in 4.4,
++ // we must currently force the creation of a parent widget's window
+ }
+ m_isValid = true; //initialization ok, accept input
+ }
+--
+GitLab
+
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0-r1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0-r1.ebuild
new file mode 100644
index 000000000000..3b0a28563e2d
--- /dev/null
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="phonon-backend-gstreamer"
+inherit ecm kde.org
+
+DESCRIPTION="GStreamer backend for the Phonon multimedia library"
+HOMEPAGE="https://community.kde.org/Phonon"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="alsa debug +network"
+
+DEPEND="
+ dev-libs/glib:2
+ dev-libs/libxml2:2
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ media-libs/gst-plugins-base:1.0
+ media-libs/gstreamer:1.0
+ >=media-libs/phonon-4.10.60
+ media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
+ virtual/opengl
+"
+RDEPEND="${DEPEND}
+ network? ( media-plugins/gst-plugins-soup:1.0 )
+"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-wayland.patch" ) # KDE-bug 445196
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-11-11 23:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-16 19:30 [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-gstreamer/files/, media-libs/phonon-gstreamer/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-11-11 23:17 Andreas Sturmlechner
2018-04-13 23:01 Andreas Sturmlechner
2016-07-24 17:21 Michael Palimaka
2015-10-27 15:45 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox