1 |
aballier 09/01/27 07:41:19 |
2 |
|
3 |
Modified: ffmpeg-9999.ebuild ChangeLog |
4 |
Log: |
5 |
Add alsa/oss/3dnow useflags and disable servertest as its mainly broken |
6 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.7 media-video/ffmpeg/ffmpeg-9999.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.7&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.7&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.6&r2=1.7 |
14 |
|
15 |
Index: ffmpeg-9999.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v |
18 |
retrieving revision 1.6 |
19 |
retrieving revision 1.7 |
20 |
diff -u -r1.6 -r1.7 |
21 |
--- ffmpeg-9999.ebuild 20 Jan 2009 19:44:28 -0000 1.6 |
22 |
+++ ffmpeg-9999.ebuild 27 Jan 2009 07:41:18 -0000 1.7 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 1999-2009 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.6 2009/01/20 19:44:28 aballier Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.7 2009/01/27 07:41:18 aballier Exp $ |
28 |
|
29 |
ESVN_REPO_URI="svn://svn.mplayerhq.hu/ffmpeg/trunk" |
30 |
|
31 |
@@ -13,12 +13,13 @@ |
32 |
LICENSE="GPL-2" |
33 |
SLOT="0" |
34 |
KEYWORDS="" |
35 |
-IUSE="aac altivec amr debug dirac doc ieee1394 encode gsm ipv6 mmx mmxext vorbis |
36 |
- test theora threads x264 xvid network zlib sdl X mp3 schroedinger |
37 |
+IUSE="3dnow aac alsa altivec amr debug dirac doc ieee1394 encode gsm ipv6 mmx mmxext vorbis |
38 |
+ test theora threads x264 xvid network zlib sdl X mp3 oss schroedinger |
39 |
hardcoded-tables bindist v4l v4l2 speex ssse3 vhook" |
40 |
|
41 |
RDEPEND="vhook? ( >=media-libs/imlib2-1.4.0 >=media-libs/freetype-2 ) |
42 |
sdl? ( >=media-libs/libsdl-1.2.10 ) |
43 |
+ alsa? ( media-libs/alsa-lib ) |
44 |
encode? ( |
45 |
aac? ( media-libs/faac ) |
46 |
mp3? ( media-sound/lame ) |
47 |
@@ -79,9 +80,14 @@ |
48 |
|
49 |
# libavdevice options |
50 |
use ieee1394 && myconf="${myconf} --enable-libdc1394" |
51 |
- for i in v4l v4l2 ; do |
52 |
+ # Demuxers |
53 |
+ for i in v4l v4l2 alsa oss ; do |
54 |
use $i || myconf="${myconf} --disable-demuxer=$i" |
55 |
done |
56 |
+ # Muxers |
57 |
+ for i in alsa oss ; do |
58 |
+ use $i || myconf="${myconf} --disable-muxer=$i" |
59 |
+ done |
60 |
use X && myconf="${myconf} --enable-x11grab" |
61 |
|
62 |
# Threads; we only support pthread for now but ffmpeg supports more |
63 |
@@ -111,6 +117,7 @@ |
64 |
use $i || myconf="${myconf} --disable-$i" |
65 |
done |
66 |
use mmxext || myconf="${myconf} --disable-mmx2" |
67 |
+ use 3dnow || myconf="${myconf} --disable-amd3dnow" |
68 |
# disable mmx accelerated code if PIC is required |
69 |
# as the provided asm decidedly is not PIC. |
70 |
if gcc-specs-pie ; then |
71 |
@@ -183,7 +190,7 @@ |
72 |
|
73 |
# Never die for now... |
74 |
src_test() { |
75 |
- for t in codectest libavtest servertest seektest ; do |
76 |
+ for t in codectest libavtest seektest ; do |
77 |
emake ${t} || ewarn "Some tests in ${t} failed" |
78 |
done |
79 |
} |
80 |
|
81 |
|
82 |
|
83 |
1.261 media-video/ffmpeg/ChangeLog |
84 |
|
85 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.261&view=markup |
86 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.261&content-type=text/plain |
87 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.260&r2=1.261 |
88 |
|
89 |
Index: ChangeLog |
90 |
=================================================================== |
91 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v |
92 |
retrieving revision 1.260 |
93 |
retrieving revision 1.261 |
94 |
diff -u -r1.260 -r1.261 |
95 |
--- ChangeLog 25 Jan 2009 21:09:16 -0000 1.260 |
96 |
+++ ChangeLog 27 Jan 2009 07:41:19 -0000 1.261 |
97 |
@@ -1,6 +1,9 @@ |
98 |
# ChangeLog for media-video/ffmpeg |
99 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
100 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.260 2009/01/25 21:09:16 maekke Exp $ |
101 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.261 2009/01/27 07:41:19 aballier Exp $ |
102 |
+ |
103 |
+ 27 Jan 2009; Alexis Ballier <aballier@g.o> ffmpeg-9999.ebuild: |
104 |
+ Add alsa/oss/3dnow useflags and disable servertest as its mainly broken |
105 |
|
106 |
25 Jan 2009; Markus Meier <maekke@g.o> |
107 |
ffmpeg-0.4.9_p20081219.ebuild: |