diff options
| -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 |