diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-01-02 13:27:13 +0100 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2016-01-03 01:10:55 +1100 |
| commit | c0117cca4f8ce8a994dba6771aa37737e25dfb00 (patch) | |
| tree | 0155a6ceae9bcd23f5018b9cc8520f4cfc21c661 /media-libs | |
| parent | kde-apps/kdenlive: Fix src_prepare with USE=!handbook, bug 570538 (diff) | |
| download | gentoo-c0117cca4f8ce8a994dba6771aa37737e25dfb00.tar.gz gentoo-c0117cca4f8ce8a994dba6771aa37737e25dfb00.tar.bz2 gentoo-c0117cca4f8ce8a994dba6771aa37737e25dfb00.zip | |
media-libs/mlt: Fix configure with USE=qt4, bug 570576
Package-Manager: portage-2.2.24
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/mlt/mlt-0.9.8-r2.ebuild (renamed from media-libs/mlt/mlt-0.9.8-r1.ebuild) | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/media-libs/mlt/mlt-0.9.8-r1.ebuild b/media-libs/mlt/mlt-0.9.8-r2.ebuild index 71759e9cf006..248d021544e7 100644 --- a/media-libs/mlt/mlt-0.9.8-r1.ebuild +++ b/media-libs/mlt/mlt-0.9.8-r2.ebuild @@ -135,12 +135,15 @@ src_configure() { # kde means kde4 at this point if use qt5 ; then - myconf+=" --enable-qt $(use_with opengl) + myconf+=" --enable-qt --qt-includedir=$(pkg-config Qt5Core --variable=includedir) --qt-libdir=$(pkg-config Qt5Core --variable=libdir)" elif use qt4 ; then - myconf+=" --enable-qt $(use_with opengl) $(use_with kde) - --qt-includedir=$(pkg-config QtCore --variable=includedir) + # pkg-config QtCore does not give us qt4 parent include dir + local qtinclude=$(pkg-config QtCore --variable=includedir) + [[ ${qtinclude} == *QtCore ]] && qtinclude=$(dirname ${qtinclude}) + myconf+=" --enable-qt $(use_with kde) + --qt-includedir=${qtinclude} --qt-libdir=$(pkg-config QtCore --variable=libdir)" else myconf+=" --disable-qt" @@ -167,7 +170,13 @@ src_configure() { [ -z "${swig_lang}" ] && swig_lang="none" econf ${myconf} --swig-languages="${swig_lang}" + sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die + if use qt5 || use qt4 ; then + if ! use opengl ; then + sed -i -e "/^USE_QT_OPENGL/ s/^/#/" "${S}/src/modules/qt/config.mak" || die + fi + fi } src_install() { |