diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-07 18:58:58 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-07 18:58:58 +0000 |
| commit | d2062918f33da756465aae20cf572b32dbf4ad36 (patch) | |
| tree | 0e29dccfe6477aa4fdb6cdc26b017ffc510d8182 /media-tv | |
| parent | Pull in -r1 of media-libs/jpeg-9 wrt #479808 in attempt to force the upgrade. (diff) | |
| download | gentoo-2-d2062918f33da756465aae20cf572b32dbf4ad36.tar.gz gentoo-2-d2062918f33da756465aae20cf572b32dbf4ad36.tar.bz2 gentoo-2-d2062918f33da756465aae20cf572b32dbf4ad36.zip | |
Add working libav support. It requires libav git master or 10. Add a warning when building against libav to reflect the state of such support. Add := deps on libav and ffmpeg.
(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-tv')
| -rw-r--r-- | media-tv/xbmc/ChangeLog | 7 | ||||
| -rw-r--r-- | media-tv/xbmc/xbmc-9999.ebuild | 14 |
2 files changed, 17 insertions, 4 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index f604d38e66b7..2e1a82e31770 100644 --- a/media-tv/xbmc/ChangeLog +++ b/media-tv/xbmc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-tv/xbmc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.193 2013/07/20 16:10:24 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.194 2013/08/07 18:58:58 aballier Exp $ + + 07 Aug 2013; Alexis Ballier <aballier@gentoo.org> xbmc-9999.ebuild: + Add working libav support. It requires libav git master or 10. Add a warning + when building against libav to reflect the state of such support. Add := deps + on libav and ffmpeg. 20 Jul 2013; Alexis Ballier <aballier@gentoo.org> xbmc-9999.ebuild: Fix vdpau deps again: It requires either ffmpeg-1.2.1 or a post-libav9 diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild index 79ff6f744703..07cd82002ad4 100644 --- a/media-tv/xbmc/xbmc-9999.ebuild +++ b/media-tv/xbmc/xbmc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.148 2013/07/20 16:10:24 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.149 2013/08/07 18:58:58 aballier Exp $ EAPI=5 @@ -91,7 +91,7 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack - || ( >=media-video/ffmpeg-1.0[encode] ( media-libs/libpostproc >=media-video/libav-9[encode] ) ) + || ( >=media-video/ffmpeg-1.2.1:=[encode] ( media-libs/libpostproc >=media-video/libav-10_alpha:=[encode] ) ) rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) @@ -114,7 +114,7 @@ COMMON_DEPEND="${PYTHON_DEPS} vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) - || ( >=media-video/ffmpeg-1.2.1[vdpau] >=media-video/libav-10_alpha[vdpau] ) + || ( >=media-video/ffmpeg-1.2.1:=[vdpau] >=media-video/libav-10_alpha:=[vdpau] ) ) X? ( x11-apps/xdpyinfo @@ -138,6 +138,13 @@ S=${WORKDIR}/${MY_P} pkg_setup() { python-single-r1_pkg_setup + + if has_version 'media-video/libav' ; then + ewarn "Building ${PN} against media-video/libav is not supported upstream." + ewarn "It requires building a (small) wrapper library with some code" + ewarn "from media-video/ffmpeg." + ewarn "If you experience issues, please try with media-video/ffmpeg." + fi } src_unpack() { @@ -206,6 +213,7 @@ src_configure() { --disable-ccache \ --disable-optimizations \ --enable-external-libraries \ + $(has_version 'media-video/libav' && echo "--enable-libav-compat") \ --enable-gl \ $(use_enable airplay) \ $(use_enable avahi) \ |