/[gentoo-x86]/media-video/vlc/vlc-9999.ebuild
Gentoo

Diff of /media-video/vlc/vlc-9999.ebuild

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.214 Revision 1.218
1# Copyright 1999-2014 Gentoo Foundation 1# Copyright 1999-2014 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.214 2014/03/12 16:15:16 tomwij Exp $ 3# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.218 2014/03/26 18:38:20 tomwij Exp $
4 4
5EAPI="5" 5EAPI="5"
6 6
7SCM="" 7SCM=""
8if [ "${PV%9999}" != "${PV}" ] ; then 8if [ "${PV%9999}" != "${PV}" ] ; then
140 twolame? ( media-sound/twolame:0 ) 140 twolame? ( media-sound/twolame:0 )
141 udev? ( >=virtual/udev-142:0 ) 141 udev? ( >=virtual/udev-142:0 )
142 upnp? ( net-libs/libupnp:0 ) 142 upnp? ( net-libs/libupnp:0 )
143 v4l? ( media-libs/libv4l:0 ) 143 v4l? ( media-libs/libv4l:0 )
144 vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] ) 144 vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] )
145 vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) 145 vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )"
146
147# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
148# thus we'll have to wait for a new release there.
149RDEPEND="${RDEPEND}
146 vdpau? ( >=x11-libs/libvdpau-0.6:0 !<media-video/libav-10_beta1 ) 150 vdpau? ( >=x11-libs/libvdpau-0.6:0 !<media-video/libav-10_beta1 !<media-video/ffmpeg-9999 )
147 vnc? ( >=net-libs/libvncserver-0.9.9:0 ) 151 vnc? ( >=net-libs/libvncserver-0.9.9:0 )
148 vorbis? ( media-libs/libvorbis:0 ) 152 vorbis? ( media-libs/libvorbis:0 )
149 vpx? ( media-libs/libvpx:0 ) 153 vpx? ( media-libs/libvpx:0 )
150 X? ( x11-libs/libX11:0 ) 154 X? ( x11-libs/libX11:0 )
151 x264? ( >=media-libs/x264-0.0.20090923:0= ) 155 x264? ( >=media-libs/x264-0.0.20090923:0= )
238 242
239 # Fix build system mistake. 243 # Fix build system mistake.
240 epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch 244 epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
241 245
242 # Patch up incompatibilities and reconfigure autotools. 246 # Patch up incompatibilities and reconfigure autotools.
243 epatch "${FILESDIR}"/${PN}-2.1.0-libva-1.2.1-compat.patch 247 epatch "${FILESDIR}"/${P}-libva-1.2.1-compat.patch
244 248
245 # Fix up broken audio when skipping using a fixed reversed bisected commit. 249 # Fix up broken audio when skipping using a fixed reversed bisected commit.
246 epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch 250 epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
247 251
248 # Disable avcodec checks when avcodec is not used. 252 # Disable avcodec checks when avcodec is not used.

Legend:
Removed from v.1.214  
changed lines
  Added in v.1.218

  ViewVC Help
Powered by ViewVC 1.1.20