From 559b233ab8538737b4cf703ec2a5b5fbbca63f5e Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 19 Apr 2021 07:45:35 +0100 Subject: media-sound/jack_capture: respect PKG_CONFIG Signed-off-by: Sam James --- .../files/jack_capture-0.9.73-Makefile.patch | 7 +++---- .../files/jack_capture-0.9.73-r1-Makefile.patch | 4 +--- media-sound/jack_capture/jack_capture-0.9.73.ebuild | 16 +++++++--------- media-sound/jack_capture/jack_capture-9999.ebuild | 17 +++++++---------- 4 files changed, 18 insertions(+), 26 deletions(-) (limited to 'media-sound/jack_capture') diff --git a/media-sound/jack_capture/files/jack_capture-0.9.73-Makefile.patch b/media-sound/jack_capture/files/jack_capture-0.9.73-Makefile.patch index ef69ed5d810c..8b5bb15d1f6c 100644 --- a/media-sound/jack_capture/files/jack_capture-0.9.73-Makefile.patch +++ b/media-sound/jack_capture/files/jack_capture-0.9.73-Makefile.patch @@ -1,6 +1,5 @@ -diff -Naur a/Makefile b/Makefile ---- a/Makefile 2017-07-07 17:42:49.613728707 -0400 -+++ b/Makefile 2017-07-07 17:44:39.393726882 -0400 +--- a/Makefile ++++ b/Makefile @@ -3,16 +3,13 @@ VERSION=0.9.73 @@ -35,7 +34,7 @@ diff -Naur a/Makefile b/Makefile jack_capture_gui2: jack_capture_gui2.cpp - $(CPP) $(CPPFLAGS) $(OPTIMIZE) jack_capture_gui2.cpp $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2 -+ $(CXX) $(CXXFLAGS) jack_capture_gui2.cpp $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2 ++ $(CXX) $(CXXFLAGS) jack_capture_gui2.cpp $(LDFLAGS) `${PKG_CONFIG} --libs --cflags gtk+-2.0` -o jack_capture_gui2 config_flags: Makefile das_config.h cat das_config.h |grep COMPILEFLAGS|sed s/\\/\\/COMPILEFLAGS//|tr '\n' ' ' >config_flags diff --git a/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch b/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch index c4909fbde8e3..b9c3386e330a 100644 --- a/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch +++ b/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile b/Makefile -index 6e1fef9..d75ebfb 100644 --- a/Makefile +++ b/Makefile @@ -3,16 +3,16 @@ bindir = $(PREFIX)/bin @@ -37,7 +35,7 @@ index 6e1fef9..d75ebfb 100644 jack_capture_gui2: jack_capture_gui2.cpp - $(CPP) $(CPPFLAGS) $(OPTIMIZE) jack_capture_gui2.cpp $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2 -+ $(CXX) $(CXXFLAGS) jack_capture_gui2.cpp $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2 ++ $(CXX) $(CXXFLAGS) jack_capture_gui2.cpp $(LDFLAGS) `${PKG_CONFIG} --libs --cflags gtk+-2.0` -o jack_capture_gui2 config_flags: Makefile das_config.h cat das_config.h |grep COMPILEFLAGS|sed s/\\/\\/COMPILEFLAGS//|tr '\n' ' ' >config_flags diff --git a/media-sound/jack_capture/jack_capture-0.9.73.ebuild b/media-sound/jack_capture/jack_capture-0.9.73.ebuild index a54fb350640f..c9e7eec644a6 100644 --- a/media-sound/jack_capture/jack_capture-0.9.73.ebuild +++ b/media-sound/jack_capture/jack_capture-0.9.73.ebuild @@ -14,18 +14,18 @@ SLOT="0" KEYWORDS="amd64" IUSE="mp3 ogg osc" -CDEPEND=" +RDEPEND=" media-libs/libsndfile virtual/jack mp3? ( media-sound/lame ) ogg? ( media-libs/libogg ) osc? ( media-libs/liblo ) " -RDEPEND="${CDEPEND}" -DEPEND="${CDEPEND}" +DEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${P}-Makefile.patch" + "${FILESDIR}"/${P}-Makefile.patch ) DOCS=( README config ) @@ -38,15 +38,13 @@ src_prepare() { use osc || sed -i -e 's/HAVE_LIBLO 1/HAVE_LIBLO 0/' -e '/COMPILEFLAGS .* liblo/d' gen_das_config_h.sh } -src_compile() -{ - tc-export CC CXX +src_compile() { + tc-export CC CXX PKG_CONFIG emake PREFIX="${EPREFIX}/usr" jack_capture } -src_install() -{ +src_install() { dobin jack_capture dodoc "${DOCS[@]}" diff --git a/media-sound/jack_capture/jack_capture-9999.ebuild b/media-sound/jack_capture/jack_capture-9999.ebuild index 980c922b37b6..0ca797fb04be 100644 --- a/media-sound/jack_capture/jack_capture-9999.ebuild +++ b/media-sound/jack_capture/jack_capture-9999.ebuild @@ -11,21 +11,20 @@ EGIT_REPO_URI="https://github.com/kmatheussen/jack_capture.git" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="mp3 ogg osc" -CDEPEND=" +RDEPEND=" media-libs/libsndfile virtual/jack mp3? ( media-sound/lame ) ogg? ( media-libs/libogg ) osc? ( media-libs/liblo ) " -RDEPEND="${CDEPEND}" -DEPEND="${CDEPEND}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${PN}-0.9.73-r1-Makefile.patch" + "${FILESDIR}"/${PN}-0.9.73-r1-Makefile.patch ) DOCS=( README config ) @@ -38,15 +37,13 @@ src_prepare() { use osc || sed -i -e 's/HAVE_LIBLO 1/HAVE_LIBLO 0/' -e '/COMPILEFLAGS .* liblo/d' gen_das_config_h.sh } -src_compile() -{ - tc-export CC CXX +src_compile() { + tc-export CC CXX PKG_CONFIG emake PREFIX="${EPREFIX}/usr" jack_capture } -src_install() -{ +src_install() { dobin jack_capture dodoc "${DOCS[@]}" -- cgit v1.2.3-65-gdbad