[gentoo-commits] repo/gentoo:master commit in: media-plugins/ir_lv2/files/, media-plugins/ir_lv2/

[gentoo-commits] repo/gentoo:master commit in: media-plugins/ir_lv2/files/, media-plugins/ir_lv2/

[Miroslav Šulc]

commit:     b0058ad95ebdc811a55214f879c63473bfab9bcb
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 16:53:59 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 16:55:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0058ad9

media-plugins/ir_lv2: fixed lv2 compilation issue in 1.3.4

thanks to Samuel Bauer <samuel.bauer <AT> yahoo.fr> for the fix

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

 media-plugins/ir_lv2/files/ir_lv2-1.3.4-lv2.patch | 13 +++++++++++++
 media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild          |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/media-plugins/ir_lv2/files/ir_lv2-1.3.4-lv2.patch b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-lv2.patch
new file mode 100644
index 00000000000..904dab659e7
--- /dev/null
+++ b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-lv2.patch
@@ -0,0 +1,13 @@
+diff --git a/ir_gui.cc b/ir_gui.cc
+index 74ff90a..0f482c6 100644
+--- a/ir_gui.cc
++++ b/ir_gui.cc
+@@ -1523,7 +1523,7 @@ static void cleanup(LV2UI_Handle ui) {
+ 	free(cp);
+ }
+ 
+-static LV2UI_Handle instantiate(const struct _LV2UI_Descriptor * descriptor,
++static LV2UI_Handle instantiate(const struct LV2UI_Descriptor * descriptor,
+ 				const char * plugin_uri,
+ 				const char * bundle_path,
+ 				LV2UI_Write_Function write_function,

diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
index 03d78346ab0..232d3932b3d 100644
--- a/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
+++ b/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
@@ -24,7 +24,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.4-respect-flags.patch
+	"${FILESDIR}"/${P}-respect-flags.patch
+	"${FILESDIR}"/${P}-lv2.patch
 )
 
 DOCS=( README.md sshot.png ChangeLog )

[gentoo-commits] repo/gentoo:master commit in: media-plugins/ir_lv2/files/, media-plugins/ir_lv2/

[Miroslav Šulc]

commit:     926515481beb34c661b83750ac2cfa5500299dd1
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 09:30:14 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 09:30:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92651548

media-plugins/ir_lv2: respecting CFLAGS in 1.3.4

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

 .../ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch  | 36 +++++++++++++++++++---
 ...{ir_lv2-1.3.4.ebuild => ir_lv2-1.3.4-r1.ebuild} |  0
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
index cd664a6728a..e375969072e 100644
--- a/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
+++ b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
@@ -1,6 +1,7 @@
-diff -urpN ir.lv2-1.3.4.orig/Makefile ir.lv2-1.3.4/Makefile
---- ir.lv2-1.3.4.orig/Makefile	2018-06-21 11:14:03.000000000 +0300
-+++ ir.lv2-1.3.4/Makefile	2019-12-24 16:26:06.102495896 +0300
+diff --git a/Makefile b/Makefile
+index 031f865..4d25e97 100644
+--- a/Makefile
++++ b/Makefile
 @@ -20,7 +20,7 @@ CC ?= gcc
  CXX ?= g++
  
@@ -10,7 +11,7 @@ diff -urpN ir.lv2-1.3.4.orig/Makefile ir.lv2-1.3.4/Makefile
  LIBS += -lc -lm -lzita-convolver -lsamplerate -lsndfile `pkg-config --libs gthread-2.0` `pkg-config --libs gtk+-2.0`
  
  ifeq ($(shell pkg-config --atleast-version='2.16' gtk+-2.0; echo $$?), 1)
-@@ -31,7 +31,7 @@ ifeq ($(shell pkg-config --atleast-versi
+@@ -31,28 +31,28 @@ ifeq ($(shell pkg-config --atleast-version='2.20' gtk+-2.0; echo $$?), 0)
     CPPFLAGS += -D_HAVE_GTK_ATLEAST_2_20
  endif
  
@@ -19,3 +20,30 @@ diff -urpN ir.lv2-1.3.4.orig/Makefile ir.lv2-1.3.4/Makefile
  C4LIBS = -lsndfile `pkg-config --libs gthread-2.0`
  
  all: ir.so ir_gui.so
+ 
+ ir.o: ir.cc ir.h ir_utils.h
+-	$(CXX) ir.cc $(CPPFLAGS) -c -fPIC -o ir.o
++	$(CXX) ir.cc $(CPPFLAGS) -c -fPIC $(CFLAGS) -o ir.o
+ 
+ ir_gui.o: ir_gui.cc ir.h ir_utils.h ir_wavedisplay.h
+-	$(CXX) ir_gui.cc $(CPPFLAGS) -c -fPIC -o ir_gui.o
++	$(CXX) ir_gui.cc $(CPPFLAGS) -c -fPIC $(CFLAGS) -o ir_gui.o
+ 
+ ir_utils.o: ir_utils.cc ir_utils.h ir.h
+-	$(CXX) ir_utils.cc $(CPPFLAGS) -c -fPIC -o ir_utils.o
++	$(CXX) ir_utils.cc $(CPPFLAGS) -c -fPIC $(CFLAGS) -o ir_utils.o
+ 
+ ir_meter.o: ir_meter.cc ir_meter.h ir.h ir_utils.h
+-	$(CXX) ir_meter.cc $(CPPFLAGS) -c -fPIC -o ir_meter.o
++	$(CXX) ir_meter.cc $(CPPFLAGS) -c -fPIC $(CFLAGS) -o ir_meter.o
+ 
+ ir_modeind.o: ir_modeind.cc ir_modeind.h ir.h ir_utils.h
+-	$(CXX) ir_modeind.cc $(CPPFLAGS) -c -fPIC -o ir_modeind.o
++	$(CXX) ir_modeind.cc $(CPPFLAGS) -c -fPIC $(CFLAGS) -o ir_modeind.o
+ 
+ ir_wavedisplay.o: ir_wavedisplay.cc ir_wavedisplay.h ir.h ir_utils.h
+-	$(CXX) ir_wavedisplay.cc $(CPPFLAGS) -c -fPIC -o ir_wavedisplay.o
++	$(CXX) ir_wavedisplay.cc $(CPPFLAGS) -c -fPIC $(CFLAGS) -o ir_wavedisplay.o
+ 
+ ir.so: ir.o ir_utils.o
+ 	$(CXX) $(LDFLAGS) ir.o ir_utils.o $(LIBS) -shared -o ir.so

diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.4-r1.ebuild
similarity index 100%
rename from media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
rename to media-plugins/ir_lv2/ir_lv2-1.3.4-r1.ebuild