[gentoo-commits] repo/gentoo:master commit in: media-sound/jack_capture/files/, media-sound/jack_capture/

[Miroslav Šulc]

commit:     4615dd51d6be3284a01df50fd236abd2a43811c0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 26 07:03:13 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May 26 07:03:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4615dd51

media-sound/jack_capture: updated patch for 9999

Closes: https://bugs.gentoo.org/725116
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/jack_capture-0.9.73-r1-Makefile.patch    | 43 ++++++++++++++++++++++
 media-sound/jack_capture/jack_capture-9999.ebuild  |  4 +-
 2 files changed, 45 insertions(+), 2 deletions(-)

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
new file mode 100644
index 00000000000..c4909fbde8e
--- /dev/null
+++ b/media-sound/jack_capture/files/jack_capture-0.9.73-r1-Makefile.patch
@@ -0,0 +1,43 @@
+diff --git a/Makefile b/Makefile
+index 6e1fef9..d75ebfb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,16 +3,16 @@ bindir = $(PREFIX)/bin
+ 
+ VERSION=0.9.73
+ 
+-CC=gcc
+-CPP=g++
++CC ?= gcc
++CXX ?= g++
+ 
+ # Needed on OSX
+ CFLAGS += -I/opt/local/include
+ 
+-OPTIMIZE=-O3
++#OPTIMIZE=-O3
+ #OPTIMIZE=-O0 -g
+ 
+-COMPILEFLAGS=$(CFLAGS) $(OPTIMIZE) -DVERSION=\"$(VERSION)\" -Wall -Wextra -Wno-unused
++COMPILEFLAGS=$(CFLAGS) -DVERSION=\"$(VERSION)\" -Wall -Wextra -Wno-unused
+ LINKFLAGS=$(LDFLAGS) -ljack -lsndfile -lm -lpthread -latomic
+ 
+ OS := $(shell uname)
+@@ -41,7 +41,7 @@ check_dependencies:
+ 	which install
+ 	which pkg-config
+ 	which $(CC)
+-	which $(CPP)
++	which $(CXX)
+ 	$(CC) $(CFLAGS) -E testsndfile.c >/dev/null
+ 	@echo "All seems good "
+ 	@echo
+@@ -64,7 +64,7 @@ jack_capture: setformat.c jack_capture.c vringbuffer.c upwaker.c osc.c 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
+ 
+ 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-9999.ebuild b/media-sound/jack_capture/jack_capture-9999.ebuild
index d6cc0bd7091..f0073414466 100644
--- a/media-sound/jack_capture/jack_capture-9999.ebuild
+++ b/media-sound/jack_capture/jack_capture-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.9.73-Makefile.patch"
+	"${FILESDIR}/${PN}-0.9.73-r1-Makefile.patch"
 )
 
 DOCS=( README config )