diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-14 01:05:40 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-14 01:05:40 +0100 |
| commit | 76cba73c47c8694e74377004634daca18f2d9c08 (patch) | |
| tree | 468603ebdc189bcfae77696162761b3be936baea /media-libs/phonon-gstreamer | |
| parent | 6957f5c65b02bba533954eabc0b62f5de36be206 (diff) | |
gentoo resync : 14.04.2018
Diffstat (limited to 'media-libs/phonon-gstreamer')
3 files changed, 66 insertions, 1 deletions
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest index 35138781eda7..7d58627923fb 100644 --- a/media-libs/phonon-gstreamer/Manifest +++ b/media-libs/phonon-gstreamer/Manifest @@ -1,5 +1,6 @@ +AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe EBUILD phonon-gstreamer-4.9.0-r1.ebuild 1978 BLAKE2B ab48d3cd7486242e6eaedf43434f32d6f857a5ac3f6bf80b63bb41f28acf6b9dc52d900a0e6de6667f88dffd2aa174c59586f4d5837358b42c71267c8e88315d SHA512 062854f40de54080251b0490a359b9579941b8f3fd6300ecb505c500e1f373d8ec818fa477d18306463144211e5e1c80b49c896713b50fab201ace9f53aadf30 -EBUILD phonon-gstreamer-4.9.0-r2.ebuild 1068 BLAKE2B 4020f4e10084180097d3331ee92a3e96e4f04c0219f20c9f2f18df6f7b932f7e6130e3e2fb0e43813dd48d2489095b3ebaea026093155d7cdc620c99d307e21e SHA512 7e38546e97e9dd2256891de73033357f26980423f61ee561842002f9f9358a764909f172e06b0232ddda94d5a8d6014ebe9df668d3b23ee847d9a49f389ba866 +EBUILD phonon-gstreamer-4.9.0-r2.ebuild 1114 BLAKE2B 614c5ee2f4714ae5b26a5e54aa68460b19773208bb79d300db433d71e390d1742af9db72f681cec28775abb6c3971c37c52981fa55e4ec2504d3a61b57c8456e SHA512 f41fee2b740703e9f17a4a622cfcf60838c699d44fc849328106905a3fee992ccd44bd2d339e802a78eadd42de3f7655e9ed960efed9d470d9cce82538a1784a EBUILD phonon-gstreamer-9999.ebuild 1056 BLAKE2B aa1afd5ade889a59c5ec4218fe9cba15f50d863483e5b379077c5a832e35a9c57eecf9eddb307e04ccc5bf6882ef72f845749b54407fa57cdfb79bb230882e71 SHA512 17a27ab64a08f7be157a59106e3f8871b631533164d517130c37448fa6d2d26eb2ceb2056cd31c35cc4af15bbe821d0c2792e89ffe86a3d832aa4b10862d9efc MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a 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 |