<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class="">Please clean up the commit message when you perform squash merges. Most of the text here is outdated Git metadata (old SHA-1 hashes, repeated author name, irrelevant authorship dates).</div><div class=""><br class=""></div><div class="">vq</div><br class=""><div><blockquote type="cite" class=""><div class="">On Dec 12, 2016, at 10:54 PM, Marko Käning <<a href="mailto:mk@macports.org" class="">mk@macports.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><pre style="margin:0" class="">Marko Käning (mkae) pushed a commit to branch master
in repository macports-ports.
</pre><p class=""><a href="https://github.com/macports/macports-ports/commit/47c0c4f682b22803ae250258187544187d50f898" class="">https://github.com/macports/macports-ports/commit/47c0c4f682b22803ae250258187544187d50f898</a></p>
<pre style="white-space: pre; background: #F8F8F8" class="">The following commit(s) were added to refs/heads/master by this push:
<span style="display:block; white-space:pre;color:#404040;" class=""> new 47c0c4f phonon-backend-gstreamer(-qt5): update to 4.9.0 and introduce new subport
</span>47c0c4f is described below
<span style="display:block; white-space:pre;color:#808000;" class="">commit 47c0c4f682b22803ae250258187544187d50f898
</span>Author: Marko Käning <<a href="mailto:mk@macports.org" class="">mk@macports.org</a>>
AuthorDate: Tue Dec 13 04:54:01 2016 +0100
<span style="display:block; white-space:pre;color:#404040;" class=""> phonon-backend-gstreamer(-qt5): update to 4.9.0 and introduce new subport
</span><span style="display:block; white-space:pre;color:#404040;" class="">
</span><span style="display:block; white-space:pre;color:#404040;" class=""> Squash commit:
</span><span style="display:block; white-space:pre;color:#404040;" class="">
</span><span style="display:block; white-space:pre;color:#404040;" class=""> commit 5084c0bb0f4edef8ad380910182fad25a5c203f8
</span><span style="display:block; white-space:pre;color:#404040;" class=""> Author: Marko Käning <<a href="mailto:mk@macports.org" class="">mk@macports.org</a>>
</span><span style="display:block; white-space:pre;color:#404040;" class=""> Date: Tue Dec 13 04:51:38 2016 +0100
</span><span style="display:block; white-space:pre;color:#404040;" class="">
</span><span style="display:block; white-space:pre;color:#404040;" class=""> phonon-backend-gstreamer-qt5: michaelld drops maintainership
</span><span style="display:block; white-space:pre;color:#404040;" class="">
</span><span style="display:block; white-space:pre;color:#404040;" class=""> commit 848cd25de1d3fa80eab96d6b5aa4d7deb9cb513f
</span><span style="display:block; white-space:pre;color:#404040;" class=""> Author: Marko Käning <<a href="mailto:mk@macports.org" class="">mk@macports.org</a>>
</span><span style="display:block; white-space:pre;color:#404040;" class=""> Date: Tue Dec 13 04:47:21 2016 +0100
</span><span style="display:block; white-space:pre;color:#404040;" class="">
</span><span style="display:block; white-space:pre;color:#404040;" class=""> phonon-backend-gstreamer(-qt5): master_sites's folder changed for 4.9.0
</span><span style="display:block; white-space:pre;color:#404040;" class="">
</span><span style="display:block; white-space:pre;color:#404040;" class=""> commit 909946083acb91e66b8d88a489773ba066e6954e
</span><span style="display:block; white-space:pre;color:#404040;" class=""> Author: Marko Käning <<a href="mailto:mk@macports.org" class="">mk@macports.org</a>>
</span><span style="display:block; white-space:pre;color:#404040;" class=""> Date: Tue Dec 13 04:31:20 2016 +0100
</span><span style="display:block; white-space:pre;color:#404040;" class="">
</span><span style="display:block; white-space:pre;color:#404040;" class=""> phonon-backend-gstreamer: update to 4.9.0
</span><span style="display:block; white-space:pre;color:#404040;" class="">
</span><span style="display:block; white-space:pre;color:#404040;" class=""> - avoiding building the X11 renderer has changed => new patch
</span><span style="display:block; white-space:pre;color:#404040;" class=""> - remove unused patches
</span><span style="display:block; white-space:pre;color:#404040;" class="">
</span><span style="display:block; white-space:pre;color:#404040;" class=""> commit ccaa0e34a4aa2fafc8276a6fb8d86fa8af7398a2
</span><span style="display:block; white-space:pre;color:#404040;" class=""> Author: Marko Käning <<a href="mailto:mk@macports.org" class="">mk@macports.org</a>>
</span><span style="display:block; white-space:pre;color:#404040;" class=""> Date: Tue Dec 13 03:09:55 2016 +0100
</span><span style="display:block; white-space:pre;color:#404040;" class="">
</span><span style="display:block; white-space:pre;color:#404040;" class=""> phonon-backend-gstreamer: introduce qt5 support
</span><span style="display:block; white-space:pre;color:#404040;" class="">
</span><span style="display:block; white-space:pre;color:#404040;" class=""> - add co-maintainership for RJVB
</span><span style="display:block; white-space:pre;color:#404040;" class="">
</span><span style="display:block; white-space:pre;color:#404040;" class=""> Closes: <a href="https://trac.macports.org/ticket/46558" class="">https://trac.macports.org/ticket/46558</a>
</span>---
audio/phonon-backend-gstreamer/Portfile | 77 +++++++++++++++-------
.../files/patch-cmake-FindGStreamer.cmake.diff | 43 ------------
.../files/patch-gstreamer_CMakeLists.txt.diff | 11 ++++
.../files/phononBGSTr-avoid-x11renderer.patch | 11 ----
4 files changed, 63 insertions(+), 79 deletions(-)
<span style="display:block; white-space:pre;color:#808080;" class="">diff --git a/audio/phonon-backend-gstreamer/Portfile b/audio/phonon-backend-gstreamer/Portfile
</span><span style="display:block; white-space:pre;color:#808080;" class="">index fd000d1..e1babc7 100644
</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/audio/phonon-backend-gstreamer/Portfile
</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ b/audio/phonon-backend-gstreamer/Portfile
</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -1,36 +1,63 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-PortGroup qt4 1.0
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-PortGroup cmake 1.0
</span>
name phonon-backend-gstreamer
<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-version 4.8.2
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-revision 2
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-categories audio kde kde4
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+version 4.9.0
</span> license {LGPL-2.1 LGPL-3}
<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-maintainers michaelld openmaintainer
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+maintainers <a href="http://gmail.com" class="">gmail.com</a>:rjvbertin mk openmaintainer
</span> description GStreamer backend for Phonon
<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-long_description A GStreamer backend for the Phonon multimedia library.
</span> platforms darwin
homepage <a href="http://phonon.kde.org" class="">http://phonon.kde.org</a>
<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-master_sites kde:stable/phonon/${name}/${version}/src
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+master_sites kde:stable/phonon/${name}/${version}
</span> use_xz yes
distname phonon-backend-gstreamer-${version}
<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-checksums rmd160 9c0ec7ef27e925c207e769edc225b1d7202c7e37 \
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- sha256 20e0f71f2beb4f859db8385079a13aef5473863ee6f27aad7b065aa7bfe931e0
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-depends_lib-append port:phonon port:gstreamer1-gst-plugins-base
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-depends_build-append port:automoc
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-patchfiles patch-cmake-FindGStreamer.cmake.diff \
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- phononBGSTr-avoid-x11renderer.patch
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-cmake.out_of_source yes
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-configure.args-append -DPhonon_DIR=${cmake_share_module_dir}/phonon
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-livecheck.type regex
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-livecheck.url <a href="http://www.gtlib.gatech.edu/pub/kde/stable/phonon/${name}/" class="">http://www.gtlib.gatech.edu/pub/kde/stable/phonon/${name}/</a>
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-livecheck.regex "\(\\d+(?:\\.\\d+)*)\/"
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+checksums rmd160 43095bdb9fe8729fd795910188c46cdcb0eae12f \
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ sha256 cec3e5ece1261d344b68363ef0606ebf49772628ba94bb55b0c0d18773b885f1
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+# ATTENTION: This renaming is suddenly needed, as the foldername skips "-backend" from version 4.8.2 to 4.9.0:
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+worksrcdir phonon-gstreamer-${version}
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+# NOTE: There is now a variable called BUILD_X11RENDERER, which seems to control the building of the X11 renderer.
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+# Weird, but this variable's default value in gstreamer's CMakeLists.txt is set to TRUE, although FALSE is needed!
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+patchfiles-append patch-gstreamer_CMakeLists.txt.diff
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+depends_lib-append port:gstreamer1-gst-plugins-good
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+subport qt5-${name} {
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ replaced_by ${name}-qt5
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ PortGroup obsolete 1.0
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+}
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+subport ${name}-qt5 {
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ PortGroup qt5 1.0
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ PortGroup cmake 1.0
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ categories audio kde kf5
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ long_description A GStreamer backend for the Phonon4Qt5 multimedia library.
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ depends_lib-append port:phonon-qt5
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ configure.args-append -DPHONON_BUILD_PHONON4QT5:BOOL=ON
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ post-destroot {
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ delete ${destroot}${prefix}/share/icons
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ }
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+}
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+if {${subport} ne "${name}-qt5"} {
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ PortGroup qt4 1.0
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ PortGroup cmake 1.0
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ categories audio kde kde4
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ long_description A GStreamer backend for the Phonon multimedia library.
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ depends_lib-append port:phonon port:automoc
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ configure.args-append -DPhonon_DIR=${qt_cmake_module_dir}/phonon
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ post-destroot {
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ if {[file exists ${qt_plugins_dir}] && ![file exists ${qt_plugins_dir}/phonon_backend]} {
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ xinstall -m 755 -d ${destroot}${qt_plugins_dir}
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ ln -s ${prefix}/lib/kde4/plugins/phonon_backend ${destroot}${qt_plugins_dir}
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ }
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ }
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+}
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+livecheck.type regex
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+livecheck.url <a href="http://www.gtlib.gatech.edu/pub/kde/stable/phonon/${name}/" class="">http://www.gtlib.gatech.edu/pub/kde/stable/phonon/${name}/</a>
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+livecheck.regex "\(\\d+(?:\\.\\d+)*)\/"
</span><span style="display:block; white-space:pre;color:#808080;" class="">diff --git a/audio/phonon-backend-gstreamer/files/patch-cmake-FindGStreamer.cmake.diff b/audio/phonon-backend-gstreamer/files/patch-cmake-FindGStreamer.cmake.diff
</span>deleted file mode 100644
<span style="display:block; white-space:pre;color:#808080;" class="">index 013b6d6..0000000
</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/audio/phonon-backend-gstreamer/files/patch-cmake-FindGStreamer.cmake.diff
</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ /dev/null
</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -1,43 +0,0 @@
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-<a href="https://git.reviewboard.kde.org/r/125690/" class="">https://git.reviewboard.kde.org/r/125690/</a>
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- cmake/FindGStreamer.cmake.orig
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ cmake/FindGStreamer.cmake
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- PATH_SUFFIXES gstreamer-1.0
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- )
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+IF (NOT GSTREAMER_INCLUDE_DIR)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+ MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+ENDIF (NOT GSTREAMER_INCLUDE_DIR)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+# Newer versions of GStreamer put gst-config.h under lib/gstreamer-1.0/include
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+ PATHS
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+ ${PKG_GSTREAMER_INCLUDE_DIRS}
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+ PATH_SUFFIXES gstreamer-1.0
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+ )
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+IF (NOT GSTREAMER_CONF_INCLUDE_DIR)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+ MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found")
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+ IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+ LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}")
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+ ENDIF()
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- PATHS
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- ${PKG_GSTREAMER_LIBRARY_DIRS}
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -51,11 +72,6 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES gstapp-1.0
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- ${PKG_GSTREAMER_LIBRARY_DIRS}
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- )
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--IF (GSTREAMER_INCLUDE_DIR)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--ELSE (GSTREAMER_INCLUDE_DIR)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-- MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--ENDIF (GSTREAMER_INCLUDE_DIR)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- IF (GSTREAMER_LIBRARIES)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- ELSE (GSTREAMER_LIBRARIES)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- MESSAGE(STATUS "GStreamer: WARNING: library not found")
</span><span style="display:block; white-space:pre;color:#808080;" class="">diff --git a/audio/phonon-backend-gstreamer/files/patch-gstreamer_CMakeLists.txt.diff b/audio/phonon-backend-gstreamer/files/patch-gstreamer_CMakeLists.txt.diff
</span>new file mode 100644
<span style="display:block; white-space:pre;color:#808080;" class="">index 0000000..85cd3c2
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--- /dev/null
</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ b/audio/phonon-backend-gstreamer/files/patch-gstreamer_CMakeLists.txt.diff
</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -0,0 +1,11 @@
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+--- gstreamer/CMakeLists.txt.orig 2016-04-18 06:25:19.000000000 +0200
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">++++ gstreamer/CMakeLists.txt 2016-12-13 04:16:16.000000000 +0100
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+@@ -88,7 +88,7 @@
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ list(APPEND phonon_gstreamer_SRCS glrenderer.cpp)
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ endif ()
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+-set(BUILD_X11RENDERER TRUE)
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">++set(BUILD_X11RENDERER FALSE)
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ if (PHONON_BUILD_PHONON4QT5)
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ if (Qt5X11Extras_FOUND)
</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+ set(BUILD_X11RENDERER TRUE)
</span><span style="display:block; white-space:pre;color:#808080;" class="">diff --git a/audio/phonon-backend-gstreamer/files/phononBGSTr-avoid-x11renderer.patch b/audio/phonon-backend-gstreamer/files/phononBGSTr-avoid-x11renderer.patch
</span>deleted file mode 100644
<span style="display:block; white-space:pre;color:#808080;" class="">index c542fa2..0000000
</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/audio/phonon-backend-gstreamer/files/phononBGSTr-avoid-x11renderer.patch
</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ /dev/null
</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -1,11 +0,0 @@
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- gstreamer/devicemanager.cpp.orig
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ gstreamer/devicemanager.cpp
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -355,7 +355,7 @@ AbstractRenderer *DeviceManager::createVideoRenderer(VideoWidget *parent)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- if (m_videoSinkWidget == "software") {
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- return new WidgetRenderer(parent);
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- }
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--#ifndef Q_WS_QWS
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#if !defined(Q_WS_QWS) && !defined(Q_OS_MAC)
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- else if (m_videoSinkWidget == "xwindow") {
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- return new X11Renderer(parent);
</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- } else {
</span></pre><pre style="margin:0" class="">
</pre>
</div></blockquote></div><br class=""></body></html>