| 1 |
commit: c0117cca4f8ce8a994dba6771aa37737e25dfb00 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jan 2 12:27:13 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 2 14:10:55 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0117cca |
| 7 |
|
| 8 |
media-libs/mlt: Fix configure with USE=qt4, bug 570576 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.24 |
| 11 |
|
| 12 |
.../mlt/{mlt-0.9.8-r1.ebuild => mlt-0.9.8-r2.ebuild} | 15 ++++++++++++--- |
| 13 |
1 file changed, 12 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-libs/mlt/mlt-0.9.8-r1.ebuild b/media-libs/mlt/mlt-0.9.8-r2.ebuild |
| 16 |
similarity index 92% |
| 17 |
rename from media-libs/mlt/mlt-0.9.8-r1.ebuild |
| 18 |
rename to media-libs/mlt/mlt-0.9.8-r2.ebuild |
| 19 |
index 71759e9..248d021 100644 |
| 20 |
--- a/media-libs/mlt/mlt-0.9.8-r1.ebuild |
| 21 |
+++ b/media-libs/mlt/mlt-0.9.8-r2.ebuild |
| 22 |
@@ -135,12 +135,15 @@ src_configure() { |
| 23 |
|
| 24 |
# kde means kde4 at this point |
| 25 |
if use qt5 ; then |
| 26 |
- myconf+=" --enable-qt $(use_with opengl) |
| 27 |
+ myconf+=" --enable-qt |
| 28 |
--qt-includedir=$(pkg-config Qt5Core --variable=includedir) |
| 29 |
--qt-libdir=$(pkg-config Qt5Core --variable=libdir)" |
| 30 |
elif use qt4 ; then |
| 31 |
- myconf+=" --enable-qt $(use_with opengl) $(use_with kde) |
| 32 |
- --qt-includedir=$(pkg-config QtCore --variable=includedir) |
| 33 |
+ # pkg-config QtCore does not give us qt4 parent include dir |
| 34 |
+ local qtinclude=$(pkg-config QtCore --variable=includedir) |
| 35 |
+ [[ ${qtinclude} == *QtCore ]] && qtinclude=$(dirname ${qtinclude}) |
| 36 |
+ myconf+=" --enable-qt $(use_with kde) |
| 37 |
+ --qt-includedir=${qtinclude} |
| 38 |
--qt-libdir=$(pkg-config QtCore --variable=libdir)" |
| 39 |
else |
| 40 |
myconf+=" --disable-qt" |
| 41 |
@@ -167,7 +170,13 @@ src_configure() { |
| 42 |
[ -z "${swig_lang}" ] && swig_lang="none" |
| 43 |
|
| 44 |
econf ${myconf} --swig-languages="${swig_lang}" |
| 45 |
+ |
| 46 |
sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die |
| 47 |
+ if use qt5 || use qt4 ; then |
| 48 |
+ if ! use opengl ; then |
| 49 |
+ sed -i -e "/^USE_QT_OPENGL/ s/^/#/" "${S}/src/modules/qt/config.mak" || die |
| 50 |
+ fi |
| 51 |
+ fi |
| 52 |
} |
| 53 |
|
| 54 |
src_install() { |
Archives