diff options
| author |   Chris White <chriswhite@gentoo.org> | 2005-03-20 03:42:06 +0000 |
|---|---|---|
| committer | Chris White <chriswhite@gentoo.org> | 2005-03-20 03:42:06 +0000 |
| commit | ddc91cc0541bf1bf8257fcf7442b586ac5b067d4 (patch) | |
| tree | 3250d8535ab748de0a52c524b25f69526d0cbbff /media-video | |
| parent | ~amd64, bug 85028 (diff) | |
| download | gentoo-2-ddc91cc0541bf1bf8257fcf7442b586ac5b067d4.tar.gz gentoo-2-ddc91cc0541bf1bf8257fcf7442b586ac5b067d4.tar.bz2 gentoo-2-ddc91cc0541bf1bf8257fcf7442b586ac5b067d4.zip | |
Fixed a52 linking (again). Closes bugs #85929 and #85952.
(Portage version: 2.0.51.19)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild | 4 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/gentoo-ffmpeg001.patch | 13 |
3 files changed, 8 insertions, 15 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 0f02fb5851d6..7c8b9df64ec8 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.57 2005/03/18 23:28:48 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.58 2005/03/20 03:42:06 chriswhite Exp $ + + 20 Mar 2005; Chris White <chriswhite@gentoo.org> + files/gentoo-ffmpeg001.patch, ffmpeg-0.4.9_p20050226-r2.ebuild: + Fixed a52 linking (again). Closes bugs #85929 and #85952. *ffmpeg-0.4.9_p20050226-r2 (19 Mar 2005) diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild index 7eb0be16176b..e148f8aff0d8 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild,v 1.1 2005/03/18 23:28:48 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild,v 1.2 2005/03/20 03:42:06 chriswhite Exp $ inherit eutils flag-o-matic gcc multilib @@ -56,6 +56,8 @@ src_unpack() { epatch ${FILESDIR}/${PN}-libdir-pic.patch + sed -i -e "s:\$ldl\ \$extralibs:\$ldl\ -la52\ \$extralibs:" configure || die "Unable to patch in -la52" + cd ${S} cp -R ${S_BASE} ${S_STATIC} mv ${S_BASE} ${S_SHARED} diff --git a/media-video/ffmpeg/files/gentoo-ffmpeg001.patch b/media-video/ffmpeg/files/gentoo-ffmpeg001.patch index dc654ae04373..30cd0edd31a7 100644 --- a/media-video/ffmpeg/files/gentoo-ffmpeg001.patch +++ b/media-video/ffmpeg/files/gentoo-ffmpeg001.patch @@ -1,16 +1,3 @@ ---- Makefile.old 2005-02-24 10:18:02.000000000 -0500 -+++ Makefile 2005-03-18 17:48:45.000000000 -0500 -@@ -73,6 +73,10 @@ - EXTRALIBS+=-ldc1394_control -lraw1394 - endif - -+ifeq ($(CONFIG_A52BIN),yes) -+EXTRALIBS+=-la52 -+endif -+ - ifeq ($(BUILD_VHOOK),yes) - VHOOK=videohook - INSTALLVHOOK=install-vhook --- libavcodec/a52dec.c.old 2005-02-28 10:23:54.002233360 +0900 +++ libavcodec/a52dec.c 2005-02-28 10:35:36.910375080 +0900 @@ -73,7 +73,7 @@ |