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-vlc | |
| parent | 6957f5c65b02bba533954eabc0b62f5de36be206 (diff) | |
gentoo resync : 14.04.2018
Diffstat (limited to 'media-libs/phonon-vlc')
| -rw-r--r-- | media-libs/phonon-vlc/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch | 32 | ||||
| -rw-r--r-- | media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild | 2 |
3 files changed, 36 insertions, 1 deletions
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest index c04076488d59..cff8a88e261d 100644 --- a/media-libs/phonon-vlc/Manifest +++ b/media-libs/phonon-vlc/Manifest @@ -1,6 +1,7 @@ +AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c DIST phonon-backend-vlc-0.10.1.tar.xz 61096 BLAKE2B 5124d43a68af5a1ecac46c591e8b727868096e07156e6bc277c94199b6138433c826febf46cf5ffc7776c936fa6373d5ac2114c7a730a6b89380014c44e581fe SHA512 fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df DIST phonon-backend-vlc-0.9.1.tar.xz 59972 BLAKE2B 79c3b0d2cb21a04446cfe0a5b4bfed20f4c63cf6eb00037b0f0d8a67ff74fc9eab484d9a108a8d6694bb1ed97ac5618ad1813f7bbcd981bca9678b862bdc9eeb SHA512 104a29159541002d4064486b54d02183c32cf87931c205badf44333d9481b0c0e70e6eae7f9d3c558bef977de37f76cc203dc5c15120f4146d64d451992947aa -EBUILD phonon-vlc-0.10.1.ebuild 797 BLAKE2B 5dc25a00e545c408243ca77aacce55644aa42588fecc0000695a871311c102703294d98398c4c9eef4a7c0c0a13103961e945eaae9516956c6145615e7ebca3a SHA512 cfd63cb76e8dcb28646e25dc87ce814f1b2864bdf075e72478ef9729b9d20581dd79568b27eb73193c6b97e3b6c4c40e86bfbf2f75b330bb2291f6f19efcbd4e +EBUILD phonon-vlc-0.10.1.ebuild 843 BLAKE2B 2947e43fd6c016fd6d045b19e3ef2f89101bb633b5a6a11d8a57698f2ea8de67175d2922ea89c1ea71a524193016007101dcbb45a2543610767e1f424a27880a SHA512 8e23c6e1bae32abb1268905a5f77ba6a19c15b653dfd4e6b766ac4e36de1ef3da7b1acc75350295893f73272aeae8bad11e6d484dbbd455f0f1e3acfb23aa8f2 EBUILD phonon-vlc-0.9.1-r1.ebuild 1664 BLAKE2B 59522c485d8aaf0d37fb0e6a69605fbfa889d101e6975c11a97d1f93b459b1ed0d4bb32e6048189b6f2a431d5105ea33b474eb373ca74af44326e91861b3f8df SHA512 653af9c113b9de6c41cbd070a1f044c621f6505c5502c9e830e2a314850022834407c9720eae4da86e5b6b1886d7c922ffc6a44bf50e64ee3054a0293b85105a EBUILD phonon-vlc-9999.ebuild 797 BLAKE2B 5dc25a00e545c408243ca77aacce55644aa42588fecc0000695a871311c102703294d98398c4c9eef4a7c0c0a13103961e945eaae9516956c6145615e7ebca3a SHA512 cfd63cb76e8dcb28646e25dc87ce814f1b2864bdf075e72478ef9729b9d20581dd79568b27eb73193c6b97e3b6c4c40e86bfbf2f75b330bb2291f6f19efcbd4e MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch new file mode 100644 index 000000000000..b87a1e175777 --- /dev/null +++ b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch @@ -0,0 +1,32 @@ +From d053719a405ceaea58bffc2f08580875322e4158 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 13 Apr 2018 23:16:52 +0200 +Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) + +Also replace automoc4_add_library with add_library. +--- + src/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 47427b2..f91975e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -80,8 +80,12 @@ if(APPLE) + video/mac/vlcmacwidget.mm) + endif(APPLE) + +-automoc4_add_library(phonon_vlc MODULE ${phonon_vlc_SRCS}) +-qt5_use_modules(phonon_vlc Core Widgets) ++add_library(phonon_vlc MODULE ${phonon_vlc_SRCS}) ++if(PHONON_BUILD_PHONON4QT5) ++ target_link_libraries(phonon_vlc Qt5::Core Qt5::Widgets) ++else() ++ target_link_libraries(phonon_vlc ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) ++endif() + + set_target_properties(phonon_vlc PROPERTIES + PREFIX "" +-- +2.17.0 + diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild index 18a2f10173c6..9506df8aba4d 100644 --- a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild +++ b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild @@ -33,6 +33,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) + src_configure() { local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON ) cmake-utils_src_configure |