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

Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@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 x264-encoder-0.0.20110825.ebuild
Date: Wed, 07 Sep 2011 15:09:47
Message-Id: 20110907150935.E260B2004C@flycatcher.gentoo.org
1 aballier 11/09/07 15:09:35
2
3 Modified: metadata.xml x264-encoder-9999.ebuild ChangeLog
4 x264-encoder-0.0.20110825.ebuild
5 Log:
6 remove nonsensical system-libx264 useflag, we shall always use the system version; people claiming static is faster can put -static in their cflags
7
8 (Portage version: 2.2.0_alpha54/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.7 media-video/x264-encoder/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/metadata.xml?rev=1.7&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/metadata.xml?rev=1.7&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/metadata.xml?r1=1.6&r2=1.7
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-video/x264-encoder/metadata.xml,v
20 retrieving revision 1.6
21 retrieving revision 1.7
22 diff -u -r1.6 -r1.7
23 --- metadata.xml 3 Sep 2011 18:30:29 -0000 1.6
24 +++ metadata.xml 7 Sep 2011 15:09:35 -0000 1.7
25 @@ -7,6 +7,5 @@
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.3 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.3&view=markup
38 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild?rev=1.3&content-type=text/plain
39 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild?r1=1.2&r2=1.3
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.2
45 retrieving revision 1.3
46 diff -u -r1.2 -r1.3
47 --- x264-encoder-9999.ebuild 3 Sep 2011 18:30:29 -0000 1.2
48 +++ x264-encoder-9999.ebuild 7 Sep 2011 15:09:35 -0000 1.3
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.2 2011/09/03 18:30:29 maksbotan Exp $
53 +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild,v 1.3 2011/09/07 15:09:35 aballier Exp $
54
55 EAPI=4
56
57 @@ -31,7 +31,7 @@
58 else
59 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
60 fi
61 -IUSE="debug ffmpeg ffmpegsource mp4 +system-libx264 +threads"
62 +IUSE="debug ffmpeg ffmpegsource mp4 +threads"
63
64 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
65
66 @@ -39,7 +39,7 @@
67 ffmpeg? ( virtual/ffmpeg )
68 ffmpegsource? ( media-libs/ffmpegsource )
69 mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
70 - system-libx264? ( ~media-libs/x264-${PV} )
71 + ~media-libs/x264-${PV}
72 "
73 ASM_DEP=">=dev-lang/yasm-0.6.2"
74 DEPEND="${RDEPEND}
75 @@ -61,7 +61,6 @@
76 use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
77 use ffmpegsource || myconf+=" --disable-ffms"
78 use mp4 || myconf+=" --disable-gpac"
79 - use system-libx264 && myconf+=" --system-libx264"
80 use threads || myconf+=" --disable-thread"
81
82 ./configure \
83 @@ -72,5 +71,6 @@
84 --extra-cflags="${CFLAGS}" \
85 --extra-ldflags="${LDFLAGS}" \
86 --host="${CHOST}" \
87 + --system-libx264 \
88 ${myconf} || die
89 }
90
91
92
93 1.58 media-video/x264-encoder/ChangeLog
94
95 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/ChangeLog?rev=1.58&view=markup
96 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/ChangeLog?rev=1.58&content-type=text/plain
97 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/ChangeLog?r1=1.57&r2=1.58
98
99 Index: ChangeLog
100 ===================================================================
101 RCS file: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v
102 retrieving revision 1.57
103 retrieving revision 1.58
104 diff -u -r1.57 -r1.58
105 --- ChangeLog 7 Sep 2011 02:27:41 -0000 1.57
106 +++ ChangeLog 7 Sep 2011 15:09:35 -0000 1.58
107 @@ -1,6 +1,11 @@
108 # ChangeLog for media-video/x264-encoder
109 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
110 -# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.57 2011/09/07 02:27:41 chutzpah Exp $
111 +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.58 2011/09/07 15:09:35 aballier Exp $
112 +
113 + 07 Sep 2011; Alexis Ballier <aballier@g.o>
114 + x264-encoder-0.0.20110825.ebuild, x264-encoder-9999.ebuild, metadata.xml:
115 + remove nonsensical system-libx264 useflag, we shall always use the system
116 + version; people claiming static is faster can put -static in their cflags
117
118 *x264-encoder-0.0.20110825 (07 Sep 2011)
119
120
121
122
123 1.2 media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild
124
125 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild?rev=1.2&view=markup
126 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild?rev=1.2&content-type=text/plain
127 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild?r1=1.1&r2=1.2
128
129 Index: x264-encoder-0.0.20110825.ebuild
130 ===================================================================
131 RCS file: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild,v
132 retrieving revision 1.1
133 retrieving revision 1.2
134 diff -u -r1.1 -r1.2
135 --- x264-encoder-0.0.20110825.ebuild 7 Sep 2011 02:27:41 -0000 1.1
136 +++ x264-encoder-0.0.20110825.ebuild 7 Sep 2011 15:09:35 -0000 1.2
137 @@ -1,6 +1,6 @@
138 # Copyright 1999-2011 Gentoo Foundation
139 # Distributed under the terms of the GNU General Public License v2
140 -# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild,v 1.1 2011/09/07 02:27:41 chutzpah Exp $
141 +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild,v 1.2 2011/09/07 15:09:35 aballier Exp $
142
143 EAPI=4
144 inherit eutils multilib toolchain-funcs versionator
145 @@ -14,11 +14,11 @@
146 LICENSE="GPL-2"
147 SLOT="0"
148 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
149 -IUSE="debug ffmpeg mp4 +system-libx264 +threads"
150 +IUSE="debug ffmpeg mp4 +threads"
151
152 RDEPEND="ffmpeg? ( media-video/ffmpeg )
153 mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
154 - system-libx264? ( ~media-libs/x264-${PV} )"
155 + ~media-libs/x264-${PV}"
156 DEPEND="${RDEPEND}
157 amd64? ( >=dev-lang/yasm-0.6.2 )
158 x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm )
159 @@ -35,7 +35,6 @@
160 use debug && myconf+=" --enable-debug"
161 use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
162 use mp4 || myconf+=" --disable-gpac"
163 - use system-libx264 && myconf+=" --system-libx264"
164 use threads || myconf+=" --disable-thread"
165
166 ./configure \
167 @@ -47,6 +46,7 @@
168 --extra-cflags="${CFLAGS}" \
169 --extra-ldflags="${LDFLAGS}" \
170 --host="${CHOST}" \
171 + --system-libx264 \
172 ${myconf} \
173 || die
174 }
Report Message
Find on MARC Find on Google Groups