diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-20 11:17:21 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-20 11:17:21 +0000 |
| commit | 48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 (patch) | |
| tree | f88035a58c20099cf45a576fb53b0330a4754f14 /media-libs/phonon | |
| parent | 0fb71e0215ed52863e462cccef73c01aff44d43d (diff) | |
gentoo resync : 20.12.2017
Diffstat (limited to 'media-libs/phonon')
| -rw-r--r-- | media-libs/phonon/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/phonon/phonon-4.9.1-r1.ebuild | 15 | ||||
| -rw-r--r-- | media-libs/phonon/phonon-9999.ebuild | 15 |
3 files changed, 18 insertions, 16 deletions
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest index 188edb5ce4b2..75904e64086d 100644 --- a/media-libs/phonon/Manifest +++ b/media-libs/phonon/Manifest @@ -1,5 +1,5 @@ AUX phonon-4.7.0-plugin-install.patch 1252 BLAKE2B b9c0022007babf5f56d7f651e18bce5ef3c7b36a5bb6d2d042fd14639433faadd6a99f0f276751fc4849ab2845f265481d4c307a1d16af029f3c11c6b6104f7b SHA512 62b6cffa985057722c5d2dbe07bd1124f9fcb6e1b861fe76fafd46ec980702655d55b37a29006e79c8e28e5a4df82dafa1a308dca8a6abd3402889777a93d8f2 DIST phonon-4.9.1.tar.xz 321872 BLAKE2B a315189f578ad71e241ebfbea1bc6c81f06cf041b2eb2914d66f82f35c69c3811d16dbf4303551aafdd1a63d6ff6da619b06a6f03274a9867393f6d032348673 SHA512 a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728 -EBUILD phonon-4.9.1-r1.ebuild 3188 BLAKE2B d19620a542d387c126ca62c6a82b5cbe40b040d804891281d43ef5f1d6c28ce968859cd3ecbcb6661d80abe700432d60b11f1497f2c5f9a84dbe135722ff61bc SHA512 aa974ba795bac1499e36551ac732346015fd8fee9ca2ec6526e6e2ca3054b268f1fe652050785f9eb1aabc6a87515220a2677e3e73da5a5d2ba17b1671289329 -EBUILD phonon-9999.ebuild 3129 BLAKE2B dc3eb725a2f42ab2b012b080eaed52a6ec97fcad40939f2dd30a89a5ceb9aa97fb34d8da85c72c4e68c5db7dec1403ad92ccdedbeb6905303006637f72854d2d SHA512 82ad80a3a9ed8a543e60cd20d863621f07c089139bf128978f2687fa7e957298c6daf6f5ca2554802dd0a2bb2ac31bdfa9b0e28679baa9b18aa60a9f07531a9d +EBUILD phonon-4.9.1-r1.ebuild 3088 BLAKE2B 0d162cfad037d952af2b935999fb0634073103e727a7426101cb2cffb03b8bed18461687ec767e81a6a1d9728ff6cbd02793e8d60940b0ea56b2b7deca17118b SHA512 22ab58d17069ebbe15f0f7bce13026c4fd0accd32db2fdd6d158da489ac0399407c840b01195b22b2e5fa454443b9f71ff94f4cc24f31f0ef55eb87563c1d7ec +EBUILD phonon-9999.ebuild 3029 BLAKE2B 48448ed0f51ec28d817a080226e4ac606742228741dfa262044ad3141683a3ed26476eaea81cab3acfcc5ddc551411c2b65e241b9e536ef41ea3aa36f972938e SHA512 eac3b28188b2be8c8f2ed0b0bc01684bd40e729eaf0e05a1b840c3bd489a0ef479c95c14e8529be9bc5e9d7c2b7bf40ea7a221df4348c39591ab423906b3493d MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6 diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild index 2474f3bab8db..7f91cb3281fe 100644 --- a/media-libs/phonon/phonon-4.9.1-r1.ebuild +++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild @@ -54,10 +54,6 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" ) pkg_setup() { - if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then - ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618" - fi - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) } @@ -67,15 +63,20 @@ multilib_src_configure() { -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE -DWITH_GLIB2=$(usex pulseaudio) -DWITH_PulseAudio=$(usex pulseaudio) - -DWITH_QZeitgeist=OFF -DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake ) if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF ) + mycmakeargs+=( + -DPHONON_BUILD_PHONON4QT5=OFF + -DWITH_QZeitgeist=OFF + ) fi if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON ) + mycmakeargs+=( + -DPHONON_BUILD_PHONON4QT5=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON + ) fi cmake-utils_src_configure diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild index e39cec4c2f67..b16a70f4b3c9 100644 --- a/media-libs/phonon/phonon-9999.ebuild +++ b/media-libs/phonon/phonon-9999.ebuild @@ -50,10 +50,6 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" ) pkg_setup() { - if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then - ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618" - fi - MULTIBUILD_VARIANTS=( $(usev qt4) qt5 ) } @@ -63,15 +59,20 @@ multilib_src_configure() { -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE -DWITH_GLIB2=$(usex pulseaudio) -DWITH_PulseAudio=$(usex pulseaudio) - -DWITH_QZeitgeist=OFF -DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake ) if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF ) + mycmakeargs+=( + -DPHONON_BUILD_PHONON4QT5=OFF + -DWITH_QZeitgeist=OFF + ) fi if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON ) + mycmakeargs+=( + -DPHONON_BUILD_PHONON4QT5=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON + ) fi cmake-utils_src_configure |