summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-10-04 00:01:12 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-10-04 00:01:12 +0000
commit344b30fd9c005a2b07a6d2f770dd3c30b83131b7 (patch)
treed7f2dd24b4b790ea502996314b42e836ff0c51d1 /media-sound/lame
parentstable on x86 (diff)
downloadhistorical-344b30fd9c005a2b07a6d2f770dd3c30b83131b7.tar.gz
historical-344b30fd9c005a2b07a6d2f770dd3c30b83131b7.tar.bz2
historical-344b30fd9c005a2b07a6d2f770dd3c30b83131b7.zip
link against shared libs. Closes bug #58547. Stable amd64, sparc, x86.
Diffstat (limited to 'media-sound/lame')
-rw-r--r--media-sound/lame/ChangeLog6
-rw-r--r--media-sound/lame/files/lame-3.96.1-shared-frontend.patch24
-rw-r--r--media-sound/lame/lame-3.96.1.ebuild9
3 files changed, 35 insertions, 4 deletions
diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index e01b7dcb30ce..7d8ce37fd72f 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/lame
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.49 2004/07/30 02:38:31 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.50 2004/10/04 00:01:12 eradicator Exp $
+
+ 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
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 000000000000..269355c96809
--- /dev/null
+++ b/media-sound/lame/files/lame-3.96.1-shared-frontend.patch
@@ -0,0 +1,24 @@
+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 -Naur lame-3.96.1.orig/frontend/Makefile.in lame-3.96.1/frontend/Makefile.in
+--- lame-3.96.1.orig/frontend/Makefile.in 2004-01-21 05:50:29.000000000 -0800
++++ lame-3.96.1/frontend/Makefile.in 2004-10-03 16:39:19.711701553 -0700
+@@ -91,7 +91,7 @@
+ $(top_builddir)/libmp3lame/libmp3lame.la \
+ @FRONTEND_LDADD@
+
+-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/media-sound/lame/lame-3.96.1.ebuild b/media-sound/lame/lame-3.96.1.ebuild
index d1b87c1a149d..27108b006f72 100644
--- a/media-sound/lame/lame-3.96.1.ebuild
+++ b/media-sound/lame/lame-3.96.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.96.1.ebuild,v 1.2 2004/07/28 17:04:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.96.1.ebuild,v 1.3 2004/10/04 00:01:12 eradicator Exp $
IUSE="gtk debug"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+KEYWORDS="x86 ~ppc sparc ~alpha ~hppa amd64 ~ia64 ~mips"
RDEPEND=">=sys-libs/ncurses-5.2
gtk? ( =x11-libs/gtk+-1.2* )"
@@ -25,11 +25,14 @@ src_unpack() {
unpack ${A}
cd ${S} || die
+ # 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}/lame-3.96-ccc.patch
+ epatch ${FILESDIR}/${PN}-3.96-ccc.patch
autoconf || die
}