diff --git a/media-libs/ladspa-sdk/ChangeLog b/media-libs/ladspa-sdk/ChangeLog --- a/media-libs/ladspa-sdk/ChangeLog +++ b/media-libs/ladspa-sdk/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ChangeLog,v 1.50 2010/04/02 15:42:46 jer Exp $ + 13 Apr 2010; Nathan Phillip Brink (ohnobinki) + -ladspa-sdk-1.12-r2.ebuild, + -files/ladspa-sdk-1.12-fbsd.patch, -files/ladspa-sdk-1.12-gcc4.patch, + -files/ladspa-sdk-1.12-test.patch, -ladspa-sdk-1.13.ebuild, + ladspa-sdk-1.13-r1.ebuild, +files/ladspa-sdk-1.13-no-LD.patch: + Drop old versions. Fixes bug 314913 (ladspa-sdk directly calls LD). + Upgrade to EAPI=2. + 02 Apr 2010; Jeroen Roovers ladspa-sdk-1.13-r1.ebuild: Stable for HPPA (bug #304033). diff --git a/media-libs/ladspa-sdk/Manifest b/media-libs/ladspa-sdk/Manifest --- a/media-libs/ladspa-sdk/Manifest +++ b/media-libs/ladspa-sdk/Manifest @@ -1,13 +1,18 @@ -AUX ladspa-sdk-1.12-fbsd.patch 895 RMD160 4ba94766072abe0d42186362f9cb23a45ba087e5 SHA1 92f0976ac17794be166fefb18578d83505b89ca1 SHA256 58eb6255f3e204410075052d5ca3cfa5b6da9a33d4e2435d36665a50cf7a7afb -AUX ladspa-sdk-1.12-gcc4.patch 968 RMD160 2bb125aa82309250710b47bd915718d5a96dd2ba SHA1 8587adb5149d2b895f1662bbd7ee4aa448254036 SHA256 e3048ed6944552d073a9237e6010e43477d2359b7ca98b8c39258865a005b37a -AUX ladspa-sdk-1.12-test.patch 1024 RMD160 1677dff1da06aa283444b6bc0e2abcd5f9d5ab37 SHA1 74c78072279539c77490b9041118a30b3b12c808 SHA256 9e1171587422dc9e9e0a8ef086bf74f50e7bce7eaae74ef471d09e7dbdfbaaf8 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX ladspa-sdk-1.13-asneeded.patch 624 RMD160 2f4cdc2f3d0a35279fec0699113cca9bbf743139 SHA1 c12f4dc88452da7c9eb27c31f26d4476399033f6 SHA256 0fc78bd4035485559147e9468427a27dcfa879cebcebfec92c7d006e9e95afd0 AUX ladspa-sdk-1.13-fbsd.patch 440 RMD160 60f446ca31f4b363fed45bfde1265815a90c61f2 SHA1 efb27fbb3a9d787c5fe96e743d4c754bfa45baf9 SHA256 97db76bebb56866d006a0667bb3e67de81b2da1933e4c4d479163a992a488ef8 +AUX ladspa-sdk-1.13-no-LD.patch 1076 RMD160 ea67c2fc57970ceb34f7e25b8501dabc4652d99f SHA1 0be698d4fbe8ead7732c2e435f8dbdaa0c5e9021 SHA256 9b6aead4b761ff85ad1a4a5cf81b82e954153519d8eb95d3e7d92029d5d81bd7 AUX ladspa-sdk-1.13-properbuild.patch 3020 RMD160 e9a344e42ae28bd1c25fca187b5750435fef158f SHA1 5066d6b2526e3678b7373df4b00bbb8e0a6cafd8 SHA256 a5bc7ec6643d47a8d57e4e27a5934949c55d9b1f8d2c98a60eca99ea558f24ef -DIST ladspa_sdk_1.12.tgz 71165 RMD160 7967731c28785287691655d9346cf46654f4235b SHA1 36a3a7a00f96281ca443dcae15d33f462398c4d4 SHA256 66a5be1b0c54aba86dbb24a2e5e83604d0d7a8c0645fcb64579ec2966e25689c DIST ladspa_sdk_1.13.tgz 70540 RMD160 e9eeae8edd24a6890fac3e34c4b55f844f44f8a0 SHA1 2b69e28afb62c0d97943124f48ed82de796f83ed SHA256 b5ed3f4f253a0f6c1b7a1f4b8cf62376ca9f51d999650dd822650c43852d306b -EBUILD ladspa-sdk-1.12-r2.ebuild 1616 RMD160 275dc6f10213134dc7aed8f6f9f6f3c7ae77fbb3 SHA1 94cda0df8e6090bf42676b51f5542ba33900666c SHA256 5e8a383689cbf6be8d1e4fb05a79990a75990825be027644ab935c4a04a2c5d8 -EBUILD ladspa-sdk-1.13-r1.ebuild 1452 RMD160 dc2e0a3c83cd0e809f1d14bf6181dcb83b09aa16 SHA1 b7b58733d112233aff26c777dcbe28a5e2cd1c5a SHA256 ad2cc1014c9ba00b736daa8703597cd26462a3c57c5dc94c4e2a79b7cc3407a9 -EBUILD ladspa-sdk-1.13.ebuild 1587 RMD160 6bb049533dfb8b9a1d939e3bcc958a6e8802dcd5 SHA1 7a0fc4ab322b0b6910294d7f5ce09fdb1c7a0a7d SHA256 e29d7cfd130a169f29ca4352caceeb9d97c6dcacdd8b218d9357e5f09fcb35e8 -MISC ChangeLog 6745 RMD160 b9b48667fbe91cdd3899cd26243057e525aea667 SHA1 bf989ff0b0169833f2094d10a9978168eef43b24 SHA256 7c481bda60913af19d4b6f0dfcfc2eb50e6f6d83f88d2984e1bbcd1081e902ea +EBUILD ladspa-sdk-1.13-r1.ebuild 1429 RMD160 113bf3fce8e4fd1760a9b11a933de6fed0753c9a SHA1 c6e9514ce2dad8b1d1bba516a045c08d5ec89de7 SHA256 64276e3a0dfd946a0764bef61031ba88dac911cc8dbcffce6104ccb1f28df79b +MISC ChangeLog 7145 RMD160 fca70c8e3f86b72a889609dc5c53f50dff6eba68 SHA1 7c60436634bb338b7acdafd680e2959389cd3b52 SHA256 eb769967f87970bb2f84320459cfe49e93eaf538466a1c423e8dfdf47a8a8ea3 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkvD0EsACgkQni8M22OVw8CkfwCfa2wzbP0h0jUsniPkOP3nSTFV +MJUAn2uFDeeZBv0UoNgs65Jx7P5VD6W+ +=Fdpv +-----END PGP SIGNATURE----- diff --git a/media-libs/ladspa-sdk/files/ladspa-sdk-1.12-fbsd.patch b/media-libs/ladspa-sdk/files/ladspa-sdk-1.12-fbsd.patch deleted file mode 100644 --- a/media-libs/ladspa-sdk/files/ladspa-sdk-1.12-fbsd.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ur ladspa_sdk.orig/src/applyplugin.c ladspa_sdk/src/applyplugin.c ---- ladspa_sdk.orig/src/applyplugin.c 2002-05-18 14:01:36 -0300 -+++ ladspa_sdk/src/applyplugin.c 2006-10-31 18:25:23 -0300 -@@ -6,7 +6,11 @@ - /*****************************************************************************/ - - #include -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - #include - #include - #include -diff -ur ladspa_sdk.orig/src/makefile ladspa_sdk/src/makefile ---- ladspa_sdk.orig/src/makefile 2006-10-31 18:23:47 -0300 -+++ ladspa_sdk/src/makefile 2006-10-31 18:24:51 -0300 -@@ -15,7 +15,12 @@ - # - - INCLUDES = -I. -+# FreeBSD doesn't need -ldl -+ifeq ($(shell uname -s), FreeBSD) -+LIBRARIES = -lm -+else - LIBRARIES = -ldl -lm -+endif - CFLAGS = $(INCLUDES) -Wall -Werror -O3 -fPIC - CXXFLAGS = $(CFLAGS) - PLUGINS = ../plugins/amp.so \ diff --git a/media-libs/ladspa-sdk/files/ladspa-sdk-1.12-gcc4.patch b/media-libs/ladspa-sdk/files/ladspa-sdk-1.12-gcc4.patch deleted file mode 100644 --- a/media-libs/ladspa-sdk/files/ladspa-sdk-1.12-gcc4.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ladspa_sdk/src/plugins/sine.cpp.orig 2002-07-06 17:23:17.000000000 -0000 -+++ ladspa_sdk/src/plugins/sine.cpp 2005-11-25 11:15:11.691087784 +0000 -@@ -59,6 +59,15 @@ - - /*****************************************************************************/ - -+LADSPA_Handle instantiateSineOscillator(const LADSPA_Descriptor *, unsigned long SampleRate); -+void connectPortToSineOscillator(LADSPA_Handle Instance, unsigned long Port, LADSPA_Data * DataLocation); -+void activateSineOscillator(void * pvHandle); -+void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, unsigned long SampleCount); -+void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, unsigned long SampleCount); -+void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, unsigned long SampleCount); -+void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, unsigned long SampleCount); -+void cleanupSineOscillator(void *pvHandle); -+ - class SineOscillator { - private: diff --git a/media-libs/ladspa-sdk/files/ladspa-sdk-1.12-test.patch b/media-libs/ladspa-sdk/files/ladspa-sdk-1.12-test.patch deleted file mode 100644 --- a/media-libs/ladspa-sdk/files/ladspa-sdk-1.12-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -ur ladspa_sdk_orig/src/makefile ladspa_sdk/src/makefile ---- ladspa_sdk_orig/src/makefile 2004-08-15 23:32:53.516055360 +0200 -+++ ladspa_sdk/src/makefile 2004-08-15 23:35:21.579546288 +0200 -@@ -48,6 +48,7 @@ - # - - test: /tmp/test.wav ../snd/noise.wav always -+ifeq ($(shell which play), /usr/bin/play) - @echo --------------------------------------------- - @echo First listen to the white noise input signal: - @echo --------------------------------------------- -@@ -57,6 +58,7 @@ - @echo ------------------------- - @echo Should be a noise band around 6000Hz, repeated quietly after 1s. - play /tmp/test.wav -+endif - - install: targets - mkdir -p $(INSTALL_PLUGINS_DIR) \ -@@ -74,7 +74,7 @@ - echo ; ../bin/analyseplugin -l ../plugins/sine.so ; echo - ../bin/analyseplugin ../plugins/amp.so - ../bin/analyseplugin ../plugins/noise.so -- time ../bin/applyplugin -s 1 \ -+ ../bin/applyplugin -s 1 \ - ../snd/noise.wav /tmp/test.wav \ - ../plugins/filter.so lpf 500 \ - ../plugins/filter.so lpf 500 \ - diff --git a/media-libs/ladspa-sdk/files/ladspa-sdk-1.13-no-LD.patch b/media-libs/ladspa-sdk/files/ladspa-sdk-1.13-no-LD.patch new file mode 100644 --- /dev/null +++ b/media-libs/ladspa-sdk/files/ladspa-sdk-1.13-no-LD.patch @@ -0,0 +1,22 @@ +diff -r db4e8d7f66bd -r b739da53e7bd src/makefile +--- a/src/makefile Mon Apr 12 21:21:32 2010 -0400 ++++ b/src/makefile Mon Apr 12 21:26:25 2010 -0400 +@@ -38,15 +38,15 @@ + + ../plugins/filter.so: plugins/filter.c ladspa.h + $(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/filter.o -c plugins/filter.c +- $(LD) $(RAW_LDFLAGS) -o ../plugins/filter.so plugins/filter.o -shared -lm ++ $(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/filter.so plugins/filter.o -nostartfiles -shared -lm + + ../plugins/%.so: plugins/%.c ladspa.h + $(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.c +- $(LD) $(RAW_LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared ++ $(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -nostartfiles -shared + + ../plugins/%.so: plugins/%.cpp ladspa.h + $(CXX) $(CXXFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.cpp +- $(CXX) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -nostartfiles -shared + + ############################################################################### + # diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.12-r2.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.12-r2.ebuild deleted file mode 100644 --- a/media-libs/ladspa-sdk/ladspa-sdk-1.12-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ladspa-sdk-1.12-r2.ebuild,v 1.20 2009/09/23 15:12:59 ssuominen Exp $ - -inherit eutils - -MY_PN=${PN/-/_} -MY_P=${MY_PN}_${PV} - -DESCRIPTION="The Linux Audio Developer's Simple Plugin API" -HOMEPAGE="http://www.ladspa.org/" -SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -S=${WORKDIR}/${MY_PN}/src - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}/${P}-fbsd.patch" - sed -i \ - -e "/^CFLAGS/ s:-O3:${CFLAGS}:" \ - "${S}/makefile" || die "sed makefile failed (CFLAGS)" - sed -i \ - -e 's:-mkdirhier:mkdir\ -p:g' \ - "${S}/makefile" || die "sed makefile failed (mkdirhier)" - epatch "${FILESDIR}/${P}-test.patch" - epatch "${FILESDIR}/${P}-gcc4.patch" -} - -src_compile() { - # It sets CXXFLAGS to CFLAGS, can be wrong.. - # Just set CXXFLAGS to what they should be - emake -j1 targets CXXFLAGS="$CXXFLAGS -I. -fPIC" || die -} - -src_test() { - # needed for sox to allow playback of the test sounds - addwrite /dev/dsp - - emake test || die -} - -src_install() { - make \ - INSTALL_PLUGINS_DIR="${D}/usr/$(get_libdir)/ladspa" \ - INSTALL_INCLUDE_DIR="${D}/usr/include" \ - INSTALL_BINARY_DIR="${D}/usr/bin" \ - install || die "make install failed" - - cd ../doc && \ - dohtml *.html || die "dohtml failed" - - # Needed for apps like rezound - dodir /etc/env.d - echo "LADSPA_PATH=/usr/$(get_libdir)/ladspa" > "${D}/etc/env.d/60ladspa" -} diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r1.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r1.ebuild --- a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r1.ebuild +++ b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r1.ebuild @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ladspa-sdk-1.13-r1.ebuild,v 1.7 2010/04/02 15:42:46 jer Exp $ +EAPI=2 + inherit eutils toolchain-funcs portability flag-o-matic MY_PN=${PN/-/_} @@ -19,22 +21,22 @@ IUSE="" RDEPEND="" DEPEND=">=sys-apps/sed-4" -S="${WORKDIR}/${MY_PN}/src" +S=${WORKDIR}/${MY_PN}/src -src_unpack() { - unpack ${A} +src_prepare() { epatch "${FILESDIR}/${P}-properbuild.patch" epatch "${FILESDIR}/${P}-asneeded.patch" epatch "${FILESDIR}/${P}-fbsd.patch" + epatch "${FILESDIR}/${P}-no-LD.patch" + sed -i -e 's:-sndfile-play*:@echo Disabled \0:' \ - "${S}/makefile" || die "sed makefile failed (sound playing tests)" + makefile || die "sed makefile failed (sound playing tests)" } src_compile() { emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - RAW_LDFLAGS="$(raw-ldflags)" \ DYNAMIC_LD_LIBS="$(dlopen_lib)" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ targets || die } diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.13.ebuild deleted file mode 100644 --- a/media-libs/ladspa-sdk/ladspa-sdk-1.13.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ladspa-sdk-1.13.ebuild,v 1.7 2008/03/22 16:38:16 coldwind Exp $ - -inherit eutils toolchain-funcs - -MY_PN=${PN/-/_} -MY_P=${MY_PN}_${PV} - -DESCRIPTION="The Linux Audio Developer's Simple Plugin API" -HOMEPAGE="http://www.ladspa.org/" -SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="" -DEPEND=">=sys-apps/sed-4" - -S="${WORKDIR}/${MY_PN}/src" - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}/${PN}-1.12-fbsd.patch" - sed -i -e "/^CFLAGS/ s:-O3:${CFLAGS}:" \ - "${S}/makefile" || die "sed makefile failed (CFLAGS)" - sed -i -e "s/^CXXFLAGS*/CXXFLAGS = ${CXXFLAGS} \$(INCLUDES) -Wall -fPIC\n#/" \ - "${S}/makefile" || die "sed makefile failed (CXXFLAGS)" - sed -i -e 's:-mkdirhier:mkdir\ -p:g' \ - "${S}/makefile" || die "sed makefile failed (mkdirhier)" - sed -i -e 's:-sndfile-play*:@echo Disabled \0:' \ - "${S}/makefile" || die "sed makefile failed (sound playing tests)" -} - -src_compile() { - emake targets CC=$(tc-getCC) CPP=$(tc-getCXX) || die -} - -src_install() { - emake \ - INSTALL_PLUGINS_DIR="${D}/usr/$(get_libdir)/ladspa" \ - INSTALL_INCLUDE_DIR="${D}/usr/include" \ - INSTALL_BINARY_DIR=$"${D}/usr/bin" \ - install || die "make install failed" - - dohtml ../doc/*.html || die "dohtml failed" - - # Needed for apps like rezound - dodir /etc/env.d - echo "LADSPA_PATH=/usr/$(get_libdir)/ladspa" > "${D}/etc/env.d/60ladspa" -}