gentoo resync : 15.12.2019

2 files changed, 0 insertions, 92 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
deleted file mode 100644
index 51887e99c8e1..000000000000
--- 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 <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/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 1e500058cf38..000000000000
--- 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 <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
-