Skip to content

Commit

Permalink
port:phonon-backend-gstreamer : fix patch
Browse files Browse the repository at this point in the history
Committed from host : Bola
  • Loading branch information
RJVB committed Jul 20, 2024
1 parent 4036617 commit 2245acd
Showing 1 changed file with 10 additions and 27 deletions.
Original file line number Diff line number Diff line change
@@ -1,27 +1,8 @@
--- orig.CMakeLists.txt 2016-04-18 06:25:19.000000000 +0200
+++ CMakeLists.txt 2016-09-18 15:34:04.000000000 +0200
@@ -53,11 +53,13 @@
set(QT_QTOPENGL_FOUND Qt5OpenGL_FOUND)

set(REQUIRED_QT_VERSION 5.2.0)
-find_package(Qt5X11Extras ${REQUIRED_QT_VERSION})
-set_package_properties(Qt5OpenGL PROPERTIES
- TYPE OPTIONAL
- PURPOSE "Qt5X11Extras is needed for the x11renderer"
- URL "http://doc.qt.io/qt-5/qtx11extras-index.html")
+if(NOT APPLE)
+ find_package(Qt5X11Extras ${REQUIRED_QT_VERSION})
+ set_package_properties(Qt5OpenGL PROPERTIES
+ TYPE OPTIONAL
+ PURPOSE "Qt5X11Extras is needed for the x11renderer"
+ URL "http://doc.qt.io/qt-5/qtx11extras-index.html")
+endif()

include(ECMPoQmTools)

--- gstreamer/orig.CMakeLists.txt 2016-04-18 06:25:19.000000000 +0200
+++ gstreamer/CMakeLists.txt 2016-09-18 15:34:04.000000000 +0200
@@ -88,12 +88,12 @@
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 ()

Expand All @@ -36,9 +17,11 @@
set(BUILD_X11RENDERER TRUE)
endif()

--- gstreamer/orig.videowidget.cpp 2019-08-27 15:27:22.000000000 +0200
+++ gstreamer/videowidget.cpp 2019-12-23 22:52:47.000000000 +0100
@@ -80,10 +80,12 @@
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()
{
Expand Down

0 comments on commit 2245acd

Please sign in to comment.