diff -ruN phonon-backend-gstreamer-4.6.3-orig/cmake/FindPhonon.cmake phonon-backend-gstreamer-4.6.3/cmake/FindPhonon.cmake --- phonon-backend-gstreamer-4.6.3-orig/cmake/FindPhonon.cmake 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/cmake/FindPhonon.cmake 2021-10-08 16:27:01.000000000 -0500 @@ -6,7 +6,14 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -find_package(Phonon NO_MODULE) +set(PKG UndefinedPhononPackage) +if(PHONON_BUILD_PHONON4QT5) + set(PKG Phonon4Qt5) +else() + set(PKG Phonon) +endif() + +find_package(${PKG} NO_MODULE) if(PHONON_BUILDSYSTEM_DIR) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PHONON_BUILDSYSTEM_DIR}) @@ -19,4 +26,4 @@ include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Phonon DEFAULT_MSG Phonon_DIR ) +find_package_handle_standard_args(${PKG} DEFAULT_MSG ${PKG}_DIR ) diff -ruN phonon-backend-gstreamer-4.6.3-orig/gstreamer/CMakeLists.txt phonon-backend-gstreamer-4.6.3/gstreamer/CMakeLists.txt --- phonon-backend-gstreamer-4.6.3-orig/gstreamer/CMakeLists.txt 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/gstreamer/CMakeLists.txt 2021-10-08 16:50:40.000000000 -0500 @@ -67,11 +67,11 @@ list(APPEND phonon_gstreamer_SRCS glrenderer.cpp) endif(OPENGL_FOUND) - if(NOT WIN32) + if(NOT APPLE) set(phonon_gstreamer_SRCS ${phonon_gstreamer_SRCS} x11renderer.cpp) - endif(NOT WIN32) + endif(NOT APPLE) automoc4_add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS}) set_target_properties(phonon_gstreamer PROPERTIES PREFIX "") diff -ruN phonon-backend-gstreamer-4.6.3-orig/gstreamer/backend.cpp phonon-backend-gstreamer-4.6.3/gstreamer/backend.cpp --- phonon-backend-gstreamer-4.6.3-orig/gstreamer/backend.cpp 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/gstreamer/backend.cpp 2021-10-08 16:30:14.000000000 -0500 @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -Q_EXPORT_PLUGIN2(phonon_gstreamer, Phonon::Gstreamer::Backend) +//Q_EXPORT_PLUGIN2(phonon_gstreamer, Phonon::Gstreamer::Backend); namespace Phonon { diff -ruN phonon-backend-gstreamer-4.6.3-orig/gstreamer/debug.cpp phonon-backend-gstreamer-4.6.3/gstreamer/debug.cpp --- phonon-backend-gstreamer-4.6.3-orig/gstreamer/debug.cpp 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/gstreamer/debug.cpp 2021-10-08 16:36:47.000000000 -0500 @@ -23,7 +23,7 @@ #include #include -#include +#include #ifdef Q_OS_UNIX # include diff -ruN phonon-backend-gstreamer-4.6.3-orig/gstreamer/devicemanager.cpp phonon-backend-gstreamer-4.6.3/gstreamer/devicemanager.cpp --- phonon-backend-gstreamer-4.6.3-orig/gstreamer/devicemanager.cpp 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/gstreamer/devicemanager.cpp 2021-10-08 16:49:06.000000000 -0500 @@ -292,7 +292,7 @@ if (m_videoSinkWidget == "software") { return new WidgetRenderer(parent); } -#ifndef Q_WS_QWS +#if !defined(Q_WS_QWS) && !defined(Q_OS_MAC) else if (m_videoSinkWidget == "xwindow") { return new X11Renderer(parent); } else { diff -ruN phonon-backend-gstreamer-4.6.3-orig/gstreamer/mediaobject.cpp phonon-backend-gstreamer-4.6.3/gstreamer/mediaobject.cpp --- phonon-backend-gstreamer-4.6.3-orig/gstreamer/mediaobject.cpp 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/gstreamer/mediaobject.cpp 2021-10-08 16:37:13.000000000 -0500 @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff -ruN phonon-backend-gstreamer-4.6.3-orig/gstreamer/mediaobject.h phonon-backend-gstreamer-4.6.3/gstreamer/mediaobject.h --- phonon-backend-gstreamer-4.6.3-orig/gstreamer/mediaobject.h 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/gstreamer/mediaobject.h 2021-10-08 16:28:08.000000000 -0500 @@ -21,10 +21,10 @@ #include "medianode.h" #include "pipeline.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff -ruN phonon-backend-gstreamer-4.6.3-orig/gstreamer/pipeline.h phonon-backend-gstreamer-4.6.3/gstreamer/pipeline.h --- phonon-backend-gstreamer-4.6.3-orig/gstreamer/pipeline.h 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/gstreamer/pipeline.h 2021-10-08 16:28:14.000000000 -0500 @@ -20,8 +20,8 @@ #include "plugininstaller.h" #include -#include -#include +#include +#include #include QT_BEGIN_NAMESPACE diff -ruN phonon-backend-gstreamer-4.6.3-orig/gstreamer/plugininstaller.cpp phonon-backend-gstreamer-4.6.3/gstreamer/plugininstaller.cpp --- phonon-backend-gstreamer-4.6.3-orig/gstreamer/plugininstaller.cpp 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/gstreamer/plugininstaller.cpp 2021-10-08 16:38:12.000000000 -0500 @@ -18,8 +18,8 @@ #include "plugininstaller.h" #include #include -#include -#include +#include +#include #include #include #include diff -ruN phonon-backend-gstreamer-4.6.3-orig/gstreamer/qwidgetvideosink.cpp phonon-backend-gstreamer-4.6.3/gstreamer/qwidgetvideosink.cpp --- phonon-backend-gstreamer-4.6.3-orig/gstreamer/qwidgetvideosink.cpp 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/gstreamer/qwidgetvideosink.cpp 2021-10-08 16:38:31.000000000 -0500 @@ -15,7 +15,7 @@ along with this library. If not, see . */ -#include +#include #include diff -ruN phonon-backend-gstreamer-4.6.3-orig/gstreamer/streamreader.cpp phonon-backend-gstreamer-4.6.3/gstreamer/streamreader.cpp --- phonon-backend-gstreamer-4.6.3-orig/gstreamer/streamreader.cpp 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/gstreamer/streamreader.cpp 2021-10-08 16:43:10.000000000 -0500 @@ -16,6 +16,9 @@ along with this library. If not, see . */ +#include +void *qMemCopy(void *dest, const void *src, size_t n); + #include "streamreader.h" #include "debug.h" diff -ruN phonon-backend-gstreamer-4.6.3-orig/gstreamer/videowidget.cpp phonon-backend-gstreamer-4.6.3/gstreamer/videowidget.cpp --- phonon-backend-gstreamer-4.6.3-orig/gstreamer/videowidget.cpp 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/gstreamer/videowidget.cpp 2021-10-08 16:46:05.000000000 -0500 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -429,7 +429,7 @@ if (navigation) { // TODO key code via xlib? gst_navigation_send_key_event(navigation, "key-pressed", - event->text().toAscii()); + event->text().toLatin1()); } } QWidget::keyPressEvent(event); @@ -443,7 +443,7 @@ if (navigation) { // TODO key code via xlib? gst_navigation_send_key_event(navigation, "key-released", - event->text().toAscii()); + event->text().toLatin1()); } } QWidget::keyReleaseEvent(event); diff -ruN phonon-backend-gstreamer-4.6.3-orig/gstreamer/x11renderer.cpp phonon-backend-gstreamer-4.6.3/gstreamer/x11renderer.cpp --- phonon-backend-gstreamer-4.6.3-orig/gstreamer/x11renderer.cpp 2013-01-31 17:42:39.000000000 -0600 +++ phonon-backend-gstreamer-4.6.3/gstreamer/x11renderer.cpp 2021-10-08 16:46:28.000000000 -0500 @@ -23,7 +23,7 @@ #include "backend.h" #include "mediaobject.h" #include -#include +#include #include #include #include