From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 83C761396D0 for ; Thu, 17 Aug 2017 07:11:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE3E21FC009; Thu, 17 Aug 2017 07:11:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 894271FC009 for ; Thu, 17 Aug 2017 07:11:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 620CE341785 for ; Thu, 17 Aug 2017 07:11:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B47927887 for ; Thu, 17 Aug 2017 07:11:46 +0000 (UTC) From: "Thomas Beierlein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Beierlein" Message-ID: <1502953830.31ed54004935b9d23c29fc9d7ea49fe17c6a7fe1.tomjbe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/qsstv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-radio/qsstv/qsstv-9.2.4.ebuild X-VCS-Directories: media-radio/qsstv/ X-VCS-Committer: tomjbe X-VCS-Committer-Name: Thomas Beierlein X-VCS-Revision: 31ed54004935b9d23c29fc9d7ea49fe17c6a7fe1 X-VCS-Branch: master Date: Thu, 17 Aug 2017 07:11:46 +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: df6a1ab4-bf26-42ef-9075-4f1e1057ed1f X-Archives-Hash: 1f8104a2321417a0b415eea96aa1cba0 commit: 31ed54004935b9d23c29fc9d7ea49fe17c6a7fe1 Author: Thomas Beierlein gentoo org> AuthorDate: Thu Aug 17 07:10:30 2017 +0000 Commit: Thomas Beierlein gentoo org> CommitDate: Thu Aug 17 07:10:30 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ed5400 media-radio/qsstv: Fix hardcoded header path for openjpeg #627934. Thks Toralf. Package-Manager: Portage-2.3.7, Repoman-2.3.3 media-radio/qsstv/qsstv-9.2.4.ebuild | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/media-radio/qsstv/qsstv-9.2.4.ebuild b/media-radio/qsstv/qsstv-9.2.4.ebuild index 05c17fe9e85..69a97bf2e75 100644 --- a/media-radio/qsstv/qsstv-9.2.4.ebuild +++ b/media-radio/qsstv/qsstv-9.2.4.ebuild @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -DEPEND="dev-qt/qtcore:4[qt3support] +CDEPEND="dev-qt/qtcore:4[qt3support] dev-qt/qtgui:4 media-libs/hamlib media-libs/openjpeg:2 @@ -24,7 +24,9 @@ DEPEND="dev-qt/qtcore:4[qt3support] media-sound/pulseaudio media-libs/libv4l sci-libs/fftw:3.0=" -RDEPEND="${DEPEND} +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} x11-misc/xdg-utils" S="${WORKDIR}/${MY_P}" @@ -34,4 +36,9 @@ src_prepare() { sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \ -e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \ qsstv/qsstv.pro || die + + # fix hardcoded path to openjpeg headers + sed -i -e "s:openjpeg-2.1/::" qsstv/utils/color.cpp ||die + sed -i -e "s:/usr/include/openjpeg-2.1:$(pkg-config --cflags-only-I libopenjp2):" \ + -e "s:-I/usr:/usr:" qsstv/qsstv.pro ||die }