diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-18 23:21:05 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-19 01:18:56 +0100 |
| commit | af05b8611cff01d8b8d96647fc01b4cfb75945d8 (patch) | |
| tree | f3888df8d871d78733be2875b84145899e685610 /media-libs/phonon | |
| parent | media-video/libav: Add a libav-13 snapshot (diff) | |
| download | gentoo-af05b8611cff01d8b8d96647fc01b4cfb75945d8.tar.gz gentoo-af05b8611cff01d8b8d96647fc01b4cfb75945d8.tar.bz2 gentoo-af05b8611cff01d8b8d96647fc01b4cfb75945d8.zip | |
media-libs/phonon: Fix some cmake warnings
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'media-libs/phonon')
| -rw-r--r-- | media-libs/phonon/phonon-4.9.1-r1.ebuild | 11 | ||||
| -rw-r--r-- | media-libs/phonon/phonon-9999.ebuild | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild index 2474f3bab8db..c7057d376919 100644 --- a/media-libs/phonon/phonon-4.9.1-r1.ebuild +++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild @@ -67,15 +67,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..838ebcade94a 100644 --- a/media-libs/phonon/phonon-9999.ebuild +++ b/media-libs/phonon/phonon-9999.ebuild @@ -63,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 |