updated macos/darwin patch

5 files changed, 96 insertions, 137 deletions

diff --git a/media-libs/ladspa-cmt/ChangeLog b/media-libs/ladspa-cmt/ChangeLog
index 6ab66e3edbc0..e7eea8f3002f 100644
--- a/media-libs/ladspa-cmt/ChangeLog
+++ b/media-libs/ladspa-cmt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/ladspa-cmt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ChangeLog,v 1.16 2004/10/07 02:52:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ChangeLog,v 1.17 2004/10/29 00:39:27 kito Exp $
+
+  28 Oct 2004; Kito <kito@gentoo.org> +files/ladspa-cmt-darwin.patch,
+  -files/ladspa-cmt-ppc-macos.patch, ladspa-cmt-1.15.ebuild:
+  updated macos/darwin patch
 
   06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   ladspa-cmt-1.15.ebuild:
diff --git a/media-libs/ladspa-cmt/Manifest b/media-libs/ladspa-cmt/Manifest
index 8495581d964c..10c20ec3c7e3 100644
--- a/media-libs/ladspa-cmt/Manifest
+++ b/media-libs/ladspa-cmt/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 ed0f1ecc45a0816e5fdf88dfe7fe30a8 ChangeLog 2116
 MD5 b07c93d67743f97a2fece534340b26a5 ladspa-cmt-1.14.ebuild 838
-MD5 57d045b753dde3d4207757869d710003 ladspa-cmt-1.15.ebuild 1084
+MD5 1fa75d34f3851a1ea4da91fa8ed08943 ladspa-cmt-1.15.ebuild 1091
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 04475533db02a2eba25792adadf105c3 ChangeLog 1955
 MD5 6bb9c3395445920cba1b45b6149943b6 files/digest-ladspa-cmt-1.14 55
 MD5 0da9dde7734a7551fbed8825e5e3ceea files/digest-ladspa-cmt-1.15 60
-MD5 ccb8e60888f46d970ae8d8269d095b7f files/ladspa-cmt-ppc-macos.patch 3574
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBZK+oArHZZzCEUG0RAoAIAJ9MRxXgTYEHXmP94PjxblBLgiaJvgCdHO/V
-VPZH6tbyHnNU+pFMjz1TMOo=
-=Zeo6
------END PGP SIGNATURE-----
+MD5 192c8fae28394b688e7f78ff387bc0de files/ladspa-cmt-darwin.patch 2324
diff --git a/media-libs/ladspa-cmt/files/ladspa-cmt-darwin.patch b/media-libs/ladspa-cmt/files/ladspa-cmt-darwin.patch
new file mode 100644
index 000000000000..644d6284eba8
--- /dev/null
+++ b/media-libs/ladspa-cmt/files/ladspa-cmt-darwin.patch
@@ -0,0 +1,84 @@
+diff -u src-org/analogue.cpp src/analogue.cpp
+--- src-org/analogue.cpp	Thu Oct 28 19:22:56 2004
++++ src/analogue.cpp	Thu Oct 28 19:24:43 2004
+@@ -24,7 +24,7 @@
+ 
+ /*****************************************************************************/
+ 
+-#include <malloc.h>
++#include <unistd.h>
+ #include <math.h>
+ #include <stdlib.h>
+ #include "cmt.h"
+diff -u src-org/canyondelay.cpp src/canyondelay.cpp
+--- src-org/canyondelay.cpp	Thu Oct 28 19:22:56 2004
++++ src/canyondelay.cpp	Thu Oct 28 19:24:43 2004
+@@ -25,7 +25,7 @@
+ /*****************************************************************************/
+ 
+ 
+-#include <malloc.h>
++#include <unistd.h>
+ #include <math.h>
+ #include "cmt.h"
+ 
+Common subdirectories: src-org/freeverb and src/freeverb
+diff -u src-org/lofi.cpp src/lofi.cpp
+--- src-org/lofi.cpp	Thu Oct 28 19:22:56 2004
++++ src/lofi.cpp	Thu Oct 28 19:24:43 2004
+@@ -24,7 +24,7 @@
+ 
+ /*****************************************************************************/
+ 
+-#include <malloc.h>
++#include <unistd.h>
+ #include <math.h>
+ #include <stdlib.h>
+ #include "cmt.h"
+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)					
+ 
+--- src-org/phasemod.cpp	Thu Oct 28 19:22:56 2004
++++ src/phasemod.cpp	Thu Oct 28 19:24:43 2004
+@@ -24,7 +24,7 @@
+ 
+ /*****************************************************************************/
+ 
+-#include <malloc.h>
++#include <unistd.h>
+ #include <math.h>
+ #include <stdlib.h>
+ #include "cmt.h"
+diff -u src-org/syndrum.cpp src/syndrum.cpp
+--- src-org/syndrum.cpp	Thu Oct 28 19:22:56 2004
++++ src/syndrum.cpp	Thu Oct 28 19:24:43 2004
+@@ -24,7 +24,7 @@
+ 
+ /*****************************************************************************/
+ 
+-#include <malloc.h>
++#include <unistd.h>
+ #include <math.h>
+ #include "cmt.h"
+ 
+diff -u src-org/vcf303.cpp src/vcf303.cpp
+--- src-org/vcf303.cpp	Thu Oct 28 19:22:56 2004
++++ src/vcf303.cpp	Thu Oct 28 19:24:43 2004
+@@ -26,7 +26,7 @@
+ /*****************************************************************************/
+ 
+ 
+-#include <malloc.h>
++#include <unistd.h>
+ #include <math.h>
+ #include "cmt.h"
+ 
diff --git a/media-libs/ladspa-cmt/files/ladspa-cmt-ppc-macos.patch b/media-libs/ladspa-cmt/files/ladspa-cmt-ppc-macos.patch
deleted file mode 100644
index 917da06101d5..000000000000
--- a/media-libs/ladspa-cmt/files/ladspa-cmt-ppc-macos.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -uNr cmt-org/src/analogue.cpp cmt/src/analogue.cpp
---- cmt-org/src/analogue.cpp	Sat Feb 17 05:50:07 2001
-+++ cmt/src/analogue.cpp	Tue Sep 14 22:56:20 2004
-@@ -24,7 +24,7 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
-+#include <unistd.h>
- #include <math.h>
- #include <stdlib.h>
- #include "cmt.h"
-diff -uNr cmt-org/src/canyondelay.cpp cmt/src/canyondelay.cpp
---- cmt-org/src/canyondelay.cpp	Sat Nov  4 05:39:53 2000
-+++ cmt/src/canyondelay.cpp	Tue Sep 14 22:56:51 2004
-@@ -25,7 +25,7 @@
- /*****************************************************************************/
- 
- 
--#include <malloc.h>
-+#include <unistd.h>
- #include <math.h>
- #include "cmt.h"
- 
-diff -uNr cmt-org/src/lofi.cpp cmt/src/lofi.cpp
---- cmt-org/src/lofi.cpp	Mon Sep 17 17:15:46 2001
-+++ cmt/src/lofi.cpp	Tue Sep 14 22:58:01 2004
-@@ -24,7 +24,7 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
-+#include <unistd.h>
- #include <math.h>
- #include <stdlib.h>
- #include "cmt.h"
-diff -uNr cmt-org/src/makefile cmt/src/makefile
---- cmt-org/src/makefile	Tue Sep 14 22:50:10 2004
-+++ cmt/src/makefile	Tue Sep 14 23:07:20 2004
-@@ -5,15 +5,15 @@
- # Change this if you want to install somewhere else. In particularly
- # you may wish to remove the middle "local/" part.
- 
--INSTALL_PLUGINS_DIR	=	/ladspa/
-+INSTALL_PLUGINS_DIR	=	/usr/local/lib/ladspa/
- 
- ###############################################################################
- #
- # GENERAL
- #
- 
--INCLUDES	=	-I/
--CFLAGS		=	$(INCLUDES) -Wall -Werror  -fPIC
-+INCLUDES	=	-I/usr/local/include/
-+CFLAGS		=	$(INCLUDES) -Wall -Werror -O3 -fPIC
- CXXFLAGS	=	$(CFLAGS)
- PLUGIN_LIB	=	../plugins/cmt.so
- 
-@@ -68,7 +68,7 @@
- targets:	$(PLUGIN_LIB)
- 
- $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
--	$(CXX)	-shared							\
-+	$(CXX)	-dynamiclib -ldl							\
- 		-o $(PLUGIN_LIB)					\
- 		$(PLUGIN_OBJECTS)					
- 
-@@ -77,6 +77,7 @@
- 	cp $(PLUGIN_LIB) $(INSTALL_PLUGINS_DIR)
- 
- test:	/tmp/test.wav ../../ladspa_sdk/snd/noise.wav always
-+ifeq ($(shell which play), /usr/bin/play)
- 	@echo ---------------------------------------------
- 	@echo First listen to the white noise input signal:
- 	@echo ---------------------------------------------
-@@ -86,7 +87,7 @@
- 	@echo -------------------------
- 	@echo Should be a noise band around 6000Hz, repeated quietly after 1s.
- 	play /tmp/test.wav
--
-+endif
- /tmp/test.wav:	$(PLUGIN_LIB) ../../ladspa_sdk/snd/noise.wav
- 	analyseplugin $(PLUGIN_LIB)
- 	echo;analyseplugin -l $(PLUGIN_LIB);echo
-diff -uNr cmt-org/src/phasemod.cpp cmt/src/phasemod.cpp
---- cmt-org/src/phasemod.cpp	Mon Sep 17 17:15:46 2001
-+++ cmt/src/phasemod.cpp	Tue Sep 14 23:08:34 2004
-@@ -24,7 +24,7 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
-+#include <unistd.h>
- #include <math.h>
- #include <stdlib.h>
- #include "cmt.h"
-diff -uNr cmt-org/src/syndrum.cpp cmt/src/syndrum.cpp
---- cmt-org/src/syndrum.cpp	Thu Dec 19 14:54:36 2002
-+++ cmt/src/syndrum.cpp	Tue Sep 14 23:08:52 2004
-@@ -24,7 +24,7 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
-+#include <unistd.h>
- #include <math.h>
- #include "cmt.h"
- 
-diff -uNr cmt-org/src/vcf303.cpp cmt/src/vcf303.cpp
---- cmt-org/src/vcf303.cpp	Sat Nov  4 05:39:53 2000
-+++ cmt/src/vcf303.cpp	Tue Sep 14 23:09:16 2004
-@@ -26,7 +26,7 @@
- /*****************************************************************************/
- 
- 
--#include <malloc.h>
-+#include <unistd.h>
- #include <math.h>
- #include "cmt.h"
- 
diff --git a/media-libs/ladspa-cmt/ladspa-cmt-1.15.ebuild b/media-libs/ladspa-cmt/ladspa-cmt-1.15.ebuild
index c5e0a9b8679e..f963d9bd8e7c 100644
--- a/media-libs/ladspa-cmt/ladspa-cmt-1.15.ebuild
+++ b/media-libs/ladspa-cmt/ladspa-cmt-1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.15.ebuild,v 1.15 2004/10/07 02:52:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ladspa-cmt-1.15.ebuild,v 1.16 2004/10/29 00:39:27 kito Exp $
 
 inherit eutils
 
@@ -30,7 +30,8 @@ src_unpack() {
 		-e 's|/usr/local/lib||g' makefile \
 			|| die "sed makefile failed"
 
-	use ppc-macos && epatch ${FILESDIR}/${PN}-ppc-macos.patch
+	cd "${S}"
+	use ppc-macos && epatch ${FILESDIR}/${PN}-darwin.patch
 }
 
 src_compile() {
@@ -43,4 +44,4 @@ src_install() {
 	doins ../plugins/*.so || die "doins failed"
 	dodoc ../README       || die "dodoc failed"
 	dohtml ../doc/*       || die "dohtml failed"
-}
+}
\ No newline at end of file