split out the darwin patch: malloc is defined in stdlib.h according to C standards, so we'd better patch this unconditionally.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64

5 files changed, 112 insertions, 6 deletions

diff --git a/media-libs/ladspa-cmt/ChangeLog b/media-libs/ladspa-cmt/ChangeLog
index 3e7974b97c4e..2ae376c13062 100644
--- a/media-libs/ladspa-cmt/ChangeLog
+++ b/media-libs/ladspa-cmt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/ladspa-cmt
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ChangeLog,v 1.29 2008/05/24 16:59:22 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ChangeLog,v 1.30 2008/08/17 08:17:49 aballier Exp $
+
+  17 Aug 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/ladspa-cmt-1.16-darwin.patch,
+  +files/ladspa-cmt-1.16-mallocstdlib.patch, ladspa-cmt-1.16.ebuild:
+  split out the darwin patch: malloc is defined in stdlib.h according to C
+  standards, so we'd better patch this unconditionally.
 
   24 May 2008; Joseph Jezak <josejx@gentoo.org> ladspa-cmt-1.15.ebuild:
   Marked ppc64 stable.
diff --git a/media-libs/ladspa-cmt/Manifest b/media-libs/ladspa-cmt/Manifest
index 0c7bb66afd6e..7f9f10e7dd9e 100644
--- a/media-libs/ladspa-cmt/Manifest
+++ b/media-libs/ladspa-cmt/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cmt.rdf 3943 RMD160 1966b6181eb6fbb0a1eba482d837d5f16205a1bf SHA1 c7fad71272bea0722009cb60d22ae7d772c63ba3 SHA256 23a756c95e87c545b8d32855d3d863e5e160254fd3b19fa2c5b61aeb2a631f26
+AUX ladspa-cmt-1.16-darwin.patch 316 RMD160 c47c1bd0456a178563aa5c9438786207ef22db5e SHA1 6721e666aea2054d7795a37851c9523903e146d1 SHA256 c9550afb4d8512532e3d338331cd9e7eedd74a8464fc06565eca8ca7d89111e2
+AUX ladspa-cmt-1.16-mallocstdlib.patch 1992 RMD160 46186df6fa2f8490c5152c8cc9a676842644c047 SHA1 31e5c86962ee91fe5db517ea87a21499ddb668dc SHA256 7801e2a05b05a9687622c05e8de1f49441a51b18f38315b99d53bb43c3f46d44
 AUX ladspa-cmt-darwin.patch 2324 RMD160 e9955081248099f72ee57a49d53b8ef46ec23e8d SHA1 a5f553267f88ed6468df20d195bb96223f9b3541 SHA256 ecffcf165a6ab0359f2601d0690ab2053c0101638c1cf5c95bdee7602c5ae765
 DIST cmt_src_1.15.tgz 61522 RMD160 fd7652fe204b63b24a9fb04688ccbabaabd1fecf SHA1 48d0208607c72d57efbdb8ba55695aa8819a0cc4 SHA256 0b814938040c7403dd24367b1dbbf0b0db7ac11df7447129e9c1b7f33890b1e9
 DIST cmt_src_1.16.tgz 63909 RMD160 8449187958bac5ccae6100906e59ed3488784657 SHA1 bbfdb39ecaa0e7f6c8517658a85c07604e3b5c5d SHA256 512a1d7e698b9e0e7c692202c29f4bd70846d52241ec254e1a324abaef405635
 EBUILD ladspa-cmt-1.15.ebuild 1286 RMD160 dc9c42863ebbfab28f57ff5a941025c519f3cab2 SHA1 4691387d3c266ad5f65b0924138545dca8adf396 SHA256 8eaade686f21460b2c5b54cdc4366e32b9bd3bf8508947588543ca2835649ce6
-EBUILD ladspa-cmt-1.16.ebuild 1331 RMD160 5ea8ee116e488045cc912112e82e68cf56915d5c SHA1 3446ee0edea9cb477fda1897ac56032b5335de26 SHA256 99e3d9d65a30a9c68d0906776c084180effe6f685261b7bdcd21a2bf0369558d
-MISC ChangeLog 3564 RMD160 225e25493e14f588c851111be87a7b903cab0dc4 SHA1 21a5487ab82c8ccf0e6ba6110c1a34d882b80c88 SHA256 0688839f52f9962cbe8d0980158a5844528a735f71ad07ea91c87582fafb11a8
+EBUILD ladspa-cmt-1.16.ebuild 1377 RMD160 17dc9c7a7f76417dac91a7f2b7b35bad54e0f860 SHA1 c2e35147ea384547536ce3c9d2e0a39b6b7211ca SHA256 127b2ff1914ac7748ffada61584b008ff40206df48d943d76fad85659d09395f
+MISC ChangeLog 3858 RMD160 c71d1be6b5cde4c7e1559d74d6ac6afb5ef86358 SHA1 1e5728402d8f11cf292c1369f3ce7119545c1635 SHA256 cf0d21af812d97393b56d75e9ee7e09d2d2cd6de2d41f23320b9e2ecb75d870a
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkin3rIACgkQvFcC4BYPU0oDvgCgrrzW6HSPPn+2qPuhT9tXoINK
+7hoAnjHvhT/rS+GA6AFrv4TZeRXow8vx
+=agG7
+-----END PGP SIGNATURE-----
diff --git a/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-darwin.patch b/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-darwin.patch
new file mode 100644
index 000000000000..f4352bfdcb91
--- /dev/null
+++ b/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-darwin.patch
@@ -0,0 +1,12 @@
+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-libs/ladspa-cmt/files/ladspa-cmt-1.16-mallocstdlib.patch b/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-mallocstdlib.patch
new file mode 100644
index 000000000000..f4e7663282c6
--- /dev/null
+++ b/media-libs/ladspa-cmt/files/ladspa-cmt-1.16-mallocstdlib.patch
@@ -0,0 +1,75 @@
+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-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild b/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild
index 89d8db85a972..d2aaeeb5091e 100644
--- a/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild
+++ b/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild,v 1.2 2007/11/20 19:24:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild,v 1.3 2008/08/17 08:17:49 aballier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -33,7 +33,8 @@ src_unpack() {
 		 "${S}/makefile" || die "sed makefile failed (CXXFLAGS)"
 
 	cd "${S}"
-	use userland_Darwin && epatch "${FILESDIR}/${PN}-darwin.patch"
+	epatch "${FILESDIR}/${P}-mallocstdlib.patch"
+	use userland_Darwin && epatch "${FILESDIR}/${P}-darwin.patch"
 }
 
 src_compile() {