Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
Date: Tue, 31 Jan 2017 14:04:33
Message-Id: 1485871460.e3788098925bc1bd40b01361768cf1067b316610.aballier@gentoo
1 commit: e3788098925bc1bd40b01361768cf1067b316610
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 31 14:02:59 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 14:04:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3788098
7
8 media-video/x264-encoder: remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 media-video/x264-encoder/Manifest | 3 -
13 .../x264-encoder/x264-encoder-0.0.20140308.ebuild | 71 --------------------
14 .../x264-encoder/x264-encoder-0.0.20151011.ebuild | 75 ----------------------
15 .../x264-encoder/x264-encoder-0.0.20160523.ebuild | 75 ----------------------
16 4 files changed, 224 deletions(-)
17
18 diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
19 index 8359baf..a8c4173 100644
20 --- a/media-video/x264-encoder/Manifest
21 +++ b/media-video/x264-encoder/Manifest
22 @@ -1,4 +1 @@
23 -DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
24 -DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
25 -DIST x264-snapshot-20160523-2245.tar.bz2 729952 SHA256 1176c018e4896a440bf0b18ed76e3d92de7a7ce5b1e28a7efd5f6e54bf1d6860 SHA512 71cce21acec300842a8323ef8999e655520e2d47288fe983631e0d6fa180155badd9026d58057edebfd73b002f79c9c0011439e8ee9878b3bf0574e8a16fdff9 WHIRLPOOL fb844e07752a9e48ed2ccd75f34730528c60c22f9a17791c0e002f1c7d25224b814af288e6f6a9563da832bb2fc9a0fed6c92e60bb102e244ee0de24eee40b24
26 DIST x264-snapshot-20160712-2245.tar.bz2 730644 SHA256 d5033882bbc7e2908f74970931c7dc2044191cc9fa7c7435dc85ad334f23078e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963 WHIRLPOOL d42459a93e8ff1b69d16f7adecaf3486d102e6fe4ee0d8dd991cdbb7a233bb9975faabc79ff7d2dfd2f67fa1f69a729e617ae868ee127cc0306dfc897db7053b
27
28 diff --git a/media-video/x264-encoder/x264-encoder-0.0.20140308.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20140308.ebuild
29 deleted file mode 100644
30 index 1f30d4e..00000000
31 --- a/media-video/x264-encoder/x264-encoder-0.0.20140308.ebuild
32 +++ /dev/null
33 @@ -1,71 +0,0 @@
34 -# Copyright 1999-2014 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=5
39 -
40 -inherit flag-o-matic multilib toolchain-funcs
41 -
42 -DESCRIPTION="A free commandline encoder for X264/AVC streams"
43 -HOMEPAGE="http://www.videolan.org/developers/x264.html"
44 -if [[ ${PV} == 9999 ]]; then
45 - inherit git-2
46 - EGIT_REPO_URI="git://git.videolan.org/x264.git"
47 - SRC_URI=""
48 -else
49 - inherit versionator
50 - MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
51 - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
52 - KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
53 - S="${WORKDIR}/${MY_P}"
54 -fi
55 -
56 -LICENSE="GPL-2"
57 -SLOT="0"
58 -IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
59 -
60 -REQUIRED_USE="ffmpegsource? ( ffmpeg )"
61 -
62 -RDEPEND="ffmpeg? ( virtual/ffmpeg )
63 - ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
64 - ffmpegsource? ( media-libs/ffmpegsource )
65 - mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
66 -
67 -ASM_DEP=">=dev-lang/yasm-1.2.0"
68 -DEPEND="${RDEPEND}
69 - amd64? ( ${ASM_DEP} )
70 - x86? ( ${ASM_DEP} )
71 - x86-fbsd? ( ${ASM_DEP} )
72 - virtual/pkgconfig"
73 -
74 -src_configure() {
75 - tc-export CC
76 -
77 - # let upstream pick the optimization level by default
78 - use custom-cflags || filter-flags -O?
79 -
80 - ./configure \
81 - --prefix="${EPREFIX}"/usr \
82 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
83 - --system-libx264 \
84 - --host="${CHOST}" \
85 - --disable-lsmash \
86 - $(usex 10bit "--bit-depth=10" "") \
87 - $(usex avs "" "--disable-avs") \
88 - $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
89 - $(usex ffmpegsource "" "--disable-ffms") \
90 - $(usex interlaced "" "--disable-interlaced") \
91 - $(usex mp4 "" "--disable-gpac") \
92 - $(usex threads "" "--disable-thread") || die
93 -
94 - # this is a nasty workaround for bug #376925 for x264 that also applies
95 - # here, needed because as upstream doesn't like us fiddling with their CFLAGS
96 - if use custom-cflags; then
97 - local cflags
98 - cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
99 - cflags="${cflags//$(get-flag O)/}"
100 - cflags="${cflags//-O? /$(get-flag O) }"
101 - cflags="${cflags//-g /}"
102 - sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
103 - fi
104 -}
105
106 diff --git a/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild
107 deleted file mode 100644
108 index 71259d7..00000000
109 --- a/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild
110 +++ /dev/null
111 @@ -1,75 +0,0 @@
112 -# Copyright 1999-2014 Gentoo Foundation
113 -# Distributed under the terms of the GNU General Public License v2
114 -# $Id$
115 -
116 -EAPI=5
117 -
118 -inherit flag-o-matic multilib toolchain-funcs eutils
119 -
120 -DESCRIPTION="A free commandline encoder for X264/AVC streams"
121 -HOMEPAGE="http://www.videolan.org/developers/x264.html"
122 -if [[ ${PV} == 9999 ]]; then
123 - inherit git-2
124 - EGIT_REPO_URI="git://git.videolan.org/x264.git"
125 - SRC_URI=""
126 -else
127 - inherit versionator
128 - MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
129 - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
130 - KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
131 - S="${WORKDIR}/${MY_P}"
132 -fi
133 -
134 -LICENSE="GPL-2"
135 -SLOT="0"
136 -IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
137 -
138 -REQUIRED_USE="ffmpegsource? ( ffmpeg )"
139 -
140 -RDEPEND="ffmpeg? ( virtual/ffmpeg )
141 - ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
142 - ffmpegsource? ( media-libs/ffmpegsource )
143 - mp4? ( >=media-video/gpac-0.5.2 )"
144 -
145 -ASM_DEP=">=dev-lang/yasm-1.2.0"
146 -DEPEND="${RDEPEND}
147 - amd64? ( ${ASM_DEP} )
148 - x86? ( ${ASM_DEP} )
149 - x86-fbsd? ( ${ASM_DEP} )
150 - virtual/pkgconfig"
151 -
152 -src_prepare() {
153 - epatch "${FILESDIR}/gpac.patch"
154 -}
155 -
156 -src_configure() {
157 - tc-export CC
158 -
159 - # let upstream pick the optimization level by default
160 - use custom-cflags || filter-flags -O?
161 -
162 - ./configure \
163 - --prefix="${EPREFIX}"/usr \
164 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
165 - --system-libx264 \
166 - --host="${CHOST}" \
167 - --disable-lsmash \
168 - $(usex 10bit "--bit-depth=10" "") \
169 - $(usex avs "" "--disable-avs") \
170 - $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
171 - $(usex ffmpegsource "" "--disable-ffms") \
172 - $(usex interlaced "" "--disable-interlaced") \
173 - $(usex mp4 "" "--disable-gpac") \
174 - $(usex threads "" "--disable-thread") || die
175 -
176 - # this is a nasty workaround for bug #376925 for x264 that also applies
177 - # here, needed because as upstream doesn't like us fiddling with their CFLAGS
178 - if use custom-cflags; then
179 - local cflags
180 - cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
181 - cflags="${cflags//$(get-flag O)/}"
182 - cflags="${cflags//-O? /$(get-flag O) }"
183 - cflags="${cflags//-g /}"
184 - sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
185 - fi
186 -}
187
188 diff --git a/media-video/x264-encoder/x264-encoder-0.0.20160523.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20160523.ebuild
189 deleted file mode 100644
190 index 02e46dd..00000000
191 --- a/media-video/x264-encoder/x264-encoder-0.0.20160523.ebuild
192 +++ /dev/null
193 @@ -1,75 +0,0 @@
194 -# Copyright 1999-2016 Gentoo Foundation
195 -# Distributed under the terms of the GNU General Public License v2
196 -# $Id$
197 -
198 -EAPI=5
199 -
200 -inherit flag-o-matic multilib toolchain-funcs eutils
201 -
202 -DESCRIPTION="A free commandline encoder for X264/AVC streams"
203 -HOMEPAGE="http://www.videolan.org/developers/x264.html"
204 -if [[ ${PV} == 9999 ]]; then
205 - inherit git-2
206 - EGIT_REPO_URI="git://git.videolan.org/x264.git"
207 - SRC_URI=""
208 -else
209 - inherit versionator
210 - MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
211 - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
212 - KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
213 - S="${WORKDIR}/${MY_P}"
214 -fi
215 -
216 -LICENSE="GPL-2"
217 -SLOT="0"
218 -IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
219 -
220 -REQUIRED_USE="ffmpegsource? ( ffmpeg )"
221 -
222 -RDEPEND="ffmpeg? ( virtual/ffmpeg )
223 - ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
224 - ffmpegsource? ( media-libs/ffmpegsource )
225 - mp4? ( >=media-video/gpac-0.5.2 )"
226 -
227 -ASM_DEP=">=dev-lang/yasm-1.2.0"
228 -DEPEND="${RDEPEND}
229 - amd64? ( ${ASM_DEP} )
230 - x86? ( ${ASM_DEP} )
231 - x86-fbsd? ( ${ASM_DEP} )
232 - virtual/pkgconfig"
233 -
234 -src_prepare() {
235 - epatch "${FILESDIR}/gpac.patch"
236 -}
237 -
238 -src_configure() {
239 - tc-export CC
240 -
241 - # let upstream pick the optimization level by default
242 - use custom-cflags || filter-flags -O?
243 -
244 - ./configure \
245 - --prefix="${EPREFIX}"/usr \
246 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
247 - --system-libx264 \
248 - --host="${CHOST}" \
249 - --disable-lsmash \
250 - $(usex 10bit "--bit-depth=10" "") \
251 - $(usex avs "" "--disable-avs") \
252 - $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
253 - $(usex ffmpegsource "" "--disable-ffms") \
254 - $(usex interlaced "" "--disable-interlaced") \
255 - $(usex mp4 "" "--disable-gpac") \
256 - $(usex threads "" "--disable-thread") || die
257 -
258 - # this is a nasty workaround for bug #376925 for x264 that also applies
259 - # here, needed because as upstream doesn't like us fiddling with their CFLAGS
260 - if use custom-cflags; then
261 - local cflags
262 - cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
263 - cflags="${cflags//$(get-flag O)/}"
264 - cflags="${cflags//-O? /$(get-flag O) }"
265 - cflags="${cflags//-g /}"
266 - sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
267 - fi
268 -}