1 |
ssuominen 09/07/09 13:43:14 |
2 |
|
3 |
Modified: metadata.xml ChangeLog ffmpeg-9999-r1.ebuild |
4 |
ffmpeg-0.5-r1.ebuild |
5 |
Log: |
6 |
USE vdpau with VIDEO_CARDS=nvidia wrt #262433, thanks to Bob Deblier for reporting. |
7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.13 media-video/ffmpeg/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.13&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.13&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/metadata.xml?r1=1.12&r2=1.13 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/metadata.xml,v |
19 |
retrieving revision 1.12 |
20 |
retrieving revision 1.13 |
21 |
diff -u -r1.12 -r1.13 |
22 |
--- metadata.xml 3 Jul 2009 19:31:42 -0000 1.12 |
23 |
+++ metadata.xml 9 Jul 2009 13:43:14 -0000 1.13 |
24 |
@@ -23,6 +23,7 @@ |
25 |
<flag name="opencore-amrwb">Enables Adaptive Multi-Rate Wideband support vie opencore-amr.</flag> |
26 |
<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag> |
27 |
<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag> |
28 |
+ <flag name="vdpau">Enables VDPAU decoders (requires nVidia video cards to offload CPU processing to video card</flag> |
29 |
<flag name="vhook">Enables video hooking support.</flag> |
30 |
</use> |
31 |
</pkgmetadata> |
32 |
|
33 |
|
34 |
|
35 |
1.301 media-video/ffmpeg/ChangeLog |
36 |
|
37 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.301&view=markup |
38 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.301&content-type=text/plain |
39 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.300&r2=1.301 |
40 |
|
41 |
Index: ChangeLog |
42 |
=================================================================== |
43 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v |
44 |
retrieving revision 1.300 |
45 |
retrieving revision 1.301 |
46 |
diff -u -r1.300 -r1.301 |
47 |
--- ChangeLog 8 Jul 2009 21:55:40 -0000 1.300 |
48 |
+++ ChangeLog 9 Jul 2009 13:43:14 -0000 1.301 |
49 |
@@ -1,6 +1,11 @@ |
50 |
# ChangeLog for media-video/ffmpeg |
51 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
52 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.300 2009/07/08 21:55:40 ssuominen Exp $ |
53 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.301 2009/07/09 13:43:14 ssuominen Exp $ |
54 |
+ |
55 |
+ 09 Jul 2009; Samuli Suominen <ssuominen@g.o> ffmpeg-0.5-r1.ebuild, |
56 |
+ ffmpeg-9999-r1.ebuild: |
57 |
+ USE vdpau with VIDEO_CARDS=nvidia wrt #262433, thanks to Bob Deblier for |
58 |
+ reporting. |
59 |
|
60 |
08 Jul 2009; Samuli Suominen <ssuominen@g.o> |
61 |
ffmpeg-0.4.9_p20090201.ebuild, ffmpeg-0.5-r1.ebuild, |
62 |
|
63 |
|
64 |
|
65 |
1.10 media-video/ffmpeg/ffmpeg-9999-r1.ebuild |
66 |
|
67 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.10&view=markup |
68 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.10&content-type=text/plain |
69 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.9&r2=1.10 |
70 |
|
71 |
Index: ffmpeg-9999-r1.ebuild |
72 |
=================================================================== |
73 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v |
74 |
retrieving revision 1.9 |
75 |
retrieving revision 1.10 |
76 |
diff -u -r1.9 -r1.10 |
77 |
--- ffmpeg-9999-r1.ebuild 8 Jul 2009 21:55:40 -0000 1.9 |
78 |
+++ ffmpeg-9999-r1.ebuild 9 Jul 2009 13:43:14 -0000 1.10 |
79 |
@@ -1,6 +1,6 @@ |
80 |
# Copyright 1999-2009 Gentoo Foundation |
81 |
# Distributed under the terms of the GNU General Public License v2 |
82 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.9 2009/07/08 21:55:40 ssuominen Exp $ |
83 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.10 2009/07/09 13:43:14 ssuominen Exp $ |
84 |
|
85 |
EAPI=2 |
86 |
|
87 |
@@ -19,7 +19,13 @@ |
88 |
doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test |
89 |
theora threads x264 xvid network zlib sdl X mp3 opencore-amrnb |
90 |
opencore-amrwb oss schroedinger +hardcoded-tables bindist v4l v4l2 |
91 |
- speex +ssse3 jpeg2k" |
92 |
+ speex +ssse3 jpeg2k vdpau" |
93 |
+ |
94 |
+VIDEO_CARDS="nvidia" |
95 |
+ |
96 |
+for x in ${VIDEO_CARDS}; do |
97 |
+ IUSE="${IUSE} video_cards_${x}" |
98 |
+done |
99 |
|
100 |
RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 ) |
101 |
alsa? ( media-libs/alsa-lib ) |
102 |
@@ -42,7 +48,10 @@ |
103 |
schroedinger? ( media-libs/schroedinger ) |
104 |
speex? ( >=media-libs/speex-1.2_beta3 ) |
105 |
jack? ( media-sound/jack-audio-connection-kit ) |
106 |
- X? ( x11-libs/libX11 x11-libs/libXext )" |
107 |
+ X? ( x11-libs/libX11 x11-libs/libXext ) |
108 |
+ video_cards_nvidia? ( |
109 |
+ vdpau? ( >=x11-drivers/nvidia-drivers-180.29 ) |
110 |
+ )" |
111 |
|
112 |
DEPEND="${RDEPEND} |
113 |
>=sys-devel/make-3.81 |
114 |
@@ -115,6 +124,15 @@ |
115 |
{ use faac ; } && myconf="${myconf} --enable-nonfree" |
116 |
fi |
117 |
|
118 |
+ disable-vdpau-support() { |
119 |
+ for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do |
120 |
+ myconf="${myconf} --disable-decoder=$i" |
121 |
+ done |
122 |
+ } |
123 |
+ |
124 |
+ use video_cards_nvidia || disable-vdpau-support |
125 |
+ use vdpau || disable-vdpau-support |
126 |
+ |
127 |
# CPU features |
128 |
for i in mmx ssse3 altivec ; do |
129 |
use $i || myconf="${myconf} --disable-$i" |
130 |
|
131 |
|
132 |
|
133 |
1.15 media-video/ffmpeg/ffmpeg-0.5-r1.ebuild |
134 |
|
135 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild?rev=1.15&view=markup |
136 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild?rev=1.15&content-type=text/plain |
137 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild?r1=1.14&r2=1.15 |
138 |
|
139 |
Index: ffmpeg-0.5-r1.ebuild |
140 |
=================================================================== |
141 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v |
142 |
retrieving revision 1.14 |
143 |
retrieving revision 1.15 |
144 |
diff -u -r1.14 -r1.15 |
145 |
--- ffmpeg-0.5-r1.ebuild 8 Jul 2009 21:55:40 -0000 1.14 |
146 |
+++ ffmpeg-0.5-r1.ebuild 9 Jul 2009 13:43:14 -0000 1.15 |
147 |
@@ -1,6 +1,6 @@ |
148 |
# Copyright 1999-2009 Gentoo Foundation |
149 |
# Distributed under the terms of the GNU General Public License v2 |
150 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.14 2009/07/08 21:55:40 ssuominen Exp $ |
151 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.15 2009/07/09 13:43:14 ssuominen Exp $ |
152 |
|
153 |
EAPI=2 |
154 |
|
155 |
@@ -15,10 +15,16 @@ |
156 |
SLOT="0" |
157 |
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
158 |
IUSE="+3dnow +3dnowext alsa altivec amr custom-cflags debug dirac doc ieee1394 |
159 |
- +encode faac faad gsm ipv6 +mmx +mmxext vorbis test theora threads x264 |
160 |
+ +encode faac faad gsm ipv6 +mmx +mmxext vdpau vorbis test theora threads x264 |
161 |
xvid network zlib sdl X mp3 oss schroedinger +hardcoded-tables bindist |
162 |
v4l v4l2 speex +ssse3 vhook jpeg2k" |
163 |
|
164 |
+VIDEO_CARDS="nvidia" |
165 |
+ |
166 |
+for x in ${VIDEO_CARDS}; do |
167 |
+ IUSE="${IUSE} video_cards_${x}" |
168 |
+done |
169 |
+ |
170 |
RDEPEND="vhook? ( >=media-libs/imlib2-1.4.0 >=media-libs/freetype-2 ) |
171 |
sdl? ( >=media-libs/libsdl-1.2.10 ) |
172 |
alsa? ( media-libs/alsa-lib ) |
173 |
@@ -44,7 +50,10 @@ |
174 |
schroedinger? ( media-libs/schroedinger ) |
175 |
speex? ( >=media-libs/speex-1.2_beta3 ) |
176 |
X? ( x11-libs/libX11 x11-libs/libXext ) |
177 |
- amr? ( media-libs/amrnb media-libs/amrwb )" |
178 |
+ amr? ( media-libs/amrnb media-libs/amrwb ) |
179 |
+ video_cards_nvidia? ( |
180 |
+ vdpau? ( >=x11-drivers/nvidia-drivers-180.29 ) |
181 |
+ )" |
182 |
|
183 |
DEPEND="${RDEPEND} |
184 |
>=sys-devel/make-3.81 |
185 |
@@ -118,6 +127,11 @@ |
186 |
--enable-nonfree" |
187 |
fi |
188 |
|
189 |
+ # This has changed since 0.5, please recheck for next version |
190 |
+ if use video_cards_nvidia; then |
191 |
+ use vdpau && myconf="${myconf} --enable-vdpau" |
192 |
+ fi |
193 |
+ |
194 |
# CPU features |
195 |
for i in mmx ssse3 altivec ; do |
196 |
use $i || myconf="${myconf} --disable-$i" |