gentoo resync : 16.09.2020

6 files changed, 14 insertions, 120 deletions

diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-darwin.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-darwin.patch
deleted file mode 100644
index f4352bfdcb91..000000000000
--- a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-darwin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u src-org/makefile src/makefile
---- src-org/makefile	Thu Oct 28 19:22:56 2004
-+++ src/makefile	Thu Oct 28 19:28:16 2004
-@@ -68,7 +68,7 @@
- targets:	$(PLUGIN_LIB)
- 
- $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
--	$(CXX)	-shared							\
-+	$(CXX)	-dynamiclib -ldl						\
- 		-o $(PLUGIN_LIB)					\
- 		$(PLUGIN_OBJECTS)					
- 
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-mallocstdlib.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-mallocstdlib.patch
deleted file mode 100644
index f4e7663282c6..000000000000
--- a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-mallocstdlib.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: cmt/src/analogue.cpp
-===================================================================
---- cmt.orig/src/analogue.cpp
-+++ cmt/src/analogue.cpp
-@@ -24,7 +24,6 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
- #include <math.h>
- #include <stdlib.h>
- #include "cmt.h"
-Index: cmt/src/canyondelay.cpp
-===================================================================
---- cmt.orig/src/canyondelay.cpp
-+++ cmt/src/canyondelay.cpp
-@@ -25,7 +25,7 @@
- /*****************************************************************************/
- 
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- #include "cmt.h"
- 
-Index: cmt/src/lofi.cpp
-===================================================================
---- cmt.orig/src/lofi.cpp
-+++ cmt/src/lofi.cpp
-@@ -24,7 +24,6 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
- #include <math.h>
- #include <stdlib.h>
- #include "cmt.h"
-Index: cmt/src/phasemod.cpp
-===================================================================
---- cmt.orig/src/phasemod.cpp
-+++ cmt/src/phasemod.cpp
-@@ -24,7 +24,6 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
- #include <math.h>
- #include <stdlib.h>
- #include "cmt.h"
-Index: cmt/src/syndrum.cpp
-===================================================================
---- cmt.orig/src/syndrum.cpp
-+++ cmt/src/syndrum.cpp
-@@ -24,7 +24,7 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- #include "cmt.h"
- 
-Index: cmt/src/vcf303.cpp
-===================================================================
---- cmt.orig/src/vcf303.cpp
-+++ cmt/src/vcf303.cpp
-@@ -26,7 +26,7 @@
- /*****************************************************************************/
- 
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- #include "cmt.h"
- 
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-respect-ldflags.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-respect-ldflags.patch
deleted file mode 100644
index e851c2a781ed..000000000000
--- a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-respect-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=334711
-
---- cmt/src/makefile.old	2010-09-13 16:43:26.000000000 +0100
-+++ cmt/src/makefile	2010-09-13 16:45:08.000000000 +0100
-@@ -66,7 +66,8 @@
- targets:	$(PLUGIN_LIB)
- 
- $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
--	$(CXX)	-shared							\
-+	$(CXX)	$(LDFLAGS)						\
-+		-shared							\
- 		-o $(PLUGIN_LIB)					\
- 		$(PLUGIN_OBJECTS)					
- 
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-sa.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-sa.patch
deleted file mode 100644
index 161c06d27eed..000000000000
--- a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-sa.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix strict aliasing warnings: reeverb/Components/allpass.h:36:2: warning:
-dereferencing type-punned pointer will break strict-aliasing rules
-
-https://bugs.gentoo.org/show_bug.cgi?id=307563
-
-Index: cmt/src/freeverb/Components/denormals.h
-===================================================================
---- cmt.orig/src/freeverb/Components/denormals.h
-+++ cmt/src/freeverb/Components/denormals.h
-@@ -8,7 +8,7 @@
- #ifndef _denormals_

- #define _denormals_

- 

--#define undenormalise(sample) if(((*(unsigned int*)&sample)&0x7f800000)==0) sample=0.0f

-+#define undenormalise(sample) if((((unsigned int)sample)&0x7f800000)==0) sample=0.0f

- 

- #endif//_denormals_

- 

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 000000000000..621816beaf5f
--- /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 ca76e859b5f7..93f3ab5df99c 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)