| 1 |
aballier 11/06/29 15:07:07 |
| 2 |
|
| 3 |
Modified: ffmpeg-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
drop the video_cards_nvidia guard for vdpau |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.49 media-video/ffmpeg/ffmpeg-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.49&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.49&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.48&r2=1.49 |
| 15 |
|
| 16 |
Index: ffmpeg-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v |
| 19 |
retrieving revision 1.48 |
| 20 |
retrieving revision 1.49 |
| 21 |
diff -u -r1.48 -r1.49 |
| 22 |
--- ffmpeg-9999.ebuild 29 Jun 2011 15:01:15 -0000 1.48 |
| 23 |
+++ ffmpeg-9999.ebuild 29 Jun 2011 15:07:07 -0000 1.49 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.48 2011/06/29 15:01:15 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.49 2011/06/29 15:07:07 aballier Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
|
| 32 |
@@ -36,12 +36,6 @@ |
| 33 |
v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib |
| 34 |
" |
| 35 |
|
| 36 |
-VIDEO_CARDS="nvidia" |
| 37 |
- |
| 38 |
-for x in ${VIDEO_CARDS}; do |
| 39 |
- IUSE="${IUSE} video_cards_${x}" |
| 40 |
-done |
| 41 |
- |
| 42 |
RDEPEND=" |
| 43 |
alsa? ( media-libs/alsa-lib ) |
| 44 |
amr? ( media-libs/opencore-amr ) |
| 45 |
@@ -70,7 +64,7 @@ |
| 46 |
speex? ( >=media-libs/speex-1.2_beta3 ) |
| 47 |
truetype? ( media-libs/freetype:2 ) |
| 48 |
vaapi? ( >=x11-libs/libva-0.32 ) |
| 49 |
- video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) ) |
| 50 |
+ vdpau? ( x11-libs/libvdpau ) |
| 51 |
vpx? ( >=media-libs/libvpx-0.9.6 ) |
| 52 |
X? ( x11-libs/libX11 x11-libs/libXext ) |
| 53 |
zlib? ( sys-libs/zlib ) |
| 54 |
@@ -105,7 +99,7 @@ |
| 55 |
local version3="" |
| 56 |
|
| 57 |
# enabled by default |
| 58 |
- for i in debug doc network vaapi zlib; do |
| 59 |
+ for i in debug doc network vaapi vdpau zlib; do |
| 60 |
use ${i} || myconf="${myconf} --disable-${i}" |
| 61 |
done |
| 62 |
use bzip2 || myconf="${myconf} --disable-bzlib" |
| 63 |
@@ -113,12 +107,6 @@ |
| 64 |
|
| 65 |
use cpudetection && myconf="${myconf} --enable-runtime-cpudetect" |
| 66 |
|
| 67 |
- #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do |
| 68 |
- # use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}" |
| 69 |
- # use vdpau || myconf="${myconf} --disable-decoder=${i}" |
| 70 |
- #done |
| 71 |
- use video_cards_nvidia && use vdpau || myconf="${myconf} --disable-vdpau" |
| 72 |
- |
| 73 |
# Encoders |
| 74 |
if use encode |
| 75 |
then |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.428 media-video/ffmpeg/ChangeLog |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.428&view=markup |
| 82 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.428&content-type=text/plain |
| 83 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.427&r2=1.428 |
| 84 |
|
| 85 |
Index: ChangeLog |
| 86 |
=================================================================== |
| 87 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v |
| 88 |
retrieving revision 1.427 |
| 89 |
retrieving revision 1.428 |
| 90 |
diff -u -r1.427 -r1.428 |
| 91 |
--- ChangeLog 29 Jun 2011 15:01:15 -0000 1.427 |
| 92 |
+++ ChangeLog 29 Jun 2011 15:07:07 -0000 1.428 |
| 93 |
@@ -1,6 +1,9 @@ |
| 94 |
# ChangeLog for media-video/ffmpeg |
| 95 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 96 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.427 2011/06/29 15:01:15 aballier Exp $ |
| 97 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.428 2011/06/29 15:07:07 aballier Exp $ |
| 98 |
+ |
| 99 |
+ 29 Jun 2011; Alexis Ballier <aballier@g.o> ffmpeg-9999.ebuild: |
| 100 |
+ drop the video_cards_nvidia guard for vdpau |
| 101 |
|
| 102 |
29 Jun 2011; Alexis Ballier <aballier@g.o> ffmpeg-9999.ebuild: |
| 103 |
drop custom-cflags useflag and always use ours |
Archives