diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-05-31 09:48:57 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-05-31 09:48:57 +0000 |
| commit | b220062ca31ee96db8999d9ee9e260100c7031ef (patch) | |
| tree | 7ade43868f88de69a2d28efdb6b77d11dc66c9fa /media-video | |
| parent | Initial import #221759. (diff) | |
| download | gentoo-2-b220062ca31ee96db8999d9ee9e260100c7031ef.tar.gz gentoo-2-b220062ca31ee96db8999d9ee9e260100c7031ef.tar.bz2 gentoo-2-b220062ca31ee96db8999d9ee9e260100c7031ef.zip | |
While I'm at it, backport another patch to fix linking with ffmpeg trunk.
(Portage version: 2.1.5.2)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vlc/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/vlc/files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch | 25 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.9.0_alpha20080524.ebuild | 3 |
3 files changed, 33 insertions, 2 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index dbbe2b51c77e..56353e62b4a8 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.339 2008/05/31 08:42:13 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.340 2008/05/31 09:48:56 aballier Exp $ + + 31 May 2008; Alexis Ballier <aballier@gentoo.org> + +files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch, + vlc-0.9.0_alpha20080524.ebuild: + While I'm at it, backport another patch to fix linking with ffmpeg trunk. 31 May 2008; Alexis Ballier <aballier@gentoo.org> +files/0001-Include-altivec.h-before-any-other-vlc-header-as-inc.patch, diff --git a/media-video/vlc/files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch b/media-video/vlc/files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch new file mode 100644 index 000000000000..c30d5732f8c1 --- /dev/null +++ b/media-video/vlc/files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch @@ -0,0 +1,25 @@ +From b41bc1645bcb2f3942e57ff19e4791a1f892de7a Mon Sep 17 00:00:00 2001 +From: Alexis Ballier <aballier@gentoo.org> +Date: Sat, 31 May 2008 11:17:56 +0200 +Subject: [PATCH] Explicitly check for and link to libavutil since av_free and friends are used in the ffmpeg plugin and after r13528 ffmpeg's .pc files do not tell anymore to link needlessly to its private library requirements. + +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2aa5359..e03cac8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3000,7 +3000,7 @@ if test "${enable_ffmpeg}" != "no" + then + + dnl Trying with pkg-config +- PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], ++ PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat, libavutil], + [ + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}" +-- +1.5.5.3 + diff --git a/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild b/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild index f1fafd0ef10a..83a0fb809251 100644 --- a/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild +++ b/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild,v 1.3 2008/05/31 08:42:13 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild,v 1.4 2008/05/31 09:48:56 aballier Exp $ EAPI="1" @@ -177,6 +177,7 @@ src_unpack() { EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" epatch "${FILESDIR}/0001-Include-altivec.h-before-any-other-vlc-header-as-inc.patch" + epatch "${FILESDIR}/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch" AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf } |