diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-13 23:53:17 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-14 01:01:38 +0200 |
| commit | 55e92020241c75ab99daf2662062cc14709ddb36 (patch) | |
| tree | 98d39e8da9f1520cf57e7db99d927f962ab8e22d | |
| parent | media-libs/phonon-vlc: Fix build with Qt 5.11_beta3 (diff) | |
| download | gentoo-55e92020241c75ab99daf2662062cc14709ddb36.tar.gz gentoo-55e92020241c75ab99daf2662062cc14709ddb36.tar.bz2 gentoo-55e92020241c75ab99daf2662062cc14709ddb36.zip | |
media-libs/phonon-gstreamer: Fix build with Qt 5.11_beta3
Package-Manager: Portage-2.3.28, Repoman-2.3.9
| -rw-r--r-- | media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-qt-5.11.patch | 62 | ||||
| -rw-r--r-- | media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild | 2 |
2 files changed, 64 insertions, 0 deletions
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 new file mode 100644 index 000000000000..1e500058cf38 --- /dev/null +++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-qt-5.11.patch @@ -0,0 +1,62 @@ +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 + diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild index cf14d133e9df..67c68221168a 100644 --- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild +++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild @@ -42,6 +42,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) + src_configure() { local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON ) cmake-utils_src_configure |