Ticket #45321: PBGS-repatch.diff

audio/phonon-backend-gstreamer/Portfile

@@ -18 +18 @@
 # ATTENTION: This renaming is suddenly needed, as the foldername skips "-backend" from version 4.8.2 to 4.9.0:
 worksrcdir          phonon-gstreamer-${version}
 
-# NOTE: There is now a variable called BUILD_X11RENDERER, which seems to control the building of the X11 renderer.
-#       Weird, but this variable's default value in gstreamer's CMakeLists.txt is set to TRUE, although FALSE is needed!
-patchfiles-append   patch-gstreamer_CMakeLists.txt.diff
+patchfiles-append   patch-phononBGSTr-avoid-x11renderer.diff
 
 depends_lib-append  port:gstreamer1-gst-plugins-good
 

deleted file udio/phonon-backend-gstreamer/files/patch-gstreamer_CMakeLists.txt.diff

@@ -1 @@
---- gstreamer/CMakeLists.txt.orig       2016-04-18 06:25:19.000000000 +0200
-+++ gstreamer/CMakeLists.txt    2016-12-13 04:16:16.000000000 +0100
-@@ -88,7 +88,7 @@
-     list(APPEND phonon_gstreamer_SRCS glrenderer.cpp)
- endif ()
- 
--set(BUILD_X11RENDERER TRUE)
-+set(BUILD_X11RENDERER FALSE)
- if (PHONON_BUILD_PHONON4QT5)
-     if (Qt5X11Extras_FOUND)
-         set(BUILD_X11RENDERER TRUE)

new file audio/phonon-backend-gstreamer/files/patch-phononBGSTr-avoid-x11renderer.diff

@@ +1 @@
+diff --git gstreamer/CMakeLists.txt gstreamer/CMakeLists.txt
+index cb01285..b7f542f 100644
+--- gstreamer/CMakeLists.txt
++++ gstreamer/CMakeLists.txt
+@@ -88,12 +88,12 @@ if (OPENGL_FOUND)
+     list(APPEND phonon_gstreamer_SRCS glrenderer.cpp)
+ endif ()
+ 
+-set(BUILD_X11RENDERER TRUE)
++set(BUILD_X11RENDERER FALSE)
+ if (PHONON_BUILD_PHONON4QT5)
+     if (Qt5X11Extras_FOUND)
+         set(BUILD_X11RENDERER TRUE)
+     endif()
+-elseif (NOT WIN32)
++elseif (NOT WIN32 AND NOT APPLE)
+     set(BUILD_X11RENDERER TRUE)
+ endif()
+ 
+diff --git gstreamer/videowidget.cpp gstreamer/videowidget.cpp
+index bd27b21..06e25a1 100644
+--- gstreamer/videowidget.cpp
++++ gstreamer/videowidget.cpp
+@@ -80,10 +80,12 @@ VideoWidget::~VideoWidget()
+ 
+ void VideoWidget::updateWindowID()
+ {
++#ifdef BUILD_X11RENDERER
+     X11Renderer *render = dynamic_cast<X11Renderer*>(m_renderer);
+     if (render) {
+         render->setOverlay();
+     }
++#endif
+ }
+ 
+ void Gstreamer::VideoWidget::syncX()