commit: b7956a48283a20e60066be1f3962c2dbb972aae5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Dec 2 17:21:58 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 3 05:03:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7956a48
media-libs/phonon-gstreamer: Drop 4.9.0-r3 Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/phonon-gstreamer/Manifest | 1 - ...non-gstreamer-4.9.0-no-paused-on-zero-vol.patch | 30 ----------- .../files/phonon-gstreamer-4.9.0-qt-5.11.patch | 62 ---------------------- .../phonon-gstreamer-4.9.0-r3.ebuild | 62 ---------------------- 4 files changed, 155 deletions(-) diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest index 65683b38da9..5821667db7b 100644 --- a/media-libs/phonon-gstreamer/Manifest +++ b/media-libs/phonon-gstreamer/Manifest @@ -1,2 +1 @@ DIST phonon-backend-gstreamer-4.10.0.tar.xz 98532 BLAKE2B b9182a50810536c46999266bd40996bb59ac982e44d2066c2afd897d3a2feb99e5570e36dcc869098f5b171018f4c339a2e3b8df124eaeb88236073245069859 SHA512 3beaba9ea3a332a6908ebdaa966958e8e8056d79cfb210e82a8edaf08f0a8bacbf8094e91b1b1b936406aa634dabb962e6c1468e4dde3febd9efac1a63ea70a4 -DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe 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 deleted file mode 100644 index 51887e99c8e..00000000000 --- a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fca0714fd37b2276eb663f649b6b9871a3973fa4 Mon Sep 17 00:00:00 2001 -From: Anthony Fieroni <bvb...@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 <bvb...@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/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 deleted file mode 100644 index 1e500058cf3..00000000000 --- a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-qt-5.11.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 38532b45ea32d5355cc19ff32ef69c2f462cad5d Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <ast...@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-r3.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild deleted file mode 100644 index 5af2b0308fc..00000000000 --- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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" -else - EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) - inherit git-r3 -fi - -inherit cmake-utils xdg-utils - -DESCRIPTION="Phonon GStreamer backend" -HOMEPAGE="https://phonon.kde.org/"; - -LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" -SLOT="0" -IUSE="alsa debug +network" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - >=media-libs/phonon-4.10.0 - media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] - virtual/opengl - network? ( media-plugins/gst-plugins-soup:1.0 ) -" -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 -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -}
