diff options
Diffstat (limited to 'media-sound')
22 files changed, 2150 insertions, 0 deletions
diff --git a/media-sound/gsm/ChangeLog b/media-sound/gsm/ChangeLog new file mode 100644 index 000000000..5f7cea42c --- /dev/null +++ b/media-sound/gsm/ChangeLog @@ -0,0 +1,115 @@ +# ChangeLog for media-sound/gsm +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/ChangeLog,v 1.36 2008/12/22 14:20:05 armin76 Exp $ + + 22 Dec 2008; Raúl Porcel <armin76@gentoo.org> gsm-1.0.12-r1.ebuild: + arm/ia64 stable wrt #245285 + + 10 Nov 2008; Raúl Porcel <armin76@gentoo.org> gsm-1.0.12-r1.ebuild: + Add ~ia64 wrt #241908 + + 11 May 2008; <solar@gentoo.org> gsm-1.0.12-r1.ebuild: + - cross compile fixes and keyworded for ~arm + + 22 Mar 2008; Joseph Jezak <josejx@gentoo.org> gsm-1.0.12-r1.ebuild: + Marked ppc stable. + + 21 Mar 2008; Brent Baude <ranger@gentoo.org> gsm-1.0.12-r1.ebuild: + stable ppc64, bug 213686 + + 20 Mar 2008; Raúl Porcel <armin76@gentoo.org> gsm-1.0.12-r1.ebuild: + alpha/sparc/x86 stable wrt #213686 + + 20 Mar 2008; Jeroen Roovers <jer@gentoo.org> gsm-1.0.12-r1.ebuild: + Stable for HPPA (bug #213686). + + 01 Jan 2008; Brent Baude <ranger@gentoo.org> gsm-1.0.12-r1.ebuild: + Marking gsm-1.0.12-r1 ~ppc64 for bug 192736 + + 26 Dec 2007; Raúl Porcel <armin76@gentoo.org> gsm-1.0.12-r1.ebuild: + Add ~alpha wrt #192736, thanks to Tobias Klausmann for testing + + 17 Dec 2007; Jeroen Roovers <jer@gentoo.org> gsm-1.0.12-r1.ebuild: + Marked ~hppa (bug #192736). + + 16 Dec 2007; Alexis Ballier <aballier@gentoo.org> gsm-1.0.12-r1.ebuild: + add ~x86-fbsd, its fine here + + 15 Dec 2007; Samuli Suominen <drac@gentoo.org> gsm-1.0.12-r1.ebuild: + Marking amd64 stable to get shared library for linking. + + 15 Dec 2007; Samuli Suominen <drac@gentoo.org> gsm-1.0.12-r1.ebuild: + Symlink ../gsm/gsm.h to /usr/include/libgsm/gsm.h so net-im/ekg2 finds it. + +*gsm-1.0.12-r1 (15 Dec 2007) + + 15 Dec 2007; Samuli Suominen <drac@gentoo.org> + +files/gsm-1.0.12-shared.patch, +gsm-1.0.12-r1.ebuild: + Build objects twice, once -fPIC for shared and once for static. + + 25 Nov 2007; Brent Baude <ranger@gentoo.org> gsm-1.0.12.ebuild: + Marking gsm-1.0.12 ppc for bug 199475 + + 23 Nov 2007; Raúl Porcel <armin76@gentoo.org> gsm-1.0.12.ebuild: + sparc stable wrt #199475 + + 21 Nov 2007; Christian Faulhammer <opfer@gentoo.org> gsm-1.0.12.ebuild: + stable x86, bug 199475 + + 19 Nov 2007; Samuli Suominen <drac@gentoo.org> gsm-1.0.12.ebuild: + amd64 stable wrt #199475 + + 18 Sep 2007; Samuli Suominen <drac@gentoo.org> gsm-1.0.12.ebuild: + Install include to /usr/include/gsm instead of /usr/include wrt #192481. + + 16 Sep 2007; Samuli Suominen <drac@gentoo.org> gsm-1.0.12.ebuild: + Fix library installation on multilib systems wrt #192716. + +*gsm-1.0.12 (19 Aug 2007) + + 19 Aug 2007; Samuli Suominen <drac@gentoo.org> + +files/gsm-1.0.12-64bit.patch, +files/gsm-1.0.12-memcpy.patch, + +gsm-1.0.12.ebuild: + Version bump. + +*gsm-1.0.10-r1 (09 Mar 2007) + + 09 Mar 2007; Steve Dibb <beandog@gentoo.org> +gsm-1.0.10-r1.ebuild: + Compile issues, apply amd64 patch, bug 138908 + + 22 Feb 2007; Piotr JaroszyÅ„ski <peper@gentoo.org> ChangeLog: + Transition to Manifest2. + + 07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> gsm-1.0.10.ebuild: + Drop virtual/libc dependency. Respect CC. + + 01 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> + +files/gsm-1.0.10-amd64.diff, gsm-1.0.10.ebuild: + added a patch for amd64, fixes #86593 + + 18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> gsm-1.0.10.ebuild: + Stable sparc. + + 22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> gsm-1.0.10.ebuild: + Added to ~sparc. + + 14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gsm-1.0.10.ebuild: + Stable amd64. + + 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gsm-1.0.10.ebuild: + virtual/glibc -> virtual/libc + + 20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gsm-1.0.10.ebuild: + Added IUSE. + + 15 Feb 2004; David Holm <dholm@gentoo.org> gsm-1.0.10.ebuild: + Added to ~ppc. + + 02 Oct 2003; Brad House <brad_mssw@gentoo.org> gsm-1.0.10.ebuild: + add ~amd64 flag + +*gsm-1.0.10 (23 Jul 2002) + + 23 Jul 2002; Arcady Genkin <agenkin@thpoon.com> gsm-1.0.10 : + + Initial version, submitted by Justin Huff <jjhuff@mspin.net>. diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest new file mode 100644 index 000000000..ff9b1a0a1 --- /dev/null +++ b/media-sound/gsm/Manifest @@ -0,0 +1,7 @@ +AUX gsm-1.0.12-64bit.patch 591 RMD160 fe48ec8dce98db335118ae699a2bb8d6d10931bf SHA1 949ec26ccd9aaa9a7f09806c7ae0a71a3724afe3 SHA256 1204cf390608e866a7aa06099998a754afdf33095b89ea4bcd0ddeeb699bba84 +AUX gsm-1.0.12-memcpy.patch 301 RMD160 21c1e4c83046bff547f2bae1b14758dfeeca4a3b SHA1 fe6d55433de5775ff7ec2f4e5b8e65b1375b0390 SHA256 3d6637db82d739c89cb4127bd28ce9d5b97cee7f27862943952d130a0fb6e9fe +AUX gsm-1.0.12-shared.patch 3713 RMD160 6d9cd3e0e6eb7354900b990aa6e195cc12e8e733 SHA1 d2e08db4e95fa96661e989b59318e3eca06e01d2 SHA256 30661e6f947e74ce2f1c42452d666e76175e18269490d5adfa695bad3cf4ff47 +DIST gsm-1.0.12.tar.gz 62156 RMD160 c780aa1405f5029aaacf96183577c6720691dd31 SHA1 69c22bdda35871d223affdac09115b6abb0932b1 SHA256 dde4e62e4ce35af29a15d26beca2fc0f98c0219553927453425cda01f16e4de4 +EBUILD gsm-1.0.12-r1.ebuild 1657 RMD160 442cae9d6cf14f02eec9d5cffd17a3c5fac8d805 SHA1 bb04ed3df0265f02641a952ac1acea76c03207aa SHA256 b28666656b3d9db9d1b29fd5fac85baec6332723f8baffe350e1a48596229ed6 +MISC ChangeLog 4009 RMD160 2c6824ae8813cefde2206fa76b52ad416bcb7c31 SHA1 58eac726b6b9b6d8ca823611b4affed01fc8db16 SHA256 93db77836ec28e7e5d7359cc3d3735878d0892d7466fb3ce1b8d5edfe695b213 +MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b diff --git a/media-sound/gsm/files/gsm-1.0.12-64bit.patch b/media-sound/gsm/files/gsm-1.0.12-64bit.patch new file mode 100644 index 000000000..bc28c5099 --- /dev/null +++ b/media-sound/gsm/files/gsm-1.0.12-64bit.patch @@ -0,0 +1,16 @@ +diff -ur gsm-1.0-pl12.orig/inc/private.h gsm-1.0-pl12/inc/private.h +--- gsm-1.0-pl12.orig/inc/private.h 2006-04-26 22:17:01.000000000 +0300 ++++ gsm-1.0-pl12/inc/private.h 2007-08-19 12:23:02.000000000 +0300 +@@ -10,10 +10,10 @@ + #define PRIVATE_H + + typedef short word; /* 16 bit signed int */ +-typedef long longword; /* 32 bit signed int */ ++typedef int longword; /* 32 bit signed int */ + + typedef unsigned short uword; /* unsigned word */ +-typedef unsigned long ulongword; /* unsigned longword */ ++typedef unsigned int ulongword; /* unsigned longword */ + + struct gsm_state { + diff --git a/media-sound/gsm/files/gsm-1.0.12-memcpy.patch b/media-sound/gsm/files/gsm-1.0.12-memcpy.patch new file mode 100644 index 000000000..fc3c1ce23 --- /dev/null +++ b/media-sound/gsm/files/gsm-1.0.12-memcpy.patch @@ -0,0 +1,11 @@ +diff -ur gsm-1.0-pl12.orig/src/code.c gsm-1.0-pl12/src/code.c +--- gsm-1.0-pl12.orig/src/code.c 2006-04-26 22:16:50.000000000 +0300 ++++ gsm-1.0-pl12/src/code.c 2007-08-19 12:18:01.000000000 +0300 +@@ -8,6 +8,7 @@ + + #include "config.h" + ++#include <string.h> + + #ifdef HAS_STDLIB_H + #include <stdlib.h> diff --git a/media-sound/gsm/files/gsm-1.0.12-shared.patch b/media-sound/gsm/files/gsm-1.0.12-shared.patch new file mode 100644 index 000000000..49e56c230 --- /dev/null +++ b/media-sound/gsm/files/gsm-1.0.12-shared.patch @@ -0,0 +1,151 @@ +diff -ur gsm-1.0-pl12.orig/Makefile gsm-1.0-pl12/Makefile +--- gsm-1.0-pl12.orig/Makefile 2006-04-26 22:14:26.000000000 +0300 ++++ gsm-1.0-pl12/Makefile 2007-12-15 18:47:22.000000000 +0200 +@@ -96,7 +96,7 @@ + # Other tools + + SHELL = /bin/sh +-LN = ln ++LN = ln -s + BASENAME = basename + AR = ar + ARFLAGS = cr +@@ -140,6 +140,7 @@ + # Targets + + LIBGSM = $(LIB)/libgsm.a ++LIBGSMSO= $(LIB)/libgsm.so + + TOAST = $(BIN)/toast + UNTOAST = $(BIN)/untoast +@@ -203,24 +204,43 @@ + + # Object files + +-GSM_OBJECTS = $(SRC)/add.o \ +- $(SRC)/code.o \ +- $(SRC)/debug.o \ +- $(SRC)/decode.o \ +- $(SRC)/long_term.o \ +- $(SRC)/lpc.o \ +- $(SRC)/preprocess.o \ +- $(SRC)/rpe.o \ +- $(SRC)/gsm_destroy.o \ +- $(SRC)/gsm_decode.o \ +- $(SRC)/gsm_encode.o \ +- $(SRC)/gsm_explode.o \ +- $(SRC)/gsm_implode.o \ +- $(SRC)/gsm_create.o \ +- $(SRC)/gsm_print.o \ +- $(SRC)/gsm_option.o \ +- $(SRC)/short_term.o \ +- $(SRC)/table.o ++STATIC_GSM_OBJECTS = $(SRC)/add.o \ ++ $(SRC)/code.o \ ++ $(SRC)/debug.o \ ++ $(SRC)/decode.o \ ++ $(SRC)/long_term.o \ ++ $(SRC)/lpc.o \ ++ $(SRC)/preprocess.o \ ++ $(SRC)/rpe.o \ ++ $(SRC)/gsm_destroy.o \ ++ $(SRC)/gsm_decode.o \ ++ $(SRC)/gsm_encode.o \ ++ $(SRC)/gsm_explode.o \ ++ $(SRC)/gsm_implode.o \ ++ $(SRC)/gsm_create.o \ ++ $(SRC)/gsm_print.o \ ++ $(SRC)/gsm_option.o \ ++ $(SRC)/short_term.o \ ++ $(SRC)/table.o ++ ++SHARED_GSM_OBJECTS = $(SRC)/add.lo \ ++ $(SRC)/code.lo \ ++ $(SRC)/debug.lo \ ++ $(SRC)/decode.lo \ ++ $(SRC)/long_term.lo \ ++ $(SRC)/lpc.lo \ ++ $(SRC)/preprocess.lo \ ++ $(SRC)/rpe.lo \ ++ $(SRC)/gsm_destroy.lo \ ++ $(SRC)/gsm_decode.lo \ ++ $(SRC)/gsm_encode.lo \ ++ $(SRC)/gsm_explode.lo \ ++ $(SRC)/gsm_implode.lo \ ++ $(SRC)/gsm_create.lo \ ++ $(SRC)/gsm_print.lo \ ++ $(SRC)/gsm_option.lo \ ++ $(SRC)/short_term.lo \ ++ $(SRC)/table.lo + + TOAST_OBJECTS = $(SRC)/toast.o \ + $(SRC)/toast_lin.o \ +@@ -228,7 +248,7 @@ + $(SRC)/toast_alaw.o \ + $(SRC)/toast_audio.o + +-OBJECTS = $(GSM_OBJECTS) $(TOAST_OBJECTS) ++OBJECTS = $(STATIC_GSM_OBJECTS) $(SHARED_GSM_OBJECTS) $(TOAST_OBJECTS) + + # Manuals + +@@ -277,9 +297,12 @@ + $(CC) $(CFLAGS) $? + @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 + ++%.lo: %.c ++ $(CC) $(CFLAGS) -fPIC -c $< -o $@ ++ + # Target rules + +-all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) ++all: $(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST) + @-echo $(ROOT): Done. + + tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result +@@ -299,24 +322,29 @@ + + # The basic API: libgsm + +-$(LIBGSM): $(LIB) $(GSM_OBJECTS) ++$(LIBGSMSO): $(LIB) $(SHARED_GSM_OBJECTS) ++ $(LD) -o $@.1.0.12 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(SHARED_GSM_OBJECTS) -lc ++ ln -fs libgsm.so.1.0.12 lib/libgsm.so.1 ++ ln -fs libgsm.so.1.0.12 lib/libgsm.so ++ ++$(LIBGSM): $(LIB) $(STATIC_GSM_OBJECTS) + -rm $(RMFLAGS) $(LIBGSM) +- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) ++ $(AR) $(ARFLAGS) $(LIBGSM) $(STATIC_GSM_OBJECTS) + $(RANLIB) $(LIBGSM) + + + # Toast, Untoast and Tcat -- the compress-like frontends to gsm. + + $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) +- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) ++ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB) + + $(UNTOAST): $(BIN) $(TOAST) + -rm $(RMFLAGS) $(UNTOAST) +- $(LN) $(TOAST) $(UNTOAST) ++ $(LN) toast $(UNTOAST) + + $(TCAT): $(BIN) $(TOAST) + -rm $(RMFLAGS) $(TCAT) +- $(LN) $(TOAST) $(TCAT) ++ $(LN) toast $(TCAT) + + + # The local bin and lib directories +@@ -426,7 +454,9 @@ + + clean: semi-clean + -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ +- $(TOAST) $(TCAT) $(UNTOAST) \ ++ $(LIBGSMSO) $(LIB)/libgsm.so.1.0.12 \ ++ $(LIB)libgsm.so.1 \ ++ $(TOAST) $(TCAT) $(UNTOAST) \ + $(ROOT)/gsm-1.0.tar.Z + + diff --git a/media-sound/gsm/gsm-1.0.12-r1.ebuild b/media-sound/gsm/gsm-1.0.12-r1.ebuild new file mode 100644 index 000000000..75a3f89a5 --- /dev/null +++ b/media-sound/gsm/gsm-1.0.12-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.12-r1.ebuild,v 1.14 2008/12/22 14:20:05 armin76 Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs versionator multilib-native + +DESCRIPTION="Lossy speech compression library and tool." +HOMEPAGE="http://kbs.cs.tu-berlin.de/~jutta/toast.html" +SRC_URI="http://www.cs.tu-berlin.de/~jutta/${PN}/${P}.tar.gz" + +LICENSE="OSI-Approved" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="" + +S="${WORKDIR}"/${PN}-"$(replace_version_separator 2 '-pl' )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-shared.patch + epatch "${FILESDIR}"/${P}-memcpy.patch + epatch "${FILESDIR}"/${P}-64bit.patch +} + +multilib-native_src_compile_internal() { + # From upstream Makefile. Define this if your host multiplies + # floats faster than integers, e.g. on a SPARCstation. + use sparc && append-flags -DUSE_FLOAT_MUL -DFAST + + emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \ + LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" || die "emake failed." +} + +multilib-native_src_install_internal() { + dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3} + + emake -j1 INSTALL_ROOT="${D}"/usr \ + GSM_INSTALL_LIB="${D}"/usr/$(get_libdir) \ + GSM_INSTALL_INC="${D}"/usr/include/gsm \ + GSM_INSTALL_MAN="${D}"/usr/share/man/man3 \ + TOAST_INSTALL_MAN="${D}"/usr/share/man/man1 \ + install || die "emake install failed." + + dolib lib/libgsm.so* + + dosym ../gsm/gsm.h /usr/include/libgsm/gsm.h + + dodoc ChangeLog* MACHINES MANIFEST README +} diff --git a/media-sound/gsm/metadata.xml b/media-sound/gsm/metadata.xml new file mode 100644 index 000000000..e1774e3d9 --- /dev/null +++ b/media-sound/gsm/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sound</herd> +</pkgmetadata> diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog new file mode 100644 index 000000000..e0763982c --- /dev/null +++ b/media-sound/lame/ChangeLog @@ -0,0 +1,414 @@ +# ChangeLog for media-sound/lame +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.108 2008/11/14 12:25:16 armin76 Exp $ + + 14 Nov 2008; Raúl Porcel <armin76@gentoo.org> lame-3.98.2.ebuild: + alpha/arm/ia64/sh/x86 stable wrt #246219 + + 14 Nov 2008; Jeroen Roovers <jer@gentoo.org> lame-3.98.2.ebuild: + Stable for HPPA (bug #246219). + + 12 Nov 2008; Joseph Jezak <josejx@gentoo.org> lame-3.98.2.ebuild: + Marked ppc/ppc64 stable for bug #246219. + + 11 Nov 2008; Jeremy Olexa <darkside@gentoo.org> lame-3.98.2.ebuild: + amd64 stable, bug 246219 + + 11 Nov 2008; Ferris McCormick <fmccor@gentoo.org> lame-3.98.2.ebuild: + Sparc stable --- Bug #246219 --- converts files for me. + + 09 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> lame-3.97-r1.ebuild: + Dropping stable mips. + +*lame-3.98.2 (23 Sep 2008) + + 23 Sep 2008; Peter Alfredsen <loki_val@gentoo.org> +lame-3.98.2.ebuild: + Bump to 3.98.2, bug 238443. Drop a bunch of patches that were merged + upstream. + + 08 Aug 2008; Alexis Ballier <aballier@gentoo.org> + +files/lame-3.98-echo.patch, lame-3.98.ebuild: + Add mmx useflag wrt bug #93279 and fix build of mmx asm with libtool 2.2 + + 16 Jul 2008; Alexis Ballier <aballier@gentoo.org> + files/lame-3.96.1-shared-frontend.patch: + No need to patch Makefile.in as we run eautoreconf, bug #226771. + + 16 Jul 2008; Alexis Ballier <aballier@gentoo.org> + files/lame-3.98-pic-fix.patch: + Update PIC patch, thanks again to the PaX Team. + + 16 Jul 2008; Alexis Ballier <aballier@gentoo.org> lame-3.98.ebuild: + Fix parallel make when enabling nasm. + + 16 Jul 2008; Alexis Ballier <aballier@gentoo.org> + +files/lame-3.98-execstacks.patch, lame-3.98.ebuild: + fix exec stacks with mmx asm, still bug #93279 + + 16 Jul 2008; Alexis Ballier <aballier@gentoo.org> + +files/lame-3.98-pic-fix.patch, lame-3.98.ebuild: + Add pic fix by the PaX Team. Bug #93279. The code is still not enabled, + people can test it by using EXTRA_ECONF=--enable-nasm emerge lame. + + 13 Jul 2008; Alexis Ballier <aballier@gentoo.org> + +files/lame-3.98-stdint.patch, lame-3.98.ebuild: + Dont prevent stdint.h from being included when it's in fact needed, bug + #231541 + +*lame-3.98 (11 Jul 2008) + + 11 Jul 2008; Alexis Ballier <aballier@gentoo.org> + +files/lame-3.98-gtk-path.patch, +files/lame-3.98-shared-frontend.patch, + +lame-3.98.ebuild: + Version bump, thanks to Christian Schwinn <schwinni@quadrant1.net> for + reporting and Sebastian <sebastian_ml@gmx.net> for the ebuild and patches. + Bug #230860 + + 09 Oct 2007; Markus Rothe <corsair@gentoo.org> lame-3.97-r1.ebuild: + Stable on ppc64; bug #189361 + + 02 Sep 2007; Samuli Suominen <drac@gentoo.org> lame-3.97-r1.ebuild: + Stable on mips. + + 24 Aug 2007; Raúl Porcel <armin76@gentoo.org> lame-3.97-r1.ebuild: + alpha/ia64 stable wrt #189361 + + 21 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> lame-3.97-r1.ebuild: + Stable on sparc wrt #189361 + + 20 Aug 2007; Markus Ullmann <jokey@gentoo.org> lame-3.97-r1.ebuild: + Stable on x86 wrt bug #189361 + + 20 Aug 2007; Jeroen Roovers <jer@gentoo.org> lame-3.97-r1.ebuild: + Stable for HPPA (bug #189361). + + 18 Aug 2007; nixnut <nixnut@gentoo.org> lame-3.97-r1.ebuild: + Stable on ppc wrt bug 189361 + + 18 Aug 2007; Christoph Mende <angelos@gentoo.org> lame-3.97-r1.ebuild: + Stable on amd64 wrt bug #189361 + +*lame-3.97-r1 (15 Jul 2007) + + 15 Jul 2007; Samuli Suominen <drac@gentoo.org> +lame-3.97-r1.ebuild: + Stop installing mp3x analyzer based on GTK+-1.2. LAME is a library, and it + shouldn't be pulling obsolete toolkit. Try glame. Bug 168123. + + 23 Jun 2007; Joshua Kinard <kumba@gentoo.org> lame-3.97.ebuild: + Stable on mips, per #167391. + + 14 Jun 2007; Raúl Porcel <armin76@gentoo.org> lame-3.97.ebuild: + alpha stable wrt #167391 + + 19 Feb 2007; Jason Wever <weeve@gentoo.org> lame-3.97.ebuild: + Stable on SPARC wrt bug #167391. + + 18 Feb 2007; Jeroen Roovers <jer@gentoo.org> lame-3.97.ebuild: + Stable for HPPA (bug #167391). + + 18 Feb 2007; Steve Dibb <beandog@gentoo.org> lame-3.97.ebuild: + amd64 stable, bug 167391 + + 18 Feb 2007; Raúl Porcel <armin76@gentoo.org> lame-3.97.ebuild: + x86 stable wrt bug 167391 + + 18 Feb 2007; nixnut <nixnut@gentoo.org> lame-3.97.ebuild: + Stable on ppc wrt bug 167391 + + 18 Feb 2007; Markus Rothe <corsair@gentoo.org> lame-3.97.ebuild: + Stable on ppc64; bug #167391 + + 17 Feb 2007; Fabian Groffen <grobian@gentoo.org> lame-3.96.1.ebuild, + lame-3.97.ebuild: + Dropped ppc-macos keyword, see you in prefix + + 17 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -lame-3.96.1-r1.ebuild, + -lame-3.97_beta2.ebuild, -lame-3.97_beta3.ebuild: + Remove old versions. + + 05 Feb 2007; Alexis Ballier <aballier@gentoo.org> lame-3.96.1-r1.ebuild: + Stick automake version to 1.7 as it's not working with newer versions, bug + #161610 + +*lame-3.97 (10 Nov 2006) + + 10 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> +lame-3.97.ebuild: + Version bump, even if 3.97 final is just 3.97_beta3 renamed; add mp3rtp + useflag so that the code is not enabled by default (as upstream says it's + broken). Thanks to Alessio Cassibba in bug #151189. + + 17 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> lame-3.96.1-r1.ebuild, + lame-3.97_beta2.ebuild, lame-3.97_beta3.ebuild: + Add missing WANT_AUTOCONF/WANT_AUTOMAKE variables. + +*lame-3.97_beta3 (11 Sep 2006) + + 11 Sep 2006; Luis Medinas <metalgod@gentoo.org> +lame-3.97_beta3.ebuild: + Version Bump. Thanks to Kai <gentoo@altkai.ml1.net> closes bug #145286. + +*lame-3.97_beta2 (30 May 2006) + + 30 May 2006; Diego Pettenò <flameeyes@gentoo.org> + +lame-3.97_beta2.ebuild: + Version bump, thanks to Barry Shilliday in bug #134888. + + 26 May 2006; Diego Pettenò <flameeyes@gentoo.org> -lame-3.96.ebuild, + lame-3.96.1-r1.ebuild: + Drop old versions. + + 14 May 2006; Diego Pettenò <flameeyes@gentoo.org> lame-3.96.1-r1.ebuild: + Add ~x86-fbsd keyword. + + 04 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/lame-3.96.1-asneeded.patch, lame-3.96.1-r1.ebuild: + Add patch to fix libm linking to allow using lame while building with + --as-needed. + +*lame-3.96.1-r1 (25 Aug 2005) + + 25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/lame-3.96.1-largefile.patch, +lame-3.96.1-r1.ebuild: + Added patch to have largefile support actually working as per bug #103578. + + 02 Jul 2005; Hardave Riar <hardave@gentoo.org> lame-3.96.1.ebuild: + Stable on mips + + 21 May 2005; Jan Brinkmann <luckyduck@gentoo.org> lame-3.96.1.ebuild: + dont force the use of nasm by default on x86, fixes bug #93279 + + 15 May 2005; Diego Pettenò <flameeyes@gentoo.org> lame-3.96.ebuild, + lame-3.96.1.ebuild: + Moved using toolchain-funcs eclass. + + 08 Apr 2005; Markus Rothe <corsair@gentoo.org> lame-3.96.1.ebuild: + Stable on ppc64 + + 08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> lame-3.96.1.ebuild: + Stable on ppc. + + 15 Mar 2005; Yuta SATOH <nigoro@gentoo.org> lame-3.96.1.ebuild: + added ~ppc64 + + 24 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> lame-3.96.1.ebuild, + lame-3.96.ebuild: + Stable ppc-macos + + 03 Feb 2005; <solar@gentoo.org> lame-3.96.1.ebuild, lame-3.96.ebuild: + - epunt_cxx embedded bug #74498 + + 23 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> lame-3.96.ebuild: + Unstable ppc-macos. Bug #65990 + + 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + + 12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> + -files/lame-3.91-gcc3.diff, -lame-3.92.ebuild, -lame-3.93.1-r1.ebuild: + Cleaning out old versions. + + 12 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> lame-3.96.1.ebuild: + Stable on alpha. + + 16 Oct 2004; <gongloo@gentoo.org> lame-3.96.1.ebuild: + Keyworded ~ppc-macos. + + 12 Oct 2004; Guy Martin <gmsoft@gentoo.org> lame-3.96.1.ebuild: + Stable on hppa. + + 03 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> + +files/lame-3.96.1-shared-frontend.patch: + link against shared libs. Closes bug #58547. Stable amd64, sparc, x86. + + 29 Jul 2004; Tom Gall <tgall@gentoo.org> lame-3.96.ebuild: + stable on ppc64, bug #55429 + + 28 Jul 2004; Aron Griffis <agriffis@gentoo.org> +files/lame-3.96-ccc.patch, + lame-3.92.ebuild, lame-3.93.1-r1.ebuild, lame-3.96.1.ebuild, + lame-3.96.ebuild: + If ccc (alpha compiler) is installed on the system, the default configure is + broken, fix it to respect CC. This is only directly broken for ARCH=alpha but + would affect anybody with a ccc binary in their PATH. #41908 + +*lame-3.96.1 (25 Jul 2004) + + 25 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> +lame-3.96.1.ebuild: + Version bump for upstream bugfix release. + + 25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org> + Fixed Manifest. + + 23 Jul 2004; Hasan Khalil <gongloo@gentoo.org> lame-3.96.ebuild: + Stable on macos. + + 13 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> lame-3.96.ebuild: + Stable on alpha. + + 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.92.ebuild: + virtual/glibc -> virtual/libc + + 26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> -files/intcast.spider, + lame-3.96.ebuild: + Removed bogus patch (intcast.spider). This one broke libmp3lame.so on 64bit + archs and has been unnecessary. + + 16 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> lame-3.96.ebuild: + Stable on hppa + + 07 Jun 2004; Travis Tilley <lv@gentoo.org> lame-3.96.ebuild: + stable on amd64 + + 07 Jun 2004; Aron Griffis <agriffis@gentoo.org> lame-3.92.ebuild, + lame-3.93.1-r1.ebuild, lame-3.96.ebuild: + Fix use invocation + + 13 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> lame-3.96.ebuild: + Stable on sparc + + 12 May 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.96.ebuild: + Stable x86. + + 06 May 2004; Jeremy Huddleston <eradicator@gentoo.org> + lame-3.93.1-r1.ebuild: + Fix bug #50099. + + 22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.95.1.ebuild: + Removed buggy version. + +*lame-3.96 (11 Apr 2004) + + 11 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.95.1.ebuild, + lame-3.96.ebuild: + Version bump. + + 04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.95.1.ebuild: + Back to ~arch because of bug #46672. + + 01 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> lame-3.95.1.ebuild: + stable on sparc + + 31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.95.1.ebuild: + Stable x86. cp -> dobin. nomirror. + + 15 Mar 2004; Stephen P. Becker <geoman@gentoo.org> lame-3.95.1.ebuild: + Added ~mips keyword. + + 23 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.92.ebuild, + lame-3.93.1-r1.ebuild, lame-3.95.1.ebuild: + Removing redundant html files. DESTDIR instead of einstall + + 21 Jan 2004; Nick Hadaway <raker@gentoo.org> lame-3.95.1.ebuild: + Added the mlame binary as noted on bug #35978 and added spider's + tcc compiler fix as seen on bug #31191. + + 21 Jan 2004; Nick Hadaway <raker@gentoo.org> lame-3.95.1.ebuild: + Changed emake to make as it seems to be a little finicky with + parallelism. See bug #38896. + +*lame-3.95.1 (20 Jan 2004) + + 20 Jan 2004; Nick Hadaway <raker@gentoo.org> lame-3.95.1.ebuild: + Version bump. Upstream bug fixes, and feature adds. Updated the + debug target. Fixed tyop :) extopt to expopt but commented out + as optimizations are set by the user. Also added some ebuild + fixes as suggested by Gregorio Guidi on bug #38006. + + 12 Jan 2004; <agriffis@gentoo.org> lame-3.93.1-r1.ebuild: + stable on ia64 + + 16 Nov 2003; Brad House <brad_mssw@gentoo.org> lame-3.93.1-r1.ebuild: + mark stable on amd64 + + 08 May 2003; jje <jje@gentoo.org> lame-3.93.1-r1.ebuild: + Fix flag striping. Was using strip-flags when it should have been filter-flags. + + 13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> lame-3.93.1-r1.ebuild + Marked ppc stable + +*lame-3.93.1-r1 (28 Jan 2003) + + 10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> lame-3.93.0.ebuild, + lame-3.93.0.ebuild, lame-3.93.1-r1.ebuild, lame-3.93.1.ebuild, + lame-3.93.1.ebuild: + filter out -fomit-frame-pointer for k6 based cpu's. Thanks to: sinterklaas + <jerroose@xs4all.nl> in bug #15559 + + 28 Jan 2003; Nick Hadaway <raker@gentoo.org> lame-3.93.1-r1.ebuild, + files/digest-lame-3.93.1-r1 : + Got rid of the autotools and libtool workarounds and just sed'd the + configure script gtk detection. + + 16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> lame-3.93.1.ebuild : + Run autoreconf to fix the ./configure script not detecting gtk-config + properly. + +*lame-3.93.1 (11 Dec 2002) + + 31 Dec 2002: Joshua Brindle <method@gentoo.org> lame-3.93.1.ebuild : + Change ~sparc to sparc + + 15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> lame-3.93.1.ebuild : + Add alpha to KEYWORDS + + 12 Dec 2002; phoen][x <phoenix@gentoo.org> lame-3.93.1.ebuild : + Tagging this ebuild stable ("x86"). + + 11 Dec 2002; phoen][x <phoenix@gentoo.org> lame-3.93.1.ebuild, + files/digest-lame-3.93.1 : + Bumped to new version. Hopefully, the need for these quality problem + patches is gone now. + +* Autoupdate keywords (12-6-02) + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*lame-3.93.0-r1 (23 Nov 2002) + + 01 Dec 2002; phoen][x <phoenix@gentoo.org> lame-3.93.0-r1.ebuild, + files/lame-3.93.0-npsytunefix.diff, files/lame-3.93.0-q0fix.diff : + Incorporated the fixes from bug #11194. Thanks to Sebastian Droege + <sebastian.droege@gmx.de> for the contribution. + + 12 Dec 2002; phoen][x <phoenix@gentoo.org> lame-3.93.0-r1.ebuild, + files/lame-3.93.0-npsytunefix.diff, files/lame-3.93.0-q0fix.diff : + Removing this ebuild - lame-3.93.1 comes with these patches. + +*lame-3.93.0 (23 Nov 2002) + + 23 Nov 2002; Spider <spider@gentoo.org> lame-3.93.0.ebuild : + new versioning scheme, unfortunately not followed inside the tarball so I + had to hack some there. The vorbis support was cut out from this release + (at least according to the changelog) so I removed the IUSE and USE flags + accordingly. + +*lame-3.92 (23 Apr 2002) + 29 Sep 2002; Martin Schlemmer <azarah@gentoo.org> : + Libtoolize to fix bug #5638. + + 09 Sep 2002; Jack Morgan <jmorgan@gentoo.org> : + Added sparc/saprc64 keywords + + 07 Aug 2002; Mark Guertin <gerk@gentoo.org> : + Adjusted nasm dep for x86 only + + 23 Apr 2002; Spider <spider@gentoo.org> lame-3.92.ebuild: + update new version, remove gcc3 fixes (in mainline now) + + 06 Apr 2002; Geert Bevin <gbevin@gentoo.org> lame-3.91.ebuild, + files/lame-3.91-gcc3.diff : + + Little preprocessor fix to help it compile with gcc 3. + +*lame-3.91 (28 Mar 2002) + + 28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> lame-3.91.ebuild : + + Changed the USE flag to "oggvorbis" instead of just "vorbis" + +*lame-3.91 (1 Feb 2002) + + 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest new file mode 100644 index 000000000..966248b2d --- /dev/null +++ b/media-sound/lame/Manifest @@ -0,0 +1,17 @@ +AUX lame-3.96-ccc.patch 658 RMD160 c598ad66543cc63897e0212e220a436da563ee71 SHA1 1e291ea8dbde132a22760a5279abe624e2835fae SHA256 60f0a60a72711827222cbb2d934a285199a62f9899e84097f851a53c61c4e6dd +AUX lame-3.96.1-asneeded.patch 9027 RMD160 5456182576a331feb00d1d8931ba598e37f08804 SHA1 16ca5409f6710e3bf061f1fc3e339a0b265ac8a8 SHA256 6f9874c2f79c129a6d0d8d59d5887e8dbceff4a4bad2ad0b35987dc7d3f09809 +AUX lame-3.96.1-shared-frontend.patch 483 RMD160 bbcd78d61c25a92cdbcc04f10cf11f1a455846a2 SHA1 f2c7442d84e3d437e3c5d76064cf3e960ea6fad7 SHA256 b4b62098d61bc4e252b03abaea2f92d812ba0a8b16bb5fdf45d4b926e6c8c417 +AUX lame-3.98-echo.patch 361 RMD160 bc51688461367c85fcffa76b52d39f814037ceda SHA1 f7736b32ab06f9f0e9bda8e59b6d98779b8bfdf3 SHA256 1917632a5fb5c55a85582c3e3dc23681bb91eefc700aad29e17d5d5e9f2f5eec +AUX lame-3.98-execstacks.patch 471 RMD160 047433da9998efc8110d592d7e1ed0862599302d SHA1 a8d44c4bddb1f6ad1b5a9dda5ed8a6f37c0335df SHA256 13cba5c2bcdcb58da1ff7b3d68e0422bc05f234da0896e3cd755a0ea003b9520 +AUX lame-3.98-gtk-path.patch 8606 RMD160 8bca3b986edf75853bfaee6837f9eb4832b664fa SHA1 dc77fbe83f167eeb3f77b6677a90765395b17de9 SHA256 0728822c0eb05b6dc70c0ae8e064c9be3b2a3448d10a53764397c70b7489a3b8 +AUX lame-3.98-pic-fix.patch 14804 RMD160 443e4b1fc6a54be4d2c356ea7b4cc857f26b2a1c SHA1 551d364c34c30f6486b034f6e0789247450aae95 SHA256 f77ededd6e067a4d47ad49a0fa939290de5b248ef83a4b8a1aba52dbb0649381 +AUX lame-3.98-shared-frontend.patch 1008 RMD160 8e12e752a325926e1376e45ffd3b72cac61ebf4a SHA1 af371fe673e42c4ba2e6e07255d6196d76d8ef79 SHA256 fb40bfb00e47964acbe0de428cc7a3e4b3a0e0ade120bf547891bf78031f6916 +AUX lame-3.98-stdint.patch 651 RMD160 84a732f356ac05941d90c2a261f9d624fc38bc5b SHA1 b4ebe2a3e8c343180b7d82e2bd2edb81a7c0d1bd SHA256 2fc25342cf5b5d5fd465c76f7899b0276e6e9f21b948f6005de0724a35dcc567 +DIST lame-3.97.tar.gz 1328058 RMD160 5c4cf02c0f4e10c4cd2ab610d62478b554cd0873 SHA1 acf56065f4e31ce023b0f99002d537adb1ec09df SHA256 0a2334a6d11085298a9a3c46d5d310cca012f2e61d6efae90840a76a364dbe17 +DIST lame-398-2.tar.gz 1327643 RMD160 767dd94271eef221170469535db2bf388149715a SHA1 b2db41dbc9c0824caa102e8c932b820c79ccd5ec SHA256 a17a28569d8ed1e514915c1f12bdf4eedac506e5fbdf9a429ba97d5d42c9af32 +DIST lame-398.tar.gz 1415983 RMD160 754343791ac80d2403291c63f99eb409bca6b62f SHA1 287979d076834882c99d0cc01ddbd9b3697ceaae SHA256 8396bcb425ddcbfb8027d5712fa8878a2257006ccbe3ac7a772e1652e43d19b1 +EBUILD lame-3.97-r1.ebuild 2430 RMD160 4cd81787357231b821483048162721964598b6a8 SHA1 8ce9989e5856ab3caaf0ada25d7eb9fe466e6fa2 SHA256 1aa3355b392db5fb533e6f46dcabe218ed857f593786aa76e6f064b7ab10dcc6 +EBUILD lame-3.98.2.ebuild 2564 RMD160 176a1091c835287f5fa8ddeb87c06980910953df SHA1 73b4abbf8f57aaa1da036d57c599d8585e6b0ea9 SHA256 dbda9ae7e6ef67a55eb8e1e49d918ae2f2081e25e75ba37f14c85d355a8f906f +EBUILD lame-3.98.ebuild 2994 RMD160 5a0e82d0b012c9dabd68a447cc7bc148102696c0 SHA1 bfcd33b94f7a0caa96d6bbd0cd379cc674909dc9 SHA256 50dfc7ebfeaa440301212e9054f473a03e147a4718c1071528a734460071c7fb +MISC ChangeLog 14986 RMD160 a8d8f2cc563f19cbf076a7e55dd7a74eb64acd63 SHA1 149ea580edecd730ddbae9976e1ab955d00669ea SHA256 b2c3ba3f8f0325a4bb491407531a9e2ec29a74e32f12393406dc2522c57bddab +MISC metadata.xml 264 RMD160 a6be36fe4dffbf9280e34fafcf40571d0f960580 SHA1 7e6bff4996ab638c7e04e31197d3b45f9752c00f SHA256 69ff3c8176be87b9e058cf261280c392e026742616602914b8ee3e3b6eaa2280 diff --git a/media-sound/lame/files/lame-3.96-ccc.patch b/media-sound/lame/files/lame-3.96-ccc.patch new file mode 100644 index 000000000..684782aa0 --- /dev/null +++ b/media-sound/lame/files/lame-3.96-ccc.patch @@ -0,0 +1,16 @@ +--- lame-3.96/configure.in.ccc 2004-04-11 10:45:19.000000000 -0400 ++++ lame-3.96/configure.in 2004-07-26 18:32:21.000000000 -0400 +@@ -915,11 +915,9 @@ + alpha*-*-linux*) + + ################################################################ +-#### Check if 'ccc' is in our path ++#### Check if we're using Compaq's C Compiler: 'ccc' + ################################################################ +-if test "`which ccc 2>/dev/null | grep -c ccc`" != "0" ; then +- # Compaq's C Compiler +- CC=ccc ++if test "`echo $CC | sed 's/.*\///'`" = ccc; then + + ################################################################ + #### set 'OPTIMIZATION = -arch host -tune host' diff --git a/media-sound/lame/files/lame-3.96.1-asneeded.patch b/media-sound/lame/files/lame-3.96.1-asneeded.patch new file mode 100644 index 000000000..1ee68cf38 --- /dev/null +++ b/media-sound/lame/files/lame-3.96.1-asneeded.patch @@ -0,0 +1,212 @@ +Index: libmp3lame/Makefile.am +=================================================================== +--- libmp3lame/Makefile.am.orig ++++ libmp3lame/Makefile.am +@@ -18,7 +18,7 @@ else + decoder_ldadd = + endif + +-libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) ++libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm + libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \ + -no-undefined + +Index: gtk.m4 +=================================================================== +--- gtk.m4.orig ++++ gtk.m4 +@@ -0,0 +1,194 @@ ++# Configure paths for GTK+ ++# Owen Taylor 97-11-3 ++ ++dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS ++dnl ++AC_DEFUN(AM_PATH_GTK, ++[dnl ++dnl Get the cflags and libraries from the gtk-config script ++dnl ++AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], ++ gtk_config_prefix="$withval", gtk_config_prefix="") ++AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], ++ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") ++AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], ++ , enable_gtktest=yes) ++ ++ for module in . $4 ++ do ++ case "$module" in ++ gthread) ++ gtk_config_args="$gtk_config_args gthread" ++ ;; ++ esac ++ done ++ ++ if test x$gtk_config_exec_prefix != x ; then ++ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" ++ if test x${GTK_CONFIG+set} != xset ; then ++ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config ++ fi ++ fi ++ if test x$gtk_config_prefix != x ; then ++ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" ++ if test x${GTK_CONFIG+set} != xset ; then ++ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config ++ fi ++ fi ++ ++ AC_PATH_PROG(GTK_CONFIG, gtk-config, no) ++ min_gtk_version=ifelse([$1], ,0.99.7,$1) ++ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) ++ no_gtk="" ++ if test "$GTK_CONFIG" = "no" ; then ++ no_gtk=yes ++ else ++ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` ++ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` ++ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_gtktest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GTK_CFLAGS" ++ LIBS="$GTK_LIBS $LIBS" ++dnl ++dnl Now check if the installed GTK is sufficiently new. (Also sanity ++dnl checks the results of gtk-config to some extent ++dnl ++ rm -f conf.gtktest ++ AC_TRY_RUN([ ++#include <gtk/gtk.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.gtktest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_gtk_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_gtk_version"); ++ exit(1); ++ } ++ ++ if ((gtk_major_version != $gtk_config_major_version) || ++ (gtk_minor_version != $gtk_config_minor_version) || ++ (gtk_micro_version != $gtk_config_micro_version)) ++ { ++ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", ++ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, ++ gtk_major_version, gtk_minor_version, gtk_micro_version); ++ printf ("*** was found! If gtk-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); ++ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); ++ printf("*** before re-running configure\n"); ++ } ++#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) ++ else if ((gtk_major_version != GTK_MAJOR_VERSION) || ++ (gtk_minor_version != GTK_MINOR_VERSION) || ++ (gtk_micro_version != GTK_MICRO_VERSION)) ++ { ++ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", ++ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ gtk_major_version, gtk_minor_version, gtk_micro_version); ++ } ++#endif /* defined (GTK_MAJOR_VERSION) ... */ ++ else ++ { ++ if ((gtk_major_version > major) || ++ ((gtk_major_version == major) && (gtk_minor_version > minor)) || ++ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", ++ gtk_major_version, gtk_minor_version, gtk_micro_version); ++ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); ++ printf("*** correct copy of gtk-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_gtk" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$GTK_CONFIG" = "no" ; then ++ echo "*** The gtk-config script installed by GTK could not be found" ++ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the GTK_CONFIG environment variable to the" ++ echo "*** full path to gtk-config." ++ else ++ if test -f conf.gtktest ; then ++ : ++ else ++ echo "*** Could not run GTK test program, checking why..." ++ CFLAGS="$CFLAGS $GTK_CFLAGS" ++ LIBS="$LIBS $GTK_LIBS" ++ AC_TRY_LINK([ ++#include <gtk/gtk.h> ++#include <stdio.h> ++], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GTK or finding the wrong" ++ echo "*** version of GTK. If it is not finding GTK, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ++ echo "***" ++ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" ++ echo "*** came with the system with the command" ++ echo "***" ++ echo "*** rpm --erase --nodeps gtk gtk-devel" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GTK was incorrectly installed" ++ echo "*** or that you have moved GTK since it was installed. In the latter case, you" ++ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GTK_CFLAGS="" ++ GTK_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GTK_CFLAGS) ++ AC_SUBST(GTK_LIBS) ++ rm -f conf.gtktest ++]) diff --git a/media-sound/lame/files/lame-3.96.1-shared-frontend.patch b/media-sound/lame/files/lame-3.96.1-shared-frontend.patch new file mode 100644 index 000000000..db194b7f6 --- /dev/null +++ b/media-sound/lame/files/lame-3.96.1-shared-frontend.patch @@ -0,0 +1,12 @@ +diff -Naur lame-3.96.1.orig/frontend/Makefile.am lame-3.96.1/frontend/Makefile.am +--- lame-3.96.1.orig/frontend/Makefile.am 2004-01-21 01:41:36.000000000 -0800 ++++ lame-3.96.1/frontend/Makefile.am 2004-10-03 16:39:12.415901779 -0700 +@@ -50,7 +50,7 @@ + endif + + CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ +-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static ++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ + + INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir) + diff --git a/media-sound/lame/files/lame-3.98-echo.patch b/media-sound/lame/files/lame-3.98-echo.patch new file mode 100644 index 000000000..6d3edbaee --- /dev/null +++ b/media-sound/lame/files/lame-3.98-echo.patch @@ -0,0 +1,13 @@ +Index: lame-398/libmp3lame/i386/Makefile.am +=================================================================== +--- lame-398.orig/libmp3lame/i386/Makefile.am ++++ lame-398/libmp3lame/i386/Makefile.am +@@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign $(top_srcdir) + + DEFS = @DEFS@ @CONFIG_DEFS@ + ++ECHO ?= echo ++ + nasm_sources = \ + choose_table.nas \ + cpu_feat.nas \ diff --git a/media-sound/lame/files/lame-3.98-execstacks.patch b/media-sound/lame/files/lame-3.98-execstacks.patch new file mode 100644 index 000000000..d2c7d4de4 --- /dev/null +++ b/media-sound/lame/files/lame-3.98-execstacks.patch @@ -0,0 +1,13 @@ +Index: lame-398/libmp3lame/i386/nasm.h +=================================================================== +--- lame-398.orig/libmp3lame/i386/nasm.h ++++ lame-398/libmp3lame/i386/nasm.h +@@ -36,7 +36,7 @@ BITS 32 + %define segment_data segment .data + %define segment_bss segment .bss + %else +-%ifdef LINUX ++%ifidn __OUTPUT_FORMAT__,elf + section .note.GNU-stack progbits noalloc noexec nowrite align=1 + %endif + %define segment_code segment .text align=16 class=CODE use32 diff --git a/media-sound/lame/files/lame-3.98-gtk-path.patch b/media-sound/lame/files/lame-3.98-gtk-path.patch new file mode 100644 index 000000000..dc9bf4ef5 --- /dev/null +++ b/media-sound/lame/files/lame-3.98-gtk-path.patch @@ -0,0 +1,199 @@ +Index: gtk.m4 +=================================================================== +--- gtk.m4.orig ++++ gtk.m4 +@@ -0,0 +1,194 @@ ++# Configure paths for GTK+ ++# Owen Taylor 97-11-3 ++ ++dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS ++dnl ++AC_DEFUN(AM_PATH_GTK, ++[dnl ++dnl Get the cflags and libraries from the gtk-config script ++dnl ++AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], ++ gtk_config_prefix="$withval", gtk_config_prefix="") ++AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], ++ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") ++AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], ++ , enable_gtktest=yes) ++ ++ for module in . $4 ++ do ++ case "$module" in ++ gthread) ++ gtk_config_args="$gtk_config_args gthread" ++ ;; ++ esac ++ done ++ ++ if test x$gtk_config_exec_prefix != x ; then ++ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" ++ if test x${GTK_CONFIG+set} != xset ; then ++ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config ++ fi ++ fi ++ if test x$gtk_config_prefix != x ; then ++ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" ++ if test x${GTK_CONFIG+set} != xset ; then ++ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config ++ fi ++ fi ++ ++ AC_PATH_PROG(GTK_CONFIG, gtk-config, no) ++ min_gtk_version=ifelse([$1], ,0.99.7,$1) ++ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) ++ no_gtk="" ++ if test "$GTK_CONFIG" = "no" ; then ++ no_gtk=yes ++ else ++ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` ++ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` ++ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_gtktest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GTK_CFLAGS" ++ LIBS="$GTK_LIBS $LIBS" ++dnl ++dnl Now check if the installed GTK is sufficiently new. (Also sanity ++dnl checks the results of gtk-config to some extent ++dnl ++ rm -f conf.gtktest ++ AC_TRY_RUN([ ++#include <gtk/gtk.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.gtktest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_gtk_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_gtk_version"); ++ exit(1); ++ } ++ ++ if ((gtk_major_version != $gtk_config_major_version) || ++ (gtk_minor_version != $gtk_config_minor_version) || ++ (gtk_micro_version != $gtk_config_micro_version)) ++ { ++ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", ++ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, ++ gtk_major_version, gtk_minor_version, gtk_micro_version); ++ printf ("*** was found! If gtk-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); ++ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); ++ printf("*** before re-running configure\n"); ++ } ++#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) ++ else if ((gtk_major_version != GTK_MAJOR_VERSION) || ++ (gtk_minor_version != GTK_MINOR_VERSION) || ++ (gtk_micro_version != GTK_MICRO_VERSION)) ++ { ++ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", ++ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ gtk_major_version, gtk_minor_version, gtk_micro_version); ++ } ++#endif /* defined (GTK_MAJOR_VERSION) ... */ ++ else ++ { ++ if ((gtk_major_version > major) || ++ ((gtk_major_version == major) && (gtk_minor_version > minor)) || ++ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", ++ gtk_major_version, gtk_minor_version, gtk_micro_version); ++ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); ++ printf("*** correct copy of gtk-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_gtk" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$GTK_CONFIG" = "no" ; then ++ echo "*** The gtk-config script installed by GTK could not be found" ++ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the GTK_CONFIG environment variable to the" ++ echo "*** full path to gtk-config." ++ else ++ if test -f conf.gtktest ; then ++ : ++ else ++ echo "*** Could not run GTK test program, checking why..." ++ CFLAGS="$CFLAGS $GTK_CFLAGS" ++ LIBS="$LIBS $GTK_LIBS" ++ AC_TRY_LINK([ ++#include <gtk/gtk.h> ++#include <stdio.h> ++], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GTK or finding the wrong" ++ echo "*** version of GTK. If it is not finding GTK, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ++ echo "***" ++ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" ++ echo "*** came with the system with the command" ++ echo "***" ++ echo "*** rpm --erase --nodeps gtk gtk-devel" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GTK was incorrectly installed" ++ echo "*** or that you have moved GTK since it was installed. In the latter case, you" ++ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GTK_CFLAGS="" ++ GTK_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GTK_CFLAGS) ++ AC_SUBST(GTK_LIBS) ++ rm -f conf.gtktest ++]) diff --git a/media-sound/lame/files/lame-3.98-pic-fix.patch b/media-sound/lame/files/lame-3.98-pic-fix.patch new file mode 100644 index 000000000..8874611cf --- /dev/null +++ b/media-sound/lame/files/lame-3.98-pic-fix.patch @@ -0,0 +1,585 @@ +diff -urp lame-398-orig/libmp3lame/i386/choose_table.nas lame-398/libmp3lame/i386/choose_table.nas +--- lame-398-orig/libmp3lame/i386/choose_table.nas 2008-07-16 21:47:19.000000000 +0200 ++++ lame-398/libmp3lame/i386/choose_table.nas 2008-07-16 21:47:30.000000000 +0200 +@@ -111,33 +111,42 @@ choose_table_H + dw 0x1d16, 0x1e16, 0x1e17, 0x1f17, 0x1f17 + + choose_jump_table_L: +- dd table_MMX.L_case_0 +- dd table_MMX.L_case_1 +- dd table_MMX.L_case_2 +- dd table_MMX.L_case_3 +- dd table_MMX.L_case_45 +- dd table_MMX.L_case_45 +- dd table_MMX.L_case_67 +- dd table_MMX.L_case_67 +- dd table_MMX.L_case_8_15 +- dd table_MMX.L_case_8_15 +- dd table_MMX.L_case_8_15 +- dd table_MMX.L_case_8_15 +- dd table_MMX.L_case_8_15 +- dd table_MMX.L_case_8_15 +- dd table_MMX.L_case_8_15 +- dd table_MMX.L_case_8_15 ++ dd table_MMX.L_case_0 - choose_table_MMX ++ dd table_MMX.L_case_1 - choose_table_MMX ++ dd table_MMX.L_case_2 - choose_table_MMX ++ dd table_MMX.L_case_3 - choose_table_MMX ++ dd table_MMX.L_case_45 - choose_table_MMX ++ dd table_MMX.L_case_45 - choose_table_MMX ++ dd table_MMX.L_case_67 - choose_table_MMX ++ dd table_MMX.L_case_67 - choose_table_MMX ++ dd table_MMX.L_case_8_15 - choose_table_MMX ++ dd table_MMX.L_case_8_15 - choose_table_MMX ++ dd table_MMX.L_case_8_15 - choose_table_MMX ++ dd table_MMX.L_case_8_15 - choose_table_MMX ++ dd table_MMX.L_case_8_15 - choose_table_MMX ++ dd table_MMX.L_case_8_15 - choose_table_MMX ++ dd table_MMX.L_case_8_15 - choose_table_MMX ++ dd table_MMX.L_case_8_15 - choose_table_MMX + + segment_code + ; + ; use MMX + ; + ++extern _GLOBAL_OFFSET_TABLE_ ++get_pc.bp: ++ mov ebp, [esp] ++ retn ++ + align 16 + ; int choose_table(int *ix, int *end, int *s) + choose_table_MMX: +- mov ecx,[esp+4] ;ecx = begin +- mov edx,[esp+8] ;edx = end ++ push ebp ++ call get_pc.bp ++ add ebp, _GLOBAL_OFFSET_TABLE_ + $$ - $ wrt ..gotpc ++ ++ mov ecx,[esp+8] ;ecx = begin ++ mov edx,[esp+12] ;edx = end + sub ecx,edx ;ecx = begin-end(should be minus) + test ecx,8 + pxor mm0,mm0 ;mm0=[0:0] +@@ -169,13 +178,16 @@ choose_table_MMX: + + cmp eax,15 + ja .with_ESC +- jmp [choose_jump_table_L+eax*4] ++ lea ecx,[ebp + choose_table_MMX wrt ..gotoff] ++ add ecx,[ebp + choose_jump_table_L+eax*4 wrt ..gotoff] ++ jmp ecx + + .with_ESC1: + emms +- mov ecx, [esp+12] ; *s ++ mov ecx, [esp+16] ; *s + mov [ecx], eax + or eax,-1 ++ pop ebp + ret + + .with_ESC: +@@ -187,12 +199,12 @@ choose_table_MMX: + push esi + bsr eax, eax + %assign _P 4*2 +- movq mm5, [D15_15_15_15] +- movq mm6, [D14_14_14_14] +- movq mm3, [mul_add] ++ movq mm5, [ebp + D15_15_15_15 wrt ..gotoff] ++ movq mm6, [ebp + D14_14_14_14 wrt ..gotoff] ++ movq mm3, [ebp + mul_add wrt ..gotoff] + +- mov ecx, [esp+_P+4] ; = ix +-; mov edx, [esp+_P+8] ; = end ++ mov ecx, [esp+_P+8] ; = ix ++; mov edx, [esp+_P+12] ; = end + sub ecx, edx + + xor esi, esi ; sum = 0 +@@ -209,7 +221,7 @@ choose_table_MMX: + psubw mm7, mm2 ; 14$B$h$jBg$-$$$H$-(B linbits_sum++; + pmaddwd mm0, mm3 ; {0, 0, y, x}*{1, 16, 1, 16} + movd ebx, mm0 +- mov esi, [largetbl+ebx*4+(16*16+16)*4] ++ mov esi, [ebp + largetbl+ebx*4+(16*16+16)*4 wrt ..gotoff] + + jz .H_dual_exit + +@@ -224,9 +236,9 @@ choose_table_MMX: + pmaddwd mm0, mm3 ; {y, x, y, x}*{1, 16, 1, 16} + movd ebx, mm0 + punpckhdq mm0,mm0 +- add esi, [largetbl+ebx*4+(16*16+16)*4] ++ add esi, [ebp + largetbl+ebx*4+(16*16+16)*4 wrt ..gotoff] + movd ebx, mm0 +- add esi, [largetbl+ebx*4+(16*16+16)*4] ++ add esi, [ebp + largetbl+ebx*4+(16*16+16)*4 wrt ..gotoff] + add ecx, 16 + psubw mm7, mm2 ; 14$B$h$jBg$-$$$H$-(B linbits_sum++; + jnz .H_dual_lp1 +@@ -237,8 +249,8 @@ choose_table_MMX: + paddd mm7,mm1 + punpckldq mm7,mm7 + +- pmaddwd mm7, [linbits32+eax*8] ; linbits +- mov ax, [choose_table_H+eax*2] ++ pmaddwd mm7, [ebp + linbits32+eax*8 wrt ..gotoff] ; linbits ++ mov ax, [ebp + choose_table_H+eax*2 wrt ..gotoff] + + movd ecx, mm7 + punpckhdq mm7,mm7 +@@ -261,54 +273,57 @@ choose_table_MMX: + mov edx, ecx + shr eax, 8 + .chooseE_s1: +- mov ecx, [esp+12] ; *s ++ mov ecx, [esp+16] ; *s + and eax, 0xff + add [ecx], edx ++ pop ebp + ret + + table_MMX.L_case_0: + emms ++ pop ebp + ret + + table_MMX.L_case_1: + emms +- mov eax, [esp+12] ; *s +- mov ecx, [esp+4] ; *ix ++ mov eax, [esp+16] ; *s ++ mov ecx, [esp+8] ; *ix + sub ecx, edx + push ebx + .lp: + mov ebx, [edx+ecx] + add ebx, ebx + add ebx, [edx+ecx+4] +- movzx ebx, byte [ebx+t1l] ++ movzx ebx, byte [ebp + ebx+t1l wrt ..gotoff] + add [eax], ebx + add ecx, 8 + jnz .lp + pop ebx + mov eax, 1 ++ pop ebp + ret + + table_MMX.L_case_45: + push dword 7 +- mov ecx, tableABC+9*8 ++ lea ecx, [ebp + tableABC+9*8 wrt ..gotoff] + jmp from3 + + table_MMX.L_case_67: + push dword 10 +- mov ecx, tableABC ++ lea ecx, [ebp + tableABC wrt ..gotoff] + jmp from3 + + table_MMX.L_case_8_15: + push dword 13 +- mov ecx, tableDEF ++ lea ecx, [ebp + tableDEF wrt ..gotoff] + from3: +- mov eax,[esp+8] ;eax = *begin +-; mov edx,[esp+12] ;edx = *end ++ mov eax,[esp+12] ;eax = *begin ++; mov edx,[esp+16] ;edx = *end + + push ebx + sub eax, edx + +- movq mm5,[mul_add] ++ movq mm5,[ebp + mul_add wrt ..gotoff] + pxor mm2,mm2 ;mm2 = sum + + test eax, 8 +@@ -361,22 +376,23 @@ from3: + .choose3_s2: + pop ecx + add eax, ecx +- mov ecx, [esp+12] ; *s ++ mov ecx, [esp+16] ; *s + add [ecx], edx ++ pop ebp + ret + + table_MMX.L_case_2: + push dword 2 +- mov ecx,table23 +- pmov mm5,[mul_add23] ++ lea ecx,[ebp + table23 wrt ..gotoff] ++ pmov mm5,[ebp + mul_add23 wrt ..gotoff] + jmp from2 + table_MMX.L_case_3: + push dword 5 +- mov ecx,table56 +- pmov mm5,[mul_add56] ++ lea ecx,[ebp + table56 wrt ..gotoff] ++ pmov mm5,[ebp + mul_add56 wrt ..gotoff] + from2: +- mov eax,[esp+8] ;eax = *begin +-; mov edx,[esp+12] ;edx = *end ++ mov eax,[esp+12] ;eax = *begin ++; mov edx,[esp+16] ;edx = *end + push ebx + push edi + +@@ -426,8 +442,9 @@ from2: + mov edx, ecx + inc eax + .choose2_s1: +- mov ecx, [esp+12] ; *s ++ mov ecx, [esp+16] ; *s + add [ecx], edx ++ pop ebp + ret + + end +diff -urp lame-398-orig/libmp3lame/i386/fft3dn.nas lame-398/libmp3lame/i386/fft3dn.nas +--- lame-398-orig/libmp3lame/i386/fft3dn.nas 2008-07-16 21:47:19.000000000 +0200 ++++ lame-398/libmp3lame/i386/fft3dn.nas 2008-07-16 21:47:30.000000000 +0200 +@@ -24,26 +24,35 @@ D_1_0_0_0 dd 0.0 , 1.0 + + segment_code + ++extern _GLOBAL_OFFSET_TABLE_ ++get_pc.bp: ++ mov ebp, [esp] ++ retn ++ + ;void fht_3DN(float *fz, int nn); + + proc fht_3DN + + pushd ebp, ebx, esi, edi + +- mov r0, [esp+20] ;fi +- mov r1, [esp+24] ;r1 = nn +- sub esp, 16 ++ sub esp, 20 ++ ++ call get_pc.bp ++ add ebp, _GLOBAL_OFFSET_TABLE_ + $$ - $ wrt ..gotpc + ++ mov r0, [esp+40] ;fi ++ mov r1, [esp+44] ;r1 = nn ++ lea r3, [ebp + costab wrt ..gotoff] ;tri = costab ++ lea r4, [r0+r1*8] ;r4 = fn = &fz[n] ++ mov [esp+16], r4 + mov r4, 8 ;kx = k1/2 +- mov r3, costab ;tri = costab +- lea r6, [r0+r1*8] ;r6 = fn = &fz[n] + + pmov mm7, [r3] + + loopalign 16 + .do1 + lea r3, [r3+16] ;tri += 2; +- pmov mm6, [costab+8] ++ pmov mm6, [ebp + costab+8 wrt ..gotoff] + lea r2, [r4+r4*2] ;k3*fsize/2 + mov r5, 4 ;i = 1*fsize + +@@ -104,7 +113,7 @@ proc fht_3DN + pmovd [r1+r4*4], mm4 ;gi[k2] + puphdq mm4, mm4 + +- cmp r0, r6 ++ cmp r0, [esp + 16] + pmovd [r1+r4*2], mm0 ;gi[k1] + pmovd [r1+r2*2], mm4 ;gi[k3] + +@@ -119,12 +128,12 @@ proc fht_3DN + ; mm7 = 0x800000000 | 0 + ; + pmov mm1, mm6 +- mov r0, [esp+36] ; fz ++ mov r0, [esp+40] ; fz + puphdq mm1, mm1 ; c1 | c1 + lea r1, [r0+r4*2] + pfadd mm1, mm1 ; c1+c1 | c1+c1 + pfmul mm1, mm6 ; 2*c1*c1 | 2*c1*s1 +- pfsub mm1, [D_1_0_0_0] ; 2*c1*c1-1.0 | 2*c1*s1 = -c2 | s2 ++ pfsub mm1, [ebp + D_1_0_0_0 wrt ..gotoff] ; 2*c1*c1-1.0 | 2*c1*s1 = -c2 | s2 + + pmov mm0, mm1 + pxor mm7, mm6 ; c1 | -s1 +@@ -134,7 +143,7 @@ proc fht_3DN + puphdq mm0, mm2 ; s2 | c2 + puphdq mm6, mm3 ;-s1 | c1 + +- pxor mm0, [costab] ; c2 | -s2 ++ pxor mm0, [ebp + costab wrt ..gotoff] ; c2 | -s2 + + ; mm0 = s2| c2 + ; mm1 = -c2| s2 +@@ -233,7 +242,7 @@ proc fht_3DN + + lea r0, [r0+r4*8] + lea r1, [r1+r4*8] +- cmp r0, r6 ++ cmp r0, [esp + 16] + pmov mm0, [esp] + pmov mm1, [esp+8] + +@@ -249,17 +258,17 @@ proc fht_3DN + pfsub mm6, mm7 ; c1*a-s1*b | s1*a+c1*b + pupldq mm7,mm6 + puphdq mm6,mm7 +- pmov mm7, [costab] ++ pmov mm7, [ebp + costab wrt ..gotoff] + jb near .for + +- mov r0, [esp+36] ;fi +- cmp r4, [esp+36+4] ++ mov r0, [esp+40] ;fi ++ cmp r4, [esp+40+4] + lea r4, [r4*4] ;kx *= 4 + + jb near .do1 + .exitttt + femms +- add esp,16 ++ add esp,20 + popd ebp, ebx, esi, edi + endproc + +@@ -270,20 +279,24 @@ proc fht_E3DN + + pushd ebp, ebx, esi, edi + +- mov r0, [esp+20] ;fi +- mov r1, [esp+24] ;r1 = nn +- sub esp, 16 ++ sub esp, 20 ++ ++ call get_pc.bp ++ add ebp, _GLOBAL_OFFSET_TABLE_ + $$ - $ wrt ..gotpc + ++ mov r0, [esp+40] ;fi ++ mov r1, [esp+44] ;r1 = nn ++ lea r3, [ebp + costab wrt ..gotoff] ;tri = costab ++ lea r4, [r0+r1*8] ;r4 = fn = &fz[n] ++ mov [esp+16], r4 + mov r4, 8 ;kx = k1/2 +- mov r3, costab ;tri = costab +- lea r6, [r0+r1*8] ;r6 = fn = &fz[n] + + pmov mm7, [r3] + + loopalign 16 + .do1 + lea r3, [r3+16] ;tri += 2; +- pmov mm6, [costab+8] ++ pmov mm6, [ebp + costab+8 wrt ..gotoff] + lea r2, [r4+r4*2] ;k3*fsize/2 + mov r5, 4 ;i = 1*fsize + +@@ -324,7 +337,7 @@ proc fht_E3DN + pfadd mm3, mm4 ;f0+f2|f1+f3 + pfsub mm5, mm4 ;f0-f2|f1-f3 + +- cmp r0, r6 ++ cmp r0, [esp + 16] + pmovd [r1+r4*2], mm3 ;gi[k1] + pmovd [r1+r2*2], mm5 ;gi[k3] + puphdq mm3, mm3 +@@ -343,12 +356,12 @@ proc fht_E3DN + ; mm7 = 0x800000000 | 0 + ; + pmov mm5, mm6 +- mov r0, [esp+36] ; fz ++ mov r0, [esp+40] ; fz + puphdq mm5, mm5 ; c1 | c1 + lea r1, [r0+r4*2] + pfadd mm5, mm5 ; c1+c1 | c1+c1 + pfmul mm5, mm6 ; 2*c1*c1 | 2*c1*s1 +- pfsub mm5, [D_1_0_0_0] ; 2*c1*c1-1.0 | 2*c1*s1 = -c2 | s2 ++ pfsub mm5, [ebp + D_1_0_0_0 wrt ..gotoff] ; 2*c1*c1-1.0 | 2*c1*s1 = -c2 | s2 + + pswapd mm4, mm5 ; s2 |-c2 + pxor mm4, mm7 ; s2 | c2 +@@ -447,7 +460,7 @@ proc fht_E3DN + + lea r0, [r0+r4*8] + lea r1, [r1+r4*8] +- cmp r0, r6 ++ cmp r0, [esp + 16] + pmov mm4, [esp] + pmov mm5, [esp+8] + +@@ -462,16 +475,16 @@ proc fht_E3DN + + pfsub mm6, mm7 ; c1*a-s1*b | s1*a+c1*b + pswapd mm6, mm6 ; ??? ; s1*a+c1*b | c1*a-s1*b +- pmov mm7, [costab] ++ pmov mm7, [ebp + costab wrt ..gotoff] + jb near .for + +- mov r0, [esp+36] ;fi +- cmp r4, [esp+36+4] ++ mov r0, [esp+40] ;fi ++ cmp r4, [esp+40+4] + lea r4, [r4*4] ;kx *= 4 + + jb near .do1 + .exitttt + femms +- add esp,16 ++ add esp,20 + popd ebp, ebx, esi, edi + endproc +diff -urp lame-398-orig/libmp3lame/i386/fftsse.nas lame-398/libmp3lame/i386/fftsse.nas +--- lame-398-orig/libmp3lame/i386/fftsse.nas 2008-07-16 21:47:19.000000000 +0200 ++++ lame-398/libmp3lame/i386/fftsse.nas 2008-07-16 21:48:10.000000000 +0200 +@@ -25,6 +25,12 @@ costab_fft:
+ S_SQRT2 dd 1.414213562
+
+ segment_code
++
++extern _GLOBAL_OFFSET_TABLE_
++get_pc.bp:
++ mov ebp, [esp]
++ retn
++
+ ;------------------------------------------------------------------------
+ ; by K. SAKAI
+ ; 99/08/18 PIII 23k[clk]
+@@ -40,15 +46,20 @@ fht_SSE:
+ push esi
+ push edi
+ push ebp
+-%assign _P 4*4
++
++%assign _P 4*5
+
+ ;2¤ÄÌܤΥ롼¥×
+- mov eax,[esp+_P+4] ;eax=fz
+- mov ebp,[esp+_P+8] ;=n
++ mov eax,[esp+_P+0] ;eax=fz
++ mov ebp,[esp+_P+4] ;=n
+ shl ebp,3
+ add ebp,eax ; fn = fz + n, ¤³¤Î´Ø¿ô½ªÎ»¤Þ¤ÇÉÔÊÑ
++ push ebp
++
++ call get_pc.bp
++ add ebp, _GLOBAL_OFFSET_TABLE_ + $$ - $ wrt ..gotpc
+
+- lea ecx,[costab_fft]
++ lea ecx,[ebp + costab_fft wrt ..gotoff]
+ xor eax,eax
+ mov al,8 ; =k1=1*(sizeof float) // 4, 16, 64, 256,...
+ .lp2: ; do{
+@@ -101,12 +112,12 @@ fht_SSE:
+ ; gi[k3] = g1 - g3;
+ fld dword [edi]
+ fadd dword [edi+eax*2]
+- fld dword [S_SQRT2]
++ fld dword [ebp + S_SQRT2 wrt ..gotoff]
+ fmul dword [edi+eax*4]
+
+ fld dword [edi]
+ fsub dword [edi+eax*2]
+- fld dword [S_SQRT2]
++ fld dword [ebp + S_SQRT2 wrt ..gotoff]
+ fmul dword [edi+edx*2]
+
+ fld st1
+@@ -121,7 +132,7 @@ fht_SSE:
+ fsubp st1,st0
+ fstp dword [edi+eax*4]
+
+- cmp ebx,ebp
++ cmp ebx,[esp]
+ jl near .lp20 ; while (fi<fn);
+
+
+@@ -136,17 +147,17 @@ fht_SSE:
+ ; s2 = c1*s1 + s1*c1 = 2*s1*c1;
+ shufps xmm7,xmm7,R4(1,0,0,1)
+ movss xmm5,xmm7 ; = { --, --, --, s1}
+- xorps xmm7,[Q_MMPP] ; = {-s1, -c1, +c1, +s1} -> ɬÍ×
++ xorps xmm7,[ebp + Q_MMPP wrt ..gotoff] ; = {-s1, -c1, +c1, +s1} -> ɬÍ×
+
+ addss xmm5,xmm5 ; = (--, --, --, 2*s1)
+ add esi,4 ; esi = fi = fz + i
+ shufps xmm5,xmm5,R4(0,0,0,0) ; = (2*s1, 2*s1, 2*s1, 2*s1)
+ mulps xmm5,xmm6 ; = (2*s1*c1, 2*s1*s1, 2*s1*s1, 2*s1*c1)
+- subps xmm5,[D_1100] ; = (--, 2*s1*s1-1, --, 2*s1*c1) = {-- -c2 -- s2}
++ subps xmm5,[ebp + D_1100 wrt ..gotoff] ; = (--, 2*s1*s1-1, --, 2*s1*c1) = {-- -c2 -- s2}
+ movaps xmm4,xmm5
+ shufps xmm5,xmm5,R4(2,0,2,0) ; = {-c2, s2, -c2, s2} -> ɬÍ×
+
+- xorps xmm4,[Q_MMPP] ; = {--, c2, --, s2}
++ xorps xmm4,[ebp + Q_MMPP wrt ..gotoff] ; = {--, c2, --, s2}
+ shufps xmm4,xmm4,R4(0,2,0,2) ; = {s2, c2, s2, c2} -> ɬÍ×
+
+ loopalign 16
+@@ -222,7 +233,7 @@ fht_SSE:
+ movss [edi+eax*4],xmm2
+ movss [esi+edx*2],xmm0
+ lea esi,[esi + eax*8] ; fi += (k1 * 4);
+- cmp esi,ebp
++ cmp esi,[esp]
+ jl near .lp21 ; while (fi<fn);
+
+
+@@ -247,7 +258,7 @@ fht_SSE:
+ shufps xmm0,xmm0,R4(1,1,0,0) ; = {t_s, t_s, t_c, t_c}
+ mulps xmm6,xmm0 ; = {c3*ts, s3*ts, s3*tc, c3*tc}
+ movhlps xmm4,xmm6 ; = {--, --, c3*ts, s3*ts}
+- xorps xmm4,[Q_MPMP] ; = {--, --, -c3*ts, s3*ts}
++ xorps xmm4,[ebp + Q_MPMP wrt ..gotoff] ; = {--, --, -c3*ts, s3*ts}
+ subps xmm6,xmm4 ; = {-,-, c3*ts+s3*tc, c3*tc-s3*ts}={-,-,s1,c1}
+
+ ; c3 = c1*t_c - s1*t_s;
+@@ -255,7 +266,7 @@ fht_SSE:
+ shufps xmm6,xmm6,0x14 ; = {c1, s1, s1, c1}
+ mulps xmm0,xmm6 ; = {ts*c1 ts*s1 tc*s1 tc*c1}
+ movhlps xmm3,xmm0
+- xorps xmm3,[Q_MPMP]
++ xorps xmm3,[ebp + Q_MPMP wrt ..gotoff]
+ subps xmm0,xmm3 ; = {--, --, s3, c3}
+
+ ; {s2 s4 c4 c2} = {2*s1*c1 2*s3*c3 1-2*s3*s3 1-2*s1*s1}
+@@ -268,7 +279,7 @@ fht_SSE:
+ sub edi,ebx ; edi = fz - i/2
+ mulps xmm7, xmm6 ; {s1*s1*2, s3*s3*2, s3*c3*2, s1*c1*2}
+ lea esi,[edi + ebx*2] ; esi = fi = fz +i/2
+- subps xmm7, [D_1100] ; {-c2, -c4, s4, s2}
++ subps xmm7, [ebp + D_1100 wrt ..gotoff] ; {-c2, -c4, s4, s2}
+ lea edi,[edi + eax*2-4] ; edi = gi = fz +k1-i/2
+
+ ; fi = fz +i;
+@@ -286,7 +297,7 @@ fht_SSE:
+ ; d = s2*fi[k3 ] - c2*gi[k3 ];
+
+ movaps xmm4,xmm7 ; = {-c2 -c4 s4 s2}
+- xorps xmm4,[Q_MMPP] ; = { c2 c4 s4 s2}
++ xorps xmm4,[ebp + Q_MMPP wrt ..gotoff] ; = { c2 c4 s4 s2}
+ shufps xmm4,xmm4,0x1B ; = { s2 s4 c4 c2}
+ movlps xmm0,[esi+eax*2]
+ movlps xmm1,[edi+eax*2]
+@@ -390,7 +401,7 @@ fht_SSE:
+ ; fi += k4;
+ lea edi,[edi + eax*8] ; gi += (k1 * 4);
+ lea esi,[esi + eax*8] ; fi += (k1 * 4);
+- cmp esi,ebp
++ cmp esi,[esp]
+ jl near .lp220 ; while (fi<fn);
+ ; } while (fi<fn);
+
+@@ -405,6 +416,7 @@ fht_SSE:
+ cmp eax,[esp+_P+8] ; while ((k1 * 4)<n);
+ jle near .lp2
+ pop ebp
++ pop ebp
+ pop edi
+ pop esi
+ pop ebx
diff --git a/media-sound/lame/files/lame-3.98-shared-frontend.patch b/media-sound/lame/files/lame-3.98-shared-frontend.patch new file mode 100644 index 000000000..abe96a339 --- /dev/null +++ b/media-sound/lame/files/lame-3.98-shared-frontend.patch @@ -0,0 +1,24 @@ +diff -ur lame-398.old/frontend/Makefile.am lame-398.new/frontend/Makefile.am +--- lame-398.old/frontend/Makefile.am 2006-09-30 11:17:05.000000000 +0200 ++++ lame-398.new/frontend/Makefile.am 2008-07-06 12:36:25.000000000 +0200 +@@ -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 -ur lame-398.old/frontend/Makefile.in lame-398.new/frontend/Makefile.in +--- lame-398.old/frontend/Makefile.in 2008-06-25 14:17:51.000000000 +0200 ++++ lame-398.new/frontend/Makefile.in 2008-07-06 12:36:39.000000000 +0200 +@@ -152,7 +152,7 @@ + $(top_builddir)/libmp3lame/libmp3lame.la \ + @FRONTEND_LDADD@ + +-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static ++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/media-sound/lame/files/lame-3.98-stdint.patch b/media-sound/lame/files/lame-3.98-stdint.patch new file mode 100644 index 000000000..c2561ec91 --- /dev/null +++ b/media-sound/lame/files/lame-3.98-stdint.patch @@ -0,0 +1,26 @@ +Index: lame-398/frontend/mp3rtp.c +=================================================================== +--- lame-398.orig/frontend/mp3rtp.c ++++ lame-398/frontend/mp3rtp.c +@@ -12,8 +12,6 @@ + + #ifdef HAVE_CONFIG_H + # include <config.h> +-/* std int types already defined in config.h */ +-#define _STDINT_H + #endif + + #ifdef STDC_HEADERS +Index: lame-398/frontend/rtp.c +=================================================================== +--- lame-398.orig/frontend/rtp.c ++++ lame-398/frontend/rtp.c +@@ -2,8 +2,6 @@ + + #ifdef HAVE_CONFIG_H + # include <config.h> +-/* std int types already defined in config.h */ +-# define _STDINT_H + #endif + + #ifndef __GNUC__ diff --git a/media-sound/lame/lame-3.97-r1.ebuild b/media-sound/lame/lame-3.97-r1.ebuild new file mode 100644 index 000000000..16c890c00 --- /dev/null +++ b/media-sound/lame/lame-3.97-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.97-r1.ebuild,v 1.11 2008/11/09 21:06:42 loki_val Exp $ + +EAPI="1" + +inherit flag-o-matic toolchain-funcs eutils autotools multilib-native + +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" +IUSE="debug mp3rtp" + +RDEPEND=">=sys-libs/ncurses-5.2[lib32?]" +DEPEND="${RDEPEND}" + +src_unpack() { + unpack ${A} + cd "${S}" + + # The frontened tries to link staticly, but we prefer shared libs + epatch "${FILESDIR}"/${PN}-3.96.1-shared-frontend.patch + + # If ccc (alpha compiler) is installed on the system, the default + # configure is broken, fix it to respect CC. This is only + # directly broken for ARCH=alpha but would affect anybody with a + # ccc binary in their PATH. Bug #41908 (26 Jul 2004 agriffis) + epatch "${FILESDIR}"/${PN}-3.96-ccc.patch + + # Make sure -lm is linked in the library to fix other programs linking to + # this while using --as-needed + epatch "${FILESDIR}"/${PN}-3.96.1-asneeded.patch + + AT_M4DIR="${S}" eautoreconf || die + epunt_cxx # embedded bug #74498 +} + +multilib-native_src_compile_internal() { + # take out -fomit-frame-pointer from CFLAGS if k6-2 + is-flag "-march=k6-3" && filter-flags "-fomit-frame-pointer" + is-flag "-march=k6-2" && filter-flags "-fomit-frame-pointer" + is-flag "-march=k6" && filter-flags "-fomit-frame-pointer" + + # The user sets compiler optimizations... But if you'd like + # lame to choose it's own... uncomment one of these (experiMENTAL) + # myconf="${myconf} --enable-expopt=full \ + # myconf="${myconf} --enable-expopt=norm \ + + econf \ + --enable-shared \ + $(use_enable debug debug norm) \ + --disable-mp3x \ + $(use_enable mp3rtp mp3rtp) \ + ${myconf} || die "econf failed" + + emake || die "emake failed" +} + +multilib-native_src_install_internal() { + emake DESTDIR="${D}" pkghtmldir="/usr/share/doc/${PF}/html" install || die + + dodoc API ChangeLog HACKING README* STYLEGUIDE TODO USAGE + dohtml misc/lameGUI.html Dll/LameDLLInterface.htm + + dobin "${S}"/misc/mlame || die +} + +pkg_postinst(){ + if use mp3rtp ; then + ewarn "Warning, support for the encode-to-RTP program, 'mp3rtp'" + ewarn "is broken as of August 2001." + ewarn " " + fi +} diff --git a/media-sound/lame/lame-3.98.2.ebuild b/media-sound/lame/lame-3.98.2.ebuild new file mode 100644 index 000000000..60b2cb43c --- /dev/null +++ b/media-sound/lame/lame-3.98.2.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.2.ebuild,v 1.6 2008/11/14 12:25:16 armin76 Exp $ + +EAPI="2" + +inherit flag-o-matic toolchain-funcs eutils autotools versionator multilib-native + +DESCRIPTION="LAME Ain't an MP3 Encoder" +HOMEPAGE="http://lame.sourceforge.net" + +MY_PV=$(replace_version_separator 1 '') +[ ${MY_PV/.} = ${MY_PV} ] || MY_PV=$(replace_version_separator 1 '-' ${MY_PV}) +S=${WORKDIR}/${PN}-${MY_PV} +SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" +IUSE="debug mmx mp3rtp sndfile" + +RDEPEND=">=sys-libs/ncurses-5.2[lib32?] + sndfile? ( >=media-libs/libsndfile-1.0.2[lib32?] )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + mmx? ( dev-lang/nasm )" + +multilib-native_src_prepare_internal() { + cd "${S}" + + # The frontened tries to link staticly, but we prefer shared libs + epatch "${FILESDIR}"/${PN}-3.98-shared-frontend.patch + + # If ccc (alpha compiler) is installed on the system, the default + # configure is broken, fix it to respect CC. This is only + # directly broken for ARCH=alpha but would affect anybody with a + # ccc binary in their PATH. Bug #41908 (26 Jul 2004 agriffis) + epatch "${FILESDIR}"/${PN}-3.96-ccc.patch + + # Patch gtk stuff, otherwise eautoreconf dies + epatch "${FILESDIR}"/${PN}-3.98-gtk-path.patch + + # It fails parallel make otherwise when enabling nasm... + mkdir "${S}/libmp3lame/i386/.libs" || die + + AT_M4DIR="${S}" eautoreconf + epunt_cxx # embedded bug #74498 +} + +multilib-native_src_configure_internal() { + use sndfile && myconf="--with-fileio=sndfile" + # The user sets compiler optimizations... But if you'd like + # lame to choose it's own... uncomment one of these (experiMENTAL) + # myconf="${myconf} --enable-expopt=full \ + # myconf="${myconf} --enable-expopt=norm \ + + econf \ + --enable-shared \ + $(use_enable debug debug norm) \ + --disable-mp3x \ + $(use_enable mmx nasm) \ + $(use_enable mp3rtp) \ + ${myconf} || die "econf failed" +} + +multilib-native_src_install_internal() { + emake DESTDIR="${D}" pkghtmldir="/usr/share/doc/${PF}/html" install || die + + dodoc API ChangeLog HACKING README* STYLEGUIDE TODO USAGE || die + dohtml misc/lameGUI.html Dll/LameDLLInterface.htm || die + + dobin "${S}"/misc/mlame || die +} + +pkg_postinst(){ + if use mp3rtp ; then + ewarn "Warning, support for the encode-to-RTP program, 'mp3rtp'" + ewarn "is broken as of August 2001." + ewarn " " + fi +} diff --git a/media-sound/lame/lame-3.98.ebuild b/media-sound/lame/lame-3.98.ebuild new file mode 100644 index 000000000..fe58de6e0 --- /dev/null +++ b/media-sound/lame/lame-3.98.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.ebuild,v 1.6 2008/08/08 08:29:25 aballier Exp $ + +EAPI="1" + +inherit flag-o-matic toolchain-funcs eutils autotools versionator multilib-native + +DESCRIPTION="LAME Ain't an MP3 Encoder" +HOMEPAGE="http://lame.sourceforge.net" + +MY_PV=$(replace_version_separator 1 '') +S=${WORKDIR}/${PN}-${MY_PV} +SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="debug mmx mp3rtp sndfile" + +RDEPEND=">=sys-libs/ncurses-5.2[lib32?] + sndfile? ( >=media-libs/libsndfile-1.0.2[lib32?] )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + mmx? ( dev-lang/nasm )" + +src_unpack() { + unpack ${A} + cd "${S}" + + # The frontened tries to link staticly, but we prefer shared libs + epatch "${FILESDIR}"/${P}-shared-frontend.patch + + # If ccc (alpha compiler) is installed on the system, the default + # configure is broken, fix it to respect CC. This is only + # directly broken for ARCH=alpha but would affect anybody with a + # ccc binary in their PATH. Bug #41908 (26 Jul 2004 agriffis) + epatch "${FILESDIR}"/${PN}-3.96-ccc.patch + + # Patch gtk stuff, otherwise eautoreconf dies + epatch "${FILESDIR}"/${PN}-3.98-gtk-path.patch + + # Fix build of mp3rtp, bug #231541 + # Dont prevent stdint.h from being included when it's in fact needed + epatch "${FILESDIR}"/${PN}-3.98-stdint.patch + + # PIC Fix by the PaX Team, bug #93279 + epatch "${FILESDIR}"/${PN}-3.98-pic-fix.patch + + # Let it use proper %if statements for marking stacks as non executable + epatch "${FILESDIR}"/${PN}-3.98-execstacks.patch + + # It needs $(ECHO) to be defined but it seems libtool 2.2 doesn't define it + # anymore + epatch "${FILESDIR}/${P}-echo.patch" + + # It fails parallel make otherwise when enabling nasm... + mkdir "${S}/libmp3lame/i386/.libs" || die + + AT_M4DIR="${S}" eautoreconf + epunt_cxx # embedded bug #74498 +} + +multilib-native_src_compile_internal() { + use sndfile && myconf="--with-fileio=sndfile" + # The user sets compiler optimizations... But if you'd like + # lame to choose it's own... uncomment one of these (experiMENTAL) + # myconf="${myconf} --enable-expopt=full \ + # myconf="${myconf} --enable-expopt=norm \ + + econf \ + --enable-shared \ + $(use_enable debug debug norm) \ + --disable-mp3x \ + $(use_enable mmx nasm) \ + $(use_enable mp3rtp) \ + ${myconf} || die "econf failed" + + emake || die "emake failed" +} + +multilib-native_src_install_internal() { + emake DESTDIR="${D}" pkghtmldir="/usr/share/doc/${PF}/html" install || die + + dodoc API ChangeLog HACKING README* STYLEGUIDE TODO USAGE || die + dohtml misc/lameGUI.html Dll/LameDLLInterface.htm || die + + dobin "${S}"/misc/mlame || die +} + +pkg_postinst(){ + if use mp3rtp ; then + ewarn "Warning, support for the encode-to-RTP program, 'mp3rtp'" + ewarn "is broken as of August 2001." + ewarn " " + fi +} diff --git a/media-sound/lame/metadata.xml b/media-sound/lame/metadata.xml new file mode 100644 index 000000000..846f32e69 --- /dev/null +++ b/media-sound/lame/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>sound</herd> + <use> + <flag name="mp3rtp">Build the mp3-to-RTP streaming utility. **UNSUPPORTED**</flag> + </use> +</pkgmetadata> |