From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A3A2A1384B4 for ; Sat, 2 Jan 2016 14:11:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E546D21C020; Sat, 2 Jan 2016 14:11:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 53ED921C01D for ; Sat, 2 Jan 2016 14:11:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F7883405CF for ; Sat, 2 Jan 2016 14:11:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F1F3CF7 for ; Sat, 2 Jan 2016 14:11:06 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1451743855.c0117cca4f8ce8a994dba6771aa37737e25dfb00.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mlt/mlt-0.9.8-r1.ebuild media-libs/mlt/mlt-0.9.8-r2.ebuild X-VCS-Directories: media-libs/mlt/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: c0117cca4f8ce8a994dba6771aa37737e25dfb00 X-VCS-Branch: master Date: Sat, 2 Jan 2016 14:11:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: db2e48bf-34b0-4583-9f1d-ac4e13432b79 X-Archives-Hash: e47a97c6b583b1a25e5b6c4b4ae00de2 commit: c0117cca4f8ce8a994dba6771aa37737e25dfb00 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Jan 2 12:27:13 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Jan 2 14:10:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0117cca media-libs/mlt: Fix configure with USE=qt4, bug 570576 Package-Manager: portage-2.2.24 .../mlt/{mlt-0.9.8-r1.ebuild => mlt-0.9.8-r2.ebuild} | 15 ++++++++++++--- 1 file 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 similarity index 92% rename from media-libs/mlt/mlt-0.9.8-r1.ebuild rename to media-libs/mlt/mlt-0.9.8-r2.ebuild index 71759e9..248d021 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() {