From 31ed54004935b9d23c29fc9d7ea49fe17c6a7fe1 Mon Sep 17 00:00:00 2001 From: Thomas Beierlein Date: Thu, 17 Aug 2017 09:10:30 +0200 Subject: [PATCH] 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 05c17fe9e856f..69a97bf2e7536 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 }