diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-04-24 19:00:21 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-04-24 19:00:21 +0000 |
| commit | 96043902e0edf5c638efd2b61e73c2794bf9438d (patch) | |
| tree | 78ada78ea7c1426f3aeab6aaea612aa0a43619fa /media-video/ffmpeg | |
| parent | bug 90234 (diff) | |
| download | gentoo-2-96043902e0edf5c638efd2b61e73c2794bf9438d.tar.gz gentoo-2-96043902e0edf5c638efd2b61e73c2794bf9438d.tar.bz2 gentoo-2-96043902e0edf5c638efd2b61e73c2794bf9438d.zip | |
Added patch to fix linking to libdc1394 package. Fixes bug #90150.
(Portage version: 2.0.51.20)
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-configure-extralibs.patch | 21 |
3 files changed, 28 insertions, 4 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index c30562331465..194c487ef82d 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.69 2005/04/24 18:02:25 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.70 2005/04/24 19:00:21 flameeyes Exp $ + + 24 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/ffmpeg-configure-extralibs.patch, ffmpeg-0.4.9_p20050226-r4.ebuild: + Added patch to link to libdc1394 when ieee1394 is enabled. Fixes #90150. 24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ffmpeg-0.4.9_p20050226-r3.ebuild: diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild index c1a7aca0015d..f2459f282921 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.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-r4.ebuild,v 1.2 2005/04/22 13:12:58 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild,v 1.3 2005/04/24 19:00:21 flameeyes Exp $ inherit eutils flag-o-matic gcc multilib toolchain-funcs @@ -64,8 +64,7 @@ src_unpack() { || die "sed failed (HAVE_MMX)" epatch ${FILESDIR}/${PN}-libdir-pic.patch - - sed -i -e "s:\$ldl\ \$extralibs:\$ldl\ -la52\ \$extralibs:" configure || die "Unable to patch in -la52" + epatch ${FILESDIR}/${PN}-configure-extralibs.patch cd ${S} cp -R ${S_BASE} ${S_STATIC} diff --git a/media-video/ffmpeg/files/ffmpeg-configure-extralibs.patch b/media-video/ffmpeg/files/ffmpeg-configure-extralibs.patch new file mode 100644 index 000000000000..a61ba0f75505 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-configure-extralibs.patch @@ -0,0 +1,21 @@ +diff -ur ffmpeg-0.4.9-p20050226/configure ffmpeg-0.4.9-p20050226-configure/configure +--- ffmpeg-0.4.9-p20050226/configure 2005-02-24 16:18:02.000000000 +0100 ++++ ffmpeg-0.4.9-p20050226-configure/configure 2005-04-24 18:13:19.206706664 +0200 +@@ -404,7 +404,7 @@ + ;; + --enable-a52) a52="yes" + ;; +- --enable-a52bin) a52bin="yes" ; extralibs="$ldl $extralibs" ++ --enable-a52bin) a52bin="yes" ; extralibs="$ldl $extralibs -la52" + ;; + --enable-dts) dts="yes" ; extralibs="$extralibs -ldts" + ;; +@@ -428,7 +428,7 @@ + ;; + --enable-xvid) xvid="yes" + ;; +- --enable-dc1394) dc1394="yes" ++ --enable-dc1394) dc1394="yes" ; extralibs="$extralibs -ldc1394_control -lraw1394" + ;; + --disable-vhook) vhook="no" + ;; |