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

[Miroslav Šulc]

commit:     2ff6692048fcc3f4df1561265078788cd8f59f57
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 08:54:16 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 08:54:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff66920

media-plugins/cmt-plugins: fixed clang compilation + linking in 1.17-r1

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

 media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild        |  1 +
 .../cmt-plugins/files/cmt-plugins-1.17-clang.patch          | 13 +++++++++++++
 .../cmt-plugins/files/cmt-plugins-1.17-makefile.patch       |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild b/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild
index 9ef01406f19..f38bf2a8d5a 100644
--- a/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild
+++ b/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-clang.patch"
 )
 
 DOCS="../README"

diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.17-clang.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.17-clang.patch
new file mode 100644
index 00000000000..621816beaf5
--- /dev/null
+++ b/media-plugins/cmt-plugins/files/cmt-plugins-1.17-clang.patch
@@ -0,0 +1,13 @@
+diff --git a/src/disintegrator.cpp b/src/disintegrator.cpp
+index 867fe37..7563a5d 100644
+--- a/src/disintegrator.cpp
++++ b/src/disintegrator.cpp
+@@ -67,7 +67,7 @@ namespace disintegrator {
+     };
+ 
+     template<OutputFunction write_output>
+-    static void run(LADSPA_Handle instance,
++    void run(LADSPA_Handle instance,
+ 	            unsigned long sample_count) {
+ 	
+ 	Plugin *pp = (Plugin *) instance;

diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.17-makefile.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.17-makefile.patch
index ca76e859b5f..93f3ab5df99 100644
--- a/media-plugins/cmt-plugins/files/cmt-plugins-1.17-makefile.patch
+++ b/media-plugins/cmt-plugins/files/cmt-plugins-1.17-makefile.patch
@@ -16,7 +16,7 @@ index 159dd46..5c2c0f4 100644
  plugin:	$(PLUGIN_LIB)
  
 +%.o: %.cpp
-+	$(CXX) $(INCLUDES) $(CFLAGS) -c -o $*.o $*.cpp
++	$(CXX) $(INCLUDES) $(CFLAGS) -fPIC -c -o $*.o $*.cpp
 +
 +
  targets:	$(PLUGIN_LIB)