gentoo resync : 25.08.2020

4 files changed, 50 insertions, 7 deletions

diff --git a/media-plugins/ir_lv2/Manifest b/media-plugins/ir_lv2/Manifest
index 01674dac8bfe..2781c41fd534 100644
--- a/media-plugins/ir_lv2/Manifest
+++ b/media-plugins/ir_lv2/Manifest
@@ -1,6 +1,7 @@
-AUX ir_lv2-1.3.4-respect-flags.patch 1139 BLAKE2B f5e7d891e443c32c21b5db7360479b9d4ac80013805a10a6bd714ab6db5d64cc5d673571894b103db3bea12e5baa2d9f7c4a1053e6d6df517058935d7f799f06 SHA512 a9021b12c6663bf6bb20e87db01981f21afd9ceeeaaedce584389f69abd87c713c937250eea87f12a03610885cd02ab3cea6e756503b1987d1b678acd9e55b14
+AUX ir_lv2-1.3.4-lv2.patch 433 BLAKE2B 3f831851c2354b4695780a6df057dcd3885855ef19bffb0cd0a12e2671d18fc789a7ffa5ad38176a006e5ea2f43361caa8baae50157db3898af2b2b965bda3f7 SHA512 cb2208857e61912fdd1e2f6b5c7e81fd3bb86ae2d8195926d1c23ed99cacc8bc90a1758767c6f9733696a8aa128573098cefeeb2271d9df5bd0a751689489963
+AUX ir_lv2-1.3.4-respect-flags.patch 2213 BLAKE2B 110fc8963f65f4e520b395d7ead9605d94f65030e61277ca7d6b5d34d41c3e847a6313d67c7b0b0e2ab7a4fac77e3aca2f022179ef0398cf27562df65aec308a SHA512 88d9d7739be0ae0b202e94e1d4f40615e876419624ea8af743365c761fbe440c077c40e7dae3b4f43b29fa4e7c33e2dc2931c2334101d835e14f13782f594de7
 DIST ir_lv2-1.2.4.tar.gz 126123 BLAKE2B fab75bf18b642ad59bcb53041462a0d37c84554f0cf6e78c5cdff69ee42a21812a5176083e325018454f6a0a990ce309abed1eea71eb6022ec5981186bf6f29c SHA512 28aac050352380719512efe3346ffddeddb75972e749dc9433cea92973e1ae838c65c6d7196646199218ff3362b24fa9a5e1a3578e74a0b9e268d21083874977
 DIST ir_lv2-1.3.4.tar.gz 126552 BLAKE2B 52f5b236c4680a759c0621ed0f9a394e6e82bdb9aaf4110b325902ae382d2f640a079c53d89c662a192a97d0e79349082cf100636c1a7d6c00738602ca652962 SHA512 6a9c8f906a07c6ed0daa53d8dc3693d535ec4cf63f07b5fcc62ab6638c66992ff7951918b0ce2ef8c65289b19988363be49bba9bb75a20b0463fa972b07ff58c
 EBUILD ir_lv2-1.2.4.ebuild 953 BLAKE2B dbffe6edc29622b0e9c530aecf935cf5ce17094c47a685cfd5780777bcbeda9a379e73e4e8bff924445338e76ec41272a6dae8795751a7f60260f2b863f233ff SHA512 ecd86f25e7652e5bbc9dfd177cc0eb0aaea474728730fd1955b318c6bbc90fac7d91f06a0b7df100c3a94839011b5843947ca6c2c03c9cb42e3fa93a41c38110
-EBUILD ir_lv2-1.3.4.ebuild 1380 BLAKE2B 78998f31ff1d35158c0a02ee97c4e67c17d542040941ee563c903bb34250870681fda9063cda9aa125bd019f3ada4aa5d30ad771628b03ea0f4ae5d21bf46af7 SHA512 c8abe786e3e2e624cfb4cb04e0b10549829d3aabaccbfd54608b145787240cb5f7c9f5844042a491870bf247078c12edffb9a40e5c978cca86227369e355b00f
+EBUILD ir_lv2-1.3.4-r1.ebuild 1403 BLAKE2B 0744931a106821c25366de148df9e35a0446024ae764a164263472376e9258b554be7b89e77f7fc1b4098bca7d930a64fc48860e17b88dfb164daf8a63980449 SHA512 4cedc7b1685ccdce55d2a24b9dcdeaa3ca77a9a6e3a2461e8c54a6015245e900962d512ce680aa4484d341a8645d69fb00fdd52a0464046027fe9420f53215a2
 MISC metadata.xml 319 BLAKE2B de7f0ee9cfe123a77f79cce2ade2dce0e5c3e5243ce13611bf6e9b613f04b7b2824bb70185796ed81d8fdbfc023722c1a45f9cecca16a35f8bf8cfb376dcc322 SHA512 d01e35b0d4b6fac4baefdac78473637585ae45a47f486c114f6fbaaa0c781ccc4d5f55e143c67dfe5fa074fe60cb60dcf5e6f5fd59b6dcd3e582c3e5dac68064
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 000000000000..904dab659e73
--- /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/files/ir_lv2-1.3.4-respect-flags.patch b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
index cd664a6728a2..e375969072e3 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
index 03d78346ab04..232d3932b3de 100644
--- a/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
+++ b/media-plugins/ir_lv2/ir_lv2-1.3.4-r1.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 )