diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-14 21:45:48 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-14 21:45:48 +0000 |
| commit | 89ec169037e450cebc23f5b22ccce408ba5bc24c (patch) | |
| tree | bd48f0ca11c1e1eaf517d521aea8bbe509338620 /media-video/ffmpeg | |
| parent | Confirm man installation names and category, so that the installed copies on ... (diff) | |
| download | gentoo-2-89ec169037e450cebc23f5b22ccce408ba5bc24c.tar.gz gentoo-2-89ec169037e450cebc23f5b22ccce408ba5bc24c.tar.bz2 gentoo-2-89ec169037e450cebc23f5b22ccce408ba5bc24c.zip | |
Add patch to respect CFLAGS on FreeBSD, and don't use preplib that's no more needed anyway.
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch | 13 |
3 files changed, 22 insertions, 4 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 01b4fa681306..34bf4b090b17 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/ffmpeg # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.133 2006/03/31 13:59:28 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.134 2006/04/14 21:45:44 flameeyes Exp $ + + 14 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch, + ffmpeg-0.4.9_p20060302.ebuild: + Add patch to respect CFLAGS on FreeBSD, and don't use preplib that's no more + needed anyway. 31 Mar 2006; Simon Stelling <blubb@gentoo.org> +files/ffmpeg-libdir.patch, ffmpeg-0.4.9_p20060302.ebuild: diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild index c9e136cb72be..74e0827cdb16 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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_p20060302.ebuild,v 1.11 2006/04/02 16:16:42 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild,v 1.12 2006/04/14 21:45:46 flameeyes Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -73,6 +73,7 @@ src_unpack() { epatch ${FILESDIR}/ffmpeg-unknown-options.patch epatch "${FILESDIR}/${PN}-0.4.9_p20051216-asneeded-configure.patch" + epatch "${FILESDIR}/${P}-fbsd-flags.patch" # .pc files contain wrong libdir path epatch ${FILESDIR}/${PN}-libdir.patch @@ -213,8 +214,6 @@ src_install() { # Some stuff like transcode can use this one. dolib ${S_STATIC}/libavcodec/libpostproc/libpostproc.a - - preplib /usr } # Never die for now... diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch new file mode 100644 index 000000000000..260449bb4b22 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch @@ -0,0 +1,13 @@ +Index: ffmpeg-0.4.9-p20060302/configure +=================================================================== +--- ffmpeg-0.4.9-p20060302.orig/configure ++++ ffmpeg-0.4.9-p20060302/configure +@@ -336,7 +336,7 @@ bktr="yes" + audio_oss="yes" + dv1394="no" + make="gmake" +-CFLAGS="-pthread" ++CFLAGS="$CFLAGS -pthread" + LDFLAGS="$LDFLAGS -export-dynamic -pthread" + ;; + BSD/OS) |