From: Ryan Hill Date: Sat, 24 Feb 2007 19:14:50 +0000 (+0000) Subject: - enable building shared libraries and get rid of broken static USE flag X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=91e4588f4e97f7eb3bf2d5a8a2d9430c7f8b1ac7;p=gentoo.git - enable building shared libraries and get rid of broken static USE flag Bug #165774 by Jakub - stop forcing --with-pic - fixed a couple places where CXXFLAGS="-O3 -msse" were still being forced - keep linker from prestripping soundstretch binary - fix building on x86 subarchs that don't have SSE instructions Bug #148695 by Salah Coronya and Sok Ann Yap - removed unnecessary dependencies - danced the night away Package-Manager: portage-2.1.2-r11 --- diff --git a/media-libs/libsoundtouch/ChangeLog b/media-libs/libsoundtouch/ChangeLog index 27b54d512636..37dd57281a51 100644 --- a/media-libs/libsoundtouch/ChangeLog +++ b/media-libs/libsoundtouch/ChangeLog @@ -1,6 +1,22 @@ # ChangeLog for media-libs/libsoundtouch # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/ChangeLog,v 1.12 2007/02/22 02:01:04 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/ChangeLog,v 1.13 2007/02/24 19:14:50 dirtyepic Exp $ + +*libsoundtouch-1.3.1-r1 (24 Feb 2007) + + 24 Feb 2007; Ryan Hill + +files/libsoundtouch-1.3.1-Makefile.patch, metadata.xml, + -libsoundtouch-1.2.1.ebuild, -libsoundtouch-1.3.0.ebuild, + +libsoundtouch-1.3.1-r1.ebuild: + - enable building shared libraries and get rid of broken static USE flag + Bug #165774 by Jakub + - stop forcing --with-pic + - fixed a couple places where CXXFLAGS="-O3 -msse" were still being forced + - keep linker from prestripping soundstretch binary + - fix building on x86 subarchs that don't have SSE instructions + Bug #148695 by Salah Coronya and Sok Ann Yap + - removed unnecessary dependencies + - danced the night away 22 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest index 83f59c810b04..cbc877d68431 100644 --- a/media-libs/libsoundtouch/Manifest +++ b/media-libs/libsoundtouch/Manifest @@ -2,35 +2,30 @@ AUX 1.3.1-respect-cflags.patch 542 RMD160 ad8980911366c78a1c3e9c1a704a90ecf25c5f MD5 cc557dd9d9d5c43d6321af8dfad88087 files/1.3.1-respect-cflags.patch 542 RMD160 ad8980911366c78a1c3e9c1a704a90ecf25c5f41 files/1.3.1-respect-cflags.patch 542 SHA256 7659c33c0978e7c45b40f8429d7e4902dfda2fc012e1b34ac1de6284dd9c49b6 files/1.3.1-respect-cflags.patch 542 +AUX libsoundtouch-1.3.1-Makefile.patch 1689 RMD160 07fba1196a080c0a6db64f56017e31a7852c68df SHA1 7ebc59901c404821b86ca62b97ea0ec86cffdd10 SHA256 984a1e91d09b370ea65ea568f2ef04b5a9eed11e10fccceef36119ea8fd8891b +MD5 54405d9d9bdd3470175d1ea55764bfe1 files/libsoundtouch-1.3.1-Makefile.patch 1689 +RMD160 07fba1196a080c0a6db64f56017e31a7852c68df files/libsoundtouch-1.3.1-Makefile.patch 1689 +SHA256 984a1e91d09b370ea65ea568f2ef04b5a9eed11e10fccceef36119ea8fd8891b files/libsoundtouch-1.3.1-Makefile.patch 1689 DIST soundtouch-1.3.1.tar.gz 314641 RMD160 713526a201e8ba3e3180718ebf2cccdb285a9e1e SHA1 0b63e71dc94c917ce9f48431789a001063884cc8 SHA256 f268fb05200fc55e50e88772765a822628f1a0157a4a57cc9545ac50a0d4fd9c -DIST soundtouch_v1.2.1.zip 338788 RMD160 de794845ae1c3ec1032d17d92c427d0f005d7967 SHA1 cea80c829c5ff13b834e640a949118da54fd4b79 SHA256 f19749aae6dff8ecb2f5cb09cfbc091e63aa27bef642a1115bac6d24dd9b2e09 -DIST soundtouch_v1.3.0.zip 436780 RMD160 ecb7e5ff722590eee845c2366e52ec41ac22a227 SHA1 ac366908c47f9196621046dcb89e2351c21e0c0b SHA256 14b3ebb416fb7edf4cafe680aa4a84d5548c9b2fc0174a00996282d3e29fa09d -EBUILD libsoundtouch-1.2.1.ebuild 1237 RMD160 671341b0ebe3688b1823efef41266403884c6897 SHA1 c8a7ec0fcdff1ce657596a68691ba26bb4d77f43 SHA256 1c534093ff61d6d83c989b472301d888273f44676b28892ff7a9bf5a6d806d42 -MD5 4c1cf63fc0797747fd7f97f7ffaffe14 libsoundtouch-1.2.1.ebuild 1237 -RMD160 671341b0ebe3688b1823efef41266403884c6897 libsoundtouch-1.2.1.ebuild 1237 -SHA256 1c534093ff61d6d83c989b472301d888273f44676b28892ff7a9bf5a6d806d42 libsoundtouch-1.2.1.ebuild 1237 -EBUILD libsoundtouch-1.3.0.ebuild 1275 RMD160 4272a0b80ac8452ca84476b9bc73688e10d14ba3 SHA1 c9f8d8f48d9234f1acc8ae91b77079cdf3299dcf SHA256 0dc5de60b5053a533657dbc58b6ca3e12691bf2a3fc6febde472e9e3de68fe46 -MD5 2fe5d2189a56dfcfb5f63b4e1b1dd31f libsoundtouch-1.3.0.ebuild 1275 -RMD160 4272a0b80ac8452ca84476b9bc73688e10d14ba3 libsoundtouch-1.3.0.ebuild 1275 -SHA256 0dc5de60b5053a533657dbc58b6ca3e12691bf2a3fc6febde472e9e3de68fe46 libsoundtouch-1.3.0.ebuild 1275 +EBUILD libsoundtouch-1.3.1-r1.ebuild 1190 RMD160 9870ac188a57778f3470c2198aca632a36678f03 SHA1 a9bbee21e3d7be4e09560385069239e19adde131 SHA256 91da85db060b90f3b99a537c73e7b2ab972f7da0e2d2cdc0240c862948ffc198 +MD5 3c3541a5938531b53dd4e6638b8c92a0 libsoundtouch-1.3.1-r1.ebuild 1190 +RMD160 9870ac188a57778f3470c2198aca632a36678f03 libsoundtouch-1.3.1-r1.ebuild 1190 +SHA256 91da85db060b90f3b99a537c73e7b2ab972f7da0e2d2cdc0240c862948ffc198 libsoundtouch-1.3.1-r1.ebuild 1190 EBUILD libsoundtouch-1.3.1.ebuild 1430 RMD160 6d3a7846b9237cc82a9d828898c12690397007cb SHA1 55c73ceb9865b4d13044829908c0d11bb905ad5e SHA256 612337eb09edc1188cf875e256dbedf224bc785ff92dcd9968a806e74f91de5a MD5 5ac2d842fc4263f32b6fa888a2c14a05 libsoundtouch-1.3.1.ebuild 1430 RMD160 6d3a7846b9237cc82a9d828898c12690397007cb libsoundtouch-1.3.1.ebuild 1430 SHA256 612337eb09edc1188cf875e256dbedf224bc785ff92dcd9968a806e74f91de5a libsoundtouch-1.3.1.ebuild 1430 -MISC ChangeLog 1716 RMD160 9810d1de75729fb8ca82f2333fca051018b915ff SHA1 0ff4653d81827b1e6394057d6e6ebe4762ce4909 SHA256 b825153b5661d3dab0d6eda955d25a62753b3e9494d74acce190a4a28b7ebae4 -MD5 3a35e3d52cc34a12b7d954cc3761044a ChangeLog 1716 -RMD160 9810d1de75729fb8ca82f2333fca051018b915ff ChangeLog 1716 -SHA256 b825153b5661d3dab0d6eda955d25a62753b3e9494d74acce190a4a28b7ebae4 ChangeLog 1716 -MISC metadata.xml 217 RMD160 906a4752f7a779a157215dc1c5f05e8de62aeb4a SHA1 bb95f672fc20ce8075d27f34c751073cb97849d2 SHA256 cbd33766e3d30e5e0112ad6c57ffc10052659ebb132a0a16fb3462ea8c5a2789 -MD5 2f758c82434233f84f01f80f850a1112 metadata.xml 217 -RMD160 906a4752f7a779a157215dc1c5f05e8de62aeb4a metadata.xml 217 -SHA256 cbd33766e3d30e5e0112ad6c57ffc10052659ebb132a0a16fb3462ea8c5a2789 metadata.xml 217 -MD5 928a7e04de0eb9d5fc14dab7ca501e6f files/digest-libsoundtouch-1.2.1 244 -RMD160 13c58dda4013ba3ef4628fe62e4476b2ee7962be files/digest-libsoundtouch-1.2.1 244 -SHA256 2ba5ef388842059c3a08e6617eb4dd6bc4ac45f56e8c3e84f01b6b5178e2b420 files/digest-libsoundtouch-1.2.1 244 -MD5 58bec0f69d16d1996d40e83a25f77242 files/digest-libsoundtouch-1.3.0 244 -RMD160 3a00ef319ada0056a5a78a30be12fb32bed94658 files/digest-libsoundtouch-1.3.0 244 -SHA256 1ee9f050bcdf732df43465be093ca2048e1fdaeca86698ccff1a89678df1dbec files/digest-libsoundtouch-1.3.0 244 +MISC ChangeLog 2398 RMD160 37bfa69755175211d1ecb59be4071c189e818aba SHA1 2a83ebb429b81af17123e2be986e8df21862f9e1 SHA256 bdb9c627b68324172339fe6d3cecb0496012bef45eedad6ee0da6b5857f7df8f +MD5 7a2eb1dec0634f3f0511ebb277728557 ChangeLog 2398 +RMD160 37bfa69755175211d1ecb59be4071c189e818aba ChangeLog 2398 +SHA256 bdb9c627b68324172339fe6d3cecb0496012bef45eedad6ee0da6b5857f7df8f ChangeLog 2398 +MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369 +MD5 65fa08aea349081b82e9db9ef7c25d91 metadata.xml 159 +RMD160 568344dc99ebe68c2e2d43d268d186757532144d metadata.xml 159 +SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369 metadata.xml 159 MD5 23dc1b2dd1856144bf481f0a3fe9f172 files/digest-libsoundtouch-1.3.1 250 RMD160 e863368c0bb77e9402c3786bb7caac8c1cfc4cbd files/digest-libsoundtouch-1.3.1 250 SHA256 bec03391957b88f453b620869ec8cd94478813bca683679870253f11790562eb files/digest-libsoundtouch-1.3.1 250 +MD5 23dc1b2dd1856144bf481f0a3fe9f172 files/digest-libsoundtouch-1.3.1-r1 250 +RMD160 e863368c0bb77e9402c3786bb7caac8c1cfc4cbd files/digest-libsoundtouch-1.3.1-r1 250 +SHA256 bec03391957b88f453b620869ec8cd94478813bca683679870253f11790562eb files/digest-libsoundtouch-1.3.1-r1 250 diff --git a/media-libs/libsoundtouch/files/digest-libsoundtouch-1.2.1 b/media-libs/libsoundtouch/files/digest-libsoundtouch-1.2.1 deleted file mode 100644 index 42bd57fde37a..000000000000 --- a/media-libs/libsoundtouch/files/digest-libsoundtouch-1.2.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 95bf7e05bcf2842d007f6e1f7580ded0 soundtouch_v1.2.1.zip 338788 -RMD160 de794845ae1c3ec1032d17d92c427d0f005d7967 soundtouch_v1.2.1.zip 338788 -SHA256 f19749aae6dff8ecb2f5cb09cfbc091e63aa27bef642a1115bac6d24dd9b2e09 soundtouch_v1.2.1.zip 338788 diff --git a/media-libs/libsoundtouch/files/digest-libsoundtouch-1.3.0 b/media-libs/libsoundtouch/files/digest-libsoundtouch-1.3.0 deleted file mode 100644 index eb9d5998442d..000000000000 --- a/media-libs/libsoundtouch/files/digest-libsoundtouch-1.3.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5c2d3f54320e5197885b3462f5f35a15 soundtouch_v1.3.0.zip 436780 -RMD160 ecb7e5ff722590eee845c2366e52ec41ac22a227 soundtouch_v1.3.0.zip 436780 -SHA256 14b3ebb416fb7edf4cafe680aa4a84d5548c9b2fc0174a00996282d3e29fa09d soundtouch_v1.3.0.zip 436780 diff --git a/media-libs/libsoundtouch/files/digest-libsoundtouch-1.3.1-r1 b/media-libs/libsoundtouch/files/digest-libsoundtouch-1.3.1-r1 new file mode 100644 index 000000000000..4cc1082213e1 --- /dev/null +++ b/media-libs/libsoundtouch/files/digest-libsoundtouch-1.3.1-r1 @@ -0,0 +1,3 @@ +MD5 5e0185e81dbba2f2eed8581b7664ab04 soundtouch-1.3.1.tar.gz 314641 +RMD160 713526a201e8ba3e3180718ebf2cccdb285a9e1e soundtouch-1.3.1.tar.gz 314641 +SHA256 f268fb05200fc55e50e88772765a822628f1a0157a4a57cc9545ac50a0d4fd9c soundtouch-1.3.1.tar.gz 314641 diff --git a/media-libs/libsoundtouch/files/libsoundtouch-1.3.1-Makefile.patch b/media-libs/libsoundtouch/files/libsoundtouch-1.3.1-Makefile.patch new file mode 100644 index 000000000000..9e335761fd09 --- /dev/null +++ b/media-libs/libsoundtouch/files/libsoundtouch-1.3.1-Makefile.patch @@ -0,0 +1,40 @@ +diff -Naur soundtouch-1.3.1-orig/source/example/bpm/Makefile.am soundtouch-1.3.1/source/example/bpm/Makefile.am +--- soundtouch-1.3.1-orig/source/example/bpm/Makefile.am 2006-03-19 06:08:36.000000000 -0600 ++++ soundtouch-1.3.1/source/example/bpm/Makefile.am 2007-02-24 11:52:13.000000000 -0600 +@@ -33,7 +33,7 @@ + + + # other compiler flags to add +-AM_CXXFLAGS=-O3 -I../../../include ++AM_CXXFLAGS=-I../../../include + + # other linking flags to add + #libBPM_la_LIBADD= +diff -Naur soundtouch-1.3.1-orig/source/example/SoundStretch/Makefile.am soundtouch-1.3.1/source/example/SoundStretch/Makefile.am +--- soundtouch-1.3.1-orig/source/example/SoundStretch/Makefile.am 2006-03-19 06:08:36.000000000 -0600 ++++ soundtouch-1.3.1/source/example/SoundStretch/Makefile.am 2007-02-24 11:51:52.000000000 -0600 +@@ -44,10 +44,10 @@ + soundstretch_LDADD=../../SoundTouch/libSoundTouch.la ../bpm/libBPM.la -lm + + ## linker flags +-soundstretch_LDFLAGS=-s ++soundstretch_LDFLAGS= + + ## additional compiler flags +-soundstretch_CXXFLAGS=-O3 -I../bpm ++soundstretch_CXXFLAGS=-I../bpm + + #clean-local: + # -rm -f additional-files-to-remove-on-make-clean +diff -Naur soundtouch-1.3.1-orig/source/SoundTouch/Makefile.am soundtouch-1.3.1/source/SoundTouch/Makefile.am +--- soundtouch-1.3.1-orig/source/SoundTouch/Makefile.am 2006-03-19 06:08:36.000000000 -0600 ++++ soundtouch-1.3.1/source/SoundTouch/Makefile.am 2007-02-24 11:50:21.000000000 -0600 +@@ -35,7 +35,7 @@ + + # ??? test for -fcheck-new in configure.ac + # other compiler flags to add +-AM_CXXFLAGS=-O3 -msse -fcheck-new -I../../include ++AM_CXXFLAGS=-fcheck-new -I../../include + + # other linking flags to add + #libSoundTouch_la_LIBADD= diff --git a/media-libs/libsoundtouch/libsoundtouch-1.2.1.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.2.1.ebuild deleted file mode 100644 index 60b7c0eeef30..000000000000 --- a/media-libs/libsoundtouch/libsoundtouch-1.2.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.2.1.ebuild,v 1.6 2004/11/17 06:31:00 eradicator Exp $ - -IUSE="" - -S="${WORKDIR}/SoundTouch-${PV}" - -DESCRIPTION="Audio processing library for changing the tempo, pitch and playback rates." -HOMEPAGE="http://sky.prohosting.com/oparviai/soundtouch/" -SRC_URI="http://sky.prohosting.com/oparviai/soundtouch/soundtouch_v${PV}.zip" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~ppc-macos" - -RDEPEND="virtual/libc" -DEPEND="app-arch/unzip" - -src_unpack() { - unpack ${A} || die "unpack failed" - cd ${S} - - # change sample type from integer to float (more accurate) - sed -i -e "s|#define INTEGER_SAMPLES|//#define INTEGER_SAMPLES|g" \ - -e "s|//#define FLOAT_SAMPLES|#define FLOAT_SAMPLES|g" include/STTypes.h -} - -src_compile() { - econf $myconf || die "./configure failed" - # fixes C(XX)FLAGS from configure, so we can use *ours* - emake CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" pkgdocdir="/usr/share/doc/${PF}" install || die - rm -f ${D}/usr/share/doc/${PF}/COPYING.TXT # remove obsolete LICENCE file -} diff --git a/media-libs/libsoundtouch/libsoundtouch-1.3.0.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.3.0.ebuild deleted file mode 100644 index e5e9f11aab81..000000000000 --- a/media-libs/libsoundtouch/libsoundtouch-1.3.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.3.0.ebuild,v 1.1 2005/05/19 02:47:17 kito Exp $ - -IUSE="static" - -S="${WORKDIR}/SoundTouch-${PV}" - -DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates." -HOMEPAGE="http://sky.prohosting.com/oparviai/soundtouch/" -SRC_URI="http://sky.prohosting.com/oparviai/soundtouch/soundtouch_v${PV}.zip" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos" - -RDEPEND="virtual/libc" -DEPEND="app-arch/unzip" - -src_unpack() { - unpack ${A} || die "unpack failed" - cd ${S} - - # change sample type from integer to float (more accurate) - sed -i -e "s|#define INTEGER_SAMPLES|//#define INTEGER_SAMPLES|g" \ - -e "s|//#define FLOAT_SAMPLES|#define FLOAT_SAMPLES|g" include/STTypes.h -} - -src_compile() { - econf $myconf \ - $(use_enable static) \ - --with-pic || die "./configure failed" - # fixes C(XX)FLAGS from configure, so we can use *ours* - emake CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" pkgdocdir="/usr/share/doc/${PF}" install || die - rm -f ${D}/usr/share/doc/${PF}/COPYING.TXT # remove obsolete LICENCE file -} diff --git a/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild new file mode 100644 index 000000000000..f9a7e36c0bee --- /dev/null +++ b/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild,v 1.1 2007/02/24 19:14:50 dirtyepic Exp $ + +inherit autotools + +IUSE="sse" + +MY_P="${P/lib}" + +DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates." +HOMEPAGE="http://www.surina.net/soundtouch/" +SRC_URI="http://www.surina.net/soundtouch/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86" + +DEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-Makefile.patch + eautoreconf + + # Bug #148695 + use sse \ + || sed -i -e '/^.*#define ALLOW_OPTIMIZATIONS.*$/d' "${S}"/include/STTypes.h +} + +src_compile() { + econf $myconf \ + --enable-shared \ + --disable-integer-samples \ + || die "./configure failed" + # fixes C(XX)FLAGS from configure, so we can use *ours* + emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" pkgdocdir="/usr/share/doc/${PF}" install || die + rm -f ${D}/usr/share/doc/${PF}/COPYING.TXT # remove obsolete LICENCE file +} diff --git a/media-libs/libsoundtouch/metadata.xml b/media-libs/libsoundtouch/metadata.xml index d8913263a79e..ae573a60407f 100644 --- a/media-libs/libsoundtouch/metadata.xml +++ b/media-libs/libsoundtouch/metadata.xml @@ -1,8 +1,5 @@ -sound - -sound@gentoo.org - + sound