Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Maxim Koltsov (maksbotan)" <maksbotan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/x264-encoder: metadata.xml x264-encoder-9999.ebuild ChangeLog
Date: Sat, 03 Sep 2011 18:30:39
Message-Id: 20110903183029.A70A120051@flycatcher.gentoo.org
1 maksbotan 11/09/03 18:30:29
2
3 Modified: metadata.xml x264-encoder-9999.ebuild ChangeLog
4 Log:
5 Add support for ffmpegsource
6
7 (Portage version: 2.1.10.11/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.6 media-video/x264-encoder/metadata.xml
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/metadata.xml?rev=1.6&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/metadata.xml?rev=1.6&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/metadata.xml?r1=1.5&r2=1.6
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/x264-encoder/metadata.xml,v
19 retrieving revision 1.5
20 retrieving revision 1.6
21 diff -u -r1.5 -r1.6
22 --- metadata.xml 28 May 2011 12:04:21 -0000 1.5
23 +++ metadata.xml 3 Sep 2011 18:30:29 -0000 1.6
24 @@ -6,6 +6,7 @@
25 <email>media-video@g.o</email>
26 </maintainer>
27 <use>
28 + <flag name="ffmpegsource">Enable ffmpegsource aka ffms support, disables lavf</flag>
29 <flag name="system-libx264">Use the system x264 library</flag>
30 </use>
31 </pkgmetadata>
32
33
34
35 1.2 media-video/x264-encoder/x264-encoder-9999.ebuild
36
37 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild?rev=1.2&view=markup
38 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild?rev=1.2&content-type=text/plain
39 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild?r1=1.1&r2=1.2
40
41 Index: x264-encoder-9999.ebuild
42 ===================================================================
43 RCS file: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild,v
44 retrieving revision 1.1
45 retrieving revision 1.2
46 diff -u -r1.1 -r1.2
47 --- x264-encoder-9999.ebuild 28 May 2011 12:04:21 -0000 1.1
48 +++ x264-encoder-9999.ebuild 3 Sep 2011 18:30:29 -0000 1.2
49 @@ -1,6 +1,6 @@
50 # Copyright 1999-2011 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 -# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild,v 1.1 2011/05/28 12:04:21 radhermit Exp $
53 +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild,v 1.2 2011/09/03 18:30:29 maksbotan Exp $
54
55 EAPI=4
56
57 @@ -13,7 +13,7 @@
58 inherit multilib toolchain-funcs ${V_ECLASS}
59
60 if [ "${PV#9999}" = "${PV}" ] ; then
61 - MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
62 + MY_P="x264-snapshot-$(get_version_component_range 3)-2245-stable"
63 fi
64 DESCRIPTION="A free commandline encoder for X264/AVC streams"
65 HOMEPAGE="http://www.videolan.org/developers/x264.html"
66 @@ -21,7 +21,7 @@
67 EGIT_REPO_URI="git://git.videolan.org/x264.git"
68 SRC_URI=""
69 else
70 - SRC_URI="http://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
71 + SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
72 fi
73
74 LICENSE="GPL-2"
75 @@ -31,10 +31,13 @@
76 else
77 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
78 fi
79 -IUSE="debug ffmpeg mp4 +system-libx264 +threads"
80 +IUSE="debug ffmpeg ffmpegsource mp4 +system-libx264 +threads"
81 +
82 +REQUIRED_USE="ffmpegsource? ( ffmpeg )"
83
84 RDEPEND="
85 - ffmpeg? ( media-video/ffmpeg )
86 + ffmpeg? ( virtual/ffmpeg )
87 + ffmpegsource? ( media-libs/ffmpegsource )
88 mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
89 system-libx264? ( ~media-libs/x264-${PV} )
90 "
91 @@ -56,6 +59,7 @@
92 local myconf=""
93 use debug && myconf+=" --enable-debug"
94 use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
95 + use ffmpegsource || myconf+=" --disable-ffms"
96 use mp4 || myconf+=" --disable-gpac"
97 use system-libx264 && myconf+=" --system-libx264"
98 use threads || myconf+=" --disable-thread"
99 @@ -64,11 +68,9 @@
100 --prefix="${EPREFIX}"/usr \
101 --libdir="${EPREFIX}"/usr/$(get_libdir) \
102 --disable-avs \
103 - --disable-ffms \
104 --extra-asflags="${ASFLAGS}" \
105 --extra-cflags="${CFLAGS}" \
106 --extra-ldflags="${LDFLAGS}" \
107 --host="${CHOST}" \
108 - ${myconf} \
109 - || die
110 + ${myconf} || die
111 }
112
113
114
115 1.56 media-video/x264-encoder/ChangeLog
116
117 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/ChangeLog?rev=1.56&view=markup
118 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/ChangeLog?rev=1.56&content-type=text/plain
119 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/ChangeLog?r1=1.55&r2=1.56
120
121 Index: ChangeLog
122 ===================================================================
123 RCS file: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v
124 retrieving revision 1.55
125 retrieving revision 1.56
126 diff -u -r1.55 -r1.56
127 --- ChangeLog 27 Aug 2011 18:54:22 -0000 1.55
128 +++ ChangeLog 3 Sep 2011 18:30:29 -0000 1.56
129 @@ -1,6 +1,11 @@
130 # ChangeLog for media-video/x264-encoder
131 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
132 -# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.55 2011/08/27 18:54:22 aballier Exp $
133 +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.56 2011/09/03 18:30:29 maksbotan Exp $
134 +
135 + 03 Sep 2011; Maxim Koltsov <maksbotan@g.o> x264-encoder-9999.ebuild,
136 + metadata.xml:
137 + Add support for media-libs/ffmpegsource, bug #301055. Thanks to Nikoli
138 + <nikoli@×××××××.com>
139
140 27 Aug 2011; Alexis Ballier <aballier@g.o>
141 -x264-encoder-0.0.20100605.ebuild, -x264-encoder-0.0.20101029.ebuild,
Report Message
Find on MARC Find on Google Groups