diff options
| -rw-r--r-- | media-sound/lame/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/lame/Manifest | 22 | ||||
| -rw-r--r-- | media-sound/lame/files/lame-3.98-shared-frontend.patch | 13 | ||||
| -rw-r--r-- | media-sound/lame/files/lame-3.98.2-get_audio.patch | 25 | ||||
| -rw-r--r-- | media-sound/lame/lame-3.98.4.ebuild | 62 | ||||
| -rw-r--r-- | media-sound/lame/lame-3.99.4.ebuild | 60 |
6 files changed, 14 insertions, 175 deletions
diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog index 47dfd32893a5..67adc8116c99 100644 --- a/media-sound/lame/ChangeLog +++ b/media-sound/lame/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/lame # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.147 2012/03/02 21:13:40 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.148 2012/03/02 21:14:52 ssuominen Exp $ + + 02 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> + -files/lame-3.98.2-get_audio.patch, -lame-3.98.4.ebuild, + -files/lame-3.98-shared-frontend.patch, -lame-3.99.4.ebuild: + old 02 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> lame-3.99.3.ebuild: ppc/ppc64 stable wrt #398353 diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest index ced8233f5a58..606ef49ae6a2 100644 --- a/media-sound/lame/Manifest +++ b/media-sound/lame/Manifest @@ -3,26 +3,20 @@ Hash: SHA1 AUX lame-3.96-ccc.patch 809 RMD160 7fc4e6e5c005356a028e26638804cffc87e1543e SHA1 6734fd6973cac46b43453db65acb806e6e556ae3 SHA256 2322bdc40007993d77a31f5c9c0edf8af550de48b1ee3a2dbb0f6acea6c27197 AUX lame-3.98-gtk-path.patch 8519 RMD160 920e617069a19d962fd9b325097f7dcc6e40e12b SHA1 fd553090e6b3494f8e881c0f8ac02ce926b6d7db SHA256 65e345a2af2547592910aaf02775b2fb091c23801a4e1bc50d2d872cc414656b -AUX lame-3.98-shared-frontend.patch 412 RMD160 027a89f3d05c0656e39ce70d4a9a0d527b219ff3 SHA1 f27c5d9bd0939343f2e184d26259e0622eb2f3f4 SHA256 caffc69c15f31a8b459aa1f2bea92faa1ea481b34c3f47895a65ae484449422e -AUX lame-3.98.2-get_audio.patch 901 RMD160 caf7367871ae8e9ba7c9e023a06712bdce77fb2b SHA1 385266e642cfe1e9707a1008f29cf0c9055d733c SHA256 9caf9f8fe2c515c8c331598b7e6d595515c597d8f6e81b8626f2bdeb003ed7ff -DIST lame-3.98.4-r1.tar.gz 1336025 RMD160 4eb2ae6f2ec7b30115c1265bcbf6f14906502e9b SHA1 eb29c7c937b9b7330ca979dfabc25ab2a31b9db2 SHA256 ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8 DIST lame-3.99.3.tar.gz 1443843 RMD160 4f5f824fbc88d78904d90b396e8a450626738d18 SHA1 0d9acaed7737d5e6b51096dc0b35322d319f463d SHA256 d4ea3c8d00d2cc09338425a25dbfeb4d587942cb3c83a677c09aeb1e850c74cf -DIST lame-3.99.4.tar.gz 1444640 RMD160 da3f534b8ab0f90fdea987a1bf33f1767295bc6d SHA1 a5ef2b8a2e0c1354c8b340fd38b454c3016e2902 SHA256 41431a029e40b1d4f5c1697e942fb74c8ab09855c880ce0f439cd782b7058ec4 DIST lame-3.99.5.tar.gz 1445348 RMD160 8a0990af918b635cc79eb27a3beafc6c0ee13a9f SHA1 03a0bfa85713adcc6b3383c12e2cc68a9cfbf4c4 SHA256 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff -EBUILD lame-3.98.4.ebuild 1816 RMD160 fbc4564ad4789bfbf144a1334124656cc6d4d33a SHA1 c0a3367eb175e0369f0fecccdce2e40df8ced0c5 SHA256 e5a184a2eed213a1b41c184d1550661a83a933ceae242c9e5e11af90546f799f EBUILD lame-3.99.3.ebuild 1725 RMD160 ce624e5789f05c0b1e87cfadba501cb2af4dd5ab SHA1 25756073a4a437d7140802c326e90ff3d583edca SHA256 8bdfb7fbdf58e5a3d716d53fabe3e2c77e0619d094a57075fa705753cc087e49 -EBUILD lame-3.99.4.ebuild 1738 RMD160 08ad6ac180c9a45c6d6da043835dcbf29b24db76 SHA1 05448793bde609cf736803929ccf7f77197ad59d SHA256 9deef1d4eb853160bd17515dd15af9e1a84e9a8c5583ea2f7615f5be663f53e8 EBUILD lame-3.99.5.ebuild 1737 RMD160 358edf10650b8c78cddccb2fad6923e1f156f530 SHA1 fcf3456d3e1ea21ba9726bf4af70615ac352e7bc SHA256 24c42ea64a9982244a92465702205c8ffae253d9dfa29f059d802eb327fe61ea -MISC ChangeLog 19576 RMD160 68c0e72a0cc0a77f7390b12fd7732bf5676d317b SHA1 c529b4381fa3ac341d6064778d39662c5fc611b7 SHA256 95d6fa0f2b3f12545dbe223b174e2f83df70f22f5704b7e1e9f859005c89b156 +MISC ChangeLog 19759 RMD160 285b358a052f2855d21e398d0b1ed37d7b876539 SHA1 9a4b214c0778a131c401dab898e9ac7390b6c764 SHA256 acc150833f9844131c73267e8a0df9aabaf7e41f15cde5f8ff90c83cc968508f MISC metadata.xml 264 RMD160 a6be36fe4dffbf9280e34fafcf40571d0f960580 SHA1 7e6bff4996ab638c7e04e31197d3b45f9752c00f SHA256 69ff3c8176be87b9e058cf261280c392e026742616602914b8ee3e3b6eaa2280 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJPUTfUAAoJEEdUh39IaPFNVWQH/2HJtIwQFIJ9cJA+AUQu3VYw -OTm0GBpm3MW0aSG5HW0/KehgJXPZZv6wq0E62jwQUX0+rHri+whcUzyaTYBQ/iZy -ayzcyb1FuQPlzgcsT1924JtsOAE+5B3781HvpzZxFDfjhF5ARTWlfqfFu8kV1pQS -Ud/nleJey4q+QnhBEj02aObENPC58tJCDjzLjcaLrYhxXNDZRAOjubkrhrpXqclj -IqU9RmMMdRJsAd3xliSFx4dlGRamolOGgmG9BdmOdWPGHmt2Apz09dCGTq54eNxg -VzimM3iKtdObA9L/maReE+VSM9JF3XmQ/5VMmsEF9iyXMPEqa3ZUbH409SQZ2ZI= -=lgcx +iQEcBAEBAgAGBQJPUTgbAAoJEEdUh39IaPFNDFIIAJIAeGmY69O/gsgB3zdM6N4C +rLVVzE3EqS/rEdNMrJbvcEkWmLzUV209WihBuKuMV0cQUUXa+Xj1GcFOKgtnjNOq +vkkVp3W7uAamFA0XtrzQmoyJlOnQ0wkr5UdhQsqI7JrnZeF4Z6xEHEuZr8xQpq+8 +WIdHGPfdZLr/xyFX3SdhpKTyNq87qAZ4WrX/KQgK03KL74A9R8ZR6I8hwAzTXJ5V +ELtKG9W3hxdH4CIakdsOoLjQMBNvthNSNCY7F4CN75o+Pwcy3GO1KfY8lGCAtoyS +GDVnO2f1KD+EakOi8DIrMJjKS0yvZdnj2a8/NXGntv/WiKLTpS9aWGzSj2OqnUg= +=oEdD -----END PGP SIGNATURE----- diff --git a/media-sound/lame/files/lame-3.98-shared-frontend.patch b/media-sound/lame/files/lame-3.98-shared-frontend.patch deleted file mode 100644 index a4de9062f78e..000000000000 --- a/media-sound/lame/files/lame-3.98-shared-frontend.patch +++ /dev/null @@ -1,13 +0,0 @@ -The frontened tries to link staticly, but we prefer shared libs - ---- frontend/Makefile.am -+++ frontend/Makefile.am -@@ -52,7 +52,7 @@ - endif - - CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@ --LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static -+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ - - INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir) - diff --git a/media-sound/lame/files/lame-3.98.2-get_audio.patch b/media-sound/lame/files/lame-3.98.2-get_audio.patch deleted file mode 100644 index 9194b1903cc8..000000000000 --- a/media-sound/lame/files/lame-3.98.2-get_audio.patch +++ /dev/null @@ -1,25 +0,0 @@ -Read and write from std* when sndfile is used - ---- frontend/get_audio.c -+++ frontend/get_audio.c -@@ -605,12 +605,17 @@ - } - #endif - #ifdef HAVE_MPGLIB -- if ((musicin = fopen(lpszFileName, "rb")) == NULL) { -+ if (!strcmp(lpszFileName, "-")) { -+ lame_set_stream_binary_mode(musicin = stdin); /* Read from standard input. */ -+ } -+ else { -+ if ((musicin = fopen(lpszFileName, "rb")) == NULL) { - if (silent < 10) { -- error_printf("Could not find \"%s\".\n", lpszFileName); -+ error_printf("Could not find \"%s\".\n", lpszFileName); - } - exit(1); -- } -+ } -+ } - if (-1 == lame_decode_initfile(musicin, &mp3input_data, enc_delay, enc_padding)) { - if (silent < 10) { - error_printf("Error reading headers in mp3 input file %s.\n", lpszFileName); diff --git a/media-sound/lame/lame-3.98.4.ebuild b/media-sound/lame/lame-3.98.4.ebuild deleted file mode 100644 index 8ed20b5810c4..000000000000 --- a/media-sound/lame/lame-3.98.4.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.4.ebuild,v 1.15 2011/11/28 17:59:49 ssuominen Exp $ - -EAPI=3 -inherit autotools eutils - -DESCRIPTION="LAME Ain't an MP3 Encoder" -HOMEPAGE="http://lame.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz -> ${P}-r1.tar.gz" #346155 - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug mmx mp3rtp sndfile static-libs" - -RDEPEND=">=sys-libs/ncurses-5.2 - sndfile? ( >=media-libs/libsndfile-1.0.2 )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - mmx? ( dev-lang/nasm )" - -RESTRICT="mirror" #346155 - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.98-shared-frontend.patch \ - "${FILESDIR}"/${PN}-3.96-ccc.patch \ - "${FILESDIR}"/${PN}-3.98-gtk-path.patch \ - "${FILESDIR}"/${PN}-3.98.2-get_audio.patch - - mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm - - sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die - - AT_M4DIR="${S}" eautoreconf - epunt_cxx #74498 -} - -src_configure() { - local myconf - use sndfile && myconf="--with-fileio=sndfile" - - econf \ - --disable-dependency-tracking \ - $(use_enable static-libs static) \ - $(use_enable debug debug norm) \ - $(use_enable mmx nasm) \ - --disable-mp3x \ - $(use_enable mp3rtp) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" install || die - dobin misc/mlame || die - - dodoc API ChangeLog HACKING README* STYLEGUIDE TODO USAGE || die - dohtml misc/lameGUI.html Dll/LameDLLInterface.htm || die - - find "${ED}" -name '*.la' -exec rm -f '{}' + -} diff --git a/media-sound/lame/lame-3.99.4.ebuild b/media-sound/lame/lame-3.99.4.ebuild deleted file mode 100644 index 1f1668a3d694..000000000000 --- a/media-sound/lame/lame-3.99.4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.99.4.ebuild,v 1.1 2012/02/04 16:52:02 ssuominen Exp $ - -EAPI=4 -inherit autotools eutils - -DESCRIPTION="LAME Ain't an MP3 Encoder" -HOMEPAGE="http://lame.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug mmx mp3rtp sndfile static-libs" - -RDEPEND=">=sys-libs/ncurses-5.7-r7 - sndfile? ( >=media-libs/libsndfile-1.0.2 )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - mmx? ( dev-lang/nasm )" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.96-ccc.patch \ - "${FILESDIR}"/${PN}-3.98-gtk-path.patch - - mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm - - sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die - - use mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879 - - AT_M4DIR=${S} eautoreconf - epunt_cxx #74498 -} - -src_configure() { - local myconf - use mmx && myconf+="--enable-nasm" #361879 - use sndfile && myconf+=" --with-fileio=sndfile" - - econf \ - $(use_enable static-libs static) \ - $(use_enable debug debug norm) \ - --disable-mp3x \ - $(use_enable mp3rtp) \ - --enable-dynamic-frontends \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" install - dobin misc/mlame - - dodoc API ChangeLog HACKING README STYLEGUIDE TODO USAGE - dohtml misc/lameGUI.html Dll/LameDLLInterface.htm - - find "${ED}" -name '*.la' -exec rm -f {} + -} |