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

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-libs/x264/files/, media-libs/x264/
Date: Tue, 31 Jan 2017 14:04:34
Message-Id: 1485871460.b26b633577e74cfc7f9b6dca36dbf47bcedbdc06.aballier@gentoo
1 commit: b26b633577e74cfc7f9b6dca36dbf47bcedbdc06
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 31 14:04:12 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=b26b6335
7
8 media-libs/x264: remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 media-libs/x264/Manifest | 4 --
13 .../x264/files/x264-0.0.20130912-cflags.patch | 54 ----------------
14 .../x264/files/x264-0.0.20151011-cflags.patch | 51 ---------------
15 .../x264/files/x264-0.0.20160523-cflags.patch | 40 ------------
16 media-libs/x264/files/x264-cflags.patch | 51 ---------------
17 media-libs/x264/x264-0.0.20140308.ebuild | 73 ---------------------
18 media-libs/x264/x264-0.0.20150820.ebuild | 74 ----------------------
19 media-libs/x264/x264-0.0.20151011.ebuild | 74 ----------------------
20 media-libs/x264/x264-0.0.20160523.ebuild | 74 ----------------------
21 9 files changed, 495 deletions(-)
22
23 diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
24 index 499d998..a8c4173 100644
25 --- a/media-libs/x264/Manifest
26 +++ b/media-libs/x264/Manifest
27 @@ -1,5 +1 @@
28 -DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
29 -DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256 0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512 6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44 WHIRLPOOL daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024
30 -DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
31 -DIST x264-snapshot-20160523-2245.tar.bz2 729952 SHA256 1176c018e4896a440bf0b18ed76e3d92de7a7ce5b1e28a7efd5f6e54bf1d6860 SHA512 71cce21acec300842a8323ef8999e655520e2d47288fe983631e0d6fa180155badd9026d58057edebfd73b002f79c9c0011439e8ee9878b3bf0574e8a16fdff9 WHIRLPOOL fb844e07752a9e48ed2ccd75f34730528c60c22f9a17791c0e002f1c7d25224b814af288e6f6a9563da832bb2fc9a0fed6c92e60bb102e244ee0de24eee40b24
32 DIST x264-snapshot-20160712-2245.tar.bz2 730644 SHA256 d5033882bbc7e2908f74970931c7dc2044191cc9fa7c7435dc85ad334f23078e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963 WHIRLPOOL d42459a93e8ff1b69d16f7adecaf3486d102e6fe4ee0d8dd991cdbb7a233bb9975faabc79ff7d2dfd2f67fa1f69a729e617ae868ee127cc0306dfc897db7053b
33
34 diff --git a/media-libs/x264/files/x264-0.0.20130912-cflags.patch b/media-libs/x264/files/x264-0.0.20130912-cflags.patch
35 deleted file mode 100644
36 index c08a0d7..00000000
37 --- a/media-libs/x264/files/x264-0.0.20130912-cflags.patch
38 +++ /dev/null
39 @@ -1,54 +0,0 @@
40 -diff --git a/configure b/configure
41 -index 07796b1..afdda94 100755
42 ---- a/configure
43 -+++ b/configure
44 -@@ -556,11 +556,6 @@ case $host_cpu in
45 - if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
46 - CFLAGS="$CFLAGS -march=i686"
47 - fi
48 -- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
49 -- CFLAGS="$CFLAGS -mfpmath=sse -msse"
50 -- fi
51 -- CFLAGS="-m32 $CFLAGS"
52 -- LDFLAGS="-m32 $LDFLAGS"
53 - else
54 - # icc on linux has various degrees of mod16 stack support
55 - if [ $SYS = LINUX ]; then
56 -@@ -591,13 +586,8 @@ case $host_cpu in
57 - x86_64)
58 - ARCH="X86_64"
59 - AS="yasm"
60 -- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
61 - if [ "$SYS" = MACOSX ]; then
62 - ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX"
63 -- if cc_check '' "-arch x86_64"; then
64 -- CFLAGS="$CFLAGS -arch x86_64"
65 -- LDFLAGS="$LDFLAGS -arch x86_64"
66 -- fi
67 - elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
68 - ASFLAGS="$ASFLAGS -f win32 -m amd64"
69 - # only the GNU toolchain is inconsistent in prefixing function names with _
70 -@@ -605,7 +595,11 @@ case $host_cpu in
71 - [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase"
72 - [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS"
73 - else
74 -- ASFLAGS="$ASFLAGS -f elf -m amd64"
75 -+ if cpp_check "" "" "__ILP32__" ; then
76 -+ ASFLAGS="$ASFLAGS -f elf -m x32"
77 -+ else
78 -+ ASFLAGS="$ASFLAGS -f elf -m amd64"
79 -+ fi
80 - fi
81 - ;;
82 - powerpc|powerpc64)
83 -@@ -971,10 +965,6 @@ if [ "$pic" = "yes" ] ; then
84 - [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
85 - fi
86 -
87 --if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
88 -- CFLAGS="$CFLAGS -fomit-frame-pointer"
89 --fi
90 --
91 - if [ "$strip" = "yes" ]; then
92 - CFLAGS="$CFLAGS -s"
93 - LDFLAGS="$LDFLAGS -s"
94
95 diff --git a/media-libs/x264/files/x264-0.0.20151011-cflags.patch b/media-libs/x264/files/x264-0.0.20151011-cflags.patch
96 deleted file mode 100644
97 index 851e3f0..00000000
98 --- a/media-libs/x264/files/x264-0.0.20151011-cflags.patch
99 +++ /dev/null
100 @@ -1,51 +0,0 @@
101 -Index: x264-snapshot-20151011-2245/configure
102 -===================================================================
103 ---- x264-snapshot-20151011-2245.orig/configure
104 -+++ x264-snapshot-20151011-2245/configure
105 -@@ -672,11 +672,6 @@ case $host_cpu in
106 - if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
107 - CFLAGS="$CFLAGS -march=i686"
108 - fi
109 -- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
110 -- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
111 -- fi
112 -- CFLAGS="-m32 $CFLAGS"
113 -- LDFLAGS="-m32 $LDFLAGS"
114 - fi
115 - if [ "$SYS" = MACOSX ]; then
116 - ASFLAGS="$ASFLAGS -f macho32 -DPREFIX"
117 -@@ -695,13 +690,8 @@ case $host_cpu in
118 - AS_EXT=".asm"
119 - ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
120 - stack_alignment=16
121 -- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
122 - if [ "$SYS" = MACOSX ]; then
123 - ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX"
124 -- if cc_check '' "-arch x86_64"; then
125 -- CFLAGS="$CFLAGS -arch x86_64"
126 -- LDFLAGS="$LDFLAGS -arch x86_64"
127 -- fi
128 - elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
129 - ASFLAGS="$ASFLAGS -f win64"
130 - # only the GNU toolchain is inconsistent in prefixing function names with _
131 -@@ -1148,20 +1138,10 @@ if [ "$pic" = "yes" ] ; then
132 - [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
133 - fi
134 -
135 --if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
136 -- CFLAGS="$CFLAGS -fomit-frame-pointer"
137 --fi
138 --
139 - if [ "$strip" = "yes" ]; then
140 - LDFLAGS="$LDFLAGS -s"
141 - fi
142 -
143 --if [ "$debug" = "yes" ]; then
144 -- CFLAGS="-O1 -g $CFLAGS"
145 --else
146 -- CFLAGS="-O3 -ffast-math $CFLAGS"
147 --fi
148 --
149 - if cc_check '' -fno-tree-vectorize ; then
150 - CFLAGS="$CFLAGS -fno-tree-vectorize"
151 - fi
152
153 diff --git a/media-libs/x264/files/x264-0.0.20160523-cflags.patch b/media-libs/x264/files/x264-0.0.20160523-cflags.patch
154 deleted file mode 100644
155 index 25b7e2e..00000000
156 --- a/media-libs/x264/files/x264-0.0.20160523-cflags.patch
157 +++ /dev/null
158 @@ -1,40 +0,0 @@
159 -Index: x264-9999/configure
160 -===================================================================
161 ---- x264-9999.orig/configure
162 -+++ x264-9999/configure
163 -@@ -667,8 +667,6 @@ case $host_cpu in
164 - if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
165 - CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
166 - fi
167 -- CFLAGS="-m32 $CFLAGS"
168 -- LDFLAGS="-m32 $LDFLAGS"
169 - fi
170 - if [ "$SYS" = MACOSX ]; then
171 - ASFLAGS="$ASFLAGS -f macho32 -DPREFIX"
172 -@@ -687,13 +685,8 @@ case $host_cpu in
173 - AS_EXT=".asm"
174 - ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
175 - stack_alignment=16
176 -- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
177 - if [ "$SYS" = MACOSX ]; then
178 - ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX"
179 -- if cc_check '' "-arch x86_64"; then
180 -- CFLAGS="$CFLAGS -arch x86_64"
181 -- LDFLAGS="$LDFLAGS -arch x86_64"
182 -- fi
183 - elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
184 - ASFLAGS="$ASFLAGS -f win64"
185 - if [ $compiler = GNU ]; then
186 -@@ -1173,10 +1166,10 @@ if [ "$strip" = "yes" ]; then
187 - fi
188 -
189 - if [ "$debug" = "yes" ]; then
190 -- CFLAGS="-O1 -g $CFLAGS"
191 -+ CFLAGS="$CFLAGS"
192 - RCFLAGS="$RCFLAGS -DDEBUG"
193 - else
194 -- CFLAGS="-O3 -ffast-math $CFLAGS"
195 -+ CFLAGS="-ffast-math $CFLAGS"
196 - fi
197 -
198 - if cc_check '' -fno-tree-vectorize ; then
199
200 diff --git a/media-libs/x264/files/x264-cflags.patch b/media-libs/x264/files/x264-cflags.patch
201 deleted file mode 100644
202 index c3b5137..00000000
203 --- a/media-libs/x264/files/x264-cflags.patch
204 +++ /dev/null
205 @@ -1,51 +0,0 @@
206 -Index: x264-9999/configure
207 -===================================================================
208 ---- x264-9999.orig/configure
209 -+++ x264-9999/configure
210 -@@ -669,11 +669,6 @@ case $host_cpu in
211 - if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
212 - CFLAGS="$CFLAGS -march=i686"
213 - fi
214 -- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
215 -- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
216 -- fi
217 -- CFLAGS="-m32 $CFLAGS"
218 -- LDFLAGS="-m32 $LDFLAGS"
219 - elif [ $compiler = ICC ]; then
220 - # icc on linux has various degrees of mod16 stack support
221 - if [ $SYS = LINUX ]; then
222 -@@ -706,13 +701,8 @@ case $host_cpu in
223 - AS="${AS-yasm}"
224 - AS_EXT=".asm"
225 - ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
226 -- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
227 - if [ "$SYS" = MACOSX ]; then
228 - ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX"
229 -- if cc_check '' "-arch x86_64"; then
230 -- CFLAGS="$CFLAGS -arch x86_64"
231 -- LDFLAGS="$LDFLAGS -arch x86_64"
232 -- fi
233 - elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
234 - ASFLAGS="$ASFLAGS -f win64"
235 - # only the GNU toolchain is inconsistent in prefixing function names with _
236 -@@ -1139,20 +1129,10 @@ if [ "$pic" = "yes" ] ; then
237 - [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
238 - fi
239 -
240 --if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
241 -- CFLAGS="$CFLAGS -fomit-frame-pointer"
242 --fi
243 --
244 - if [ "$strip" = "yes" ]; then
245 - LDFLAGS="$LDFLAGS -s"
246 - fi
247 -
248 --if [ "$debug" = "yes" ]; then
249 -- CFLAGS="-O1 -g $CFLAGS"
250 --else
251 -- CFLAGS="-O3 -ffast-math $CFLAGS"
252 --fi
253 --
254 - if cc_check '' -fno-tree-vectorize ; then
255 - CFLAGS="$CFLAGS -fno-tree-vectorize"
256 - fi
257
258 diff --git a/media-libs/x264/x264-0.0.20140308.ebuild b/media-libs/x264/x264-0.0.20140308.ebuild
259 deleted file mode 100644
260 index aee8bc8..00000000
261 --- a/media-libs/x264/x264-0.0.20140308.ebuild
262 +++ /dev/null
263 @@ -1,73 +0,0 @@
264 -# Copyright 1999-2015 Gentoo Foundation
265 -# Distributed under the terms of the GNU General Public License v2
266 -# $Id$
267 -
268 -EAPI=5
269 -
270 -inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
271 -
272 -DESCRIPTION="A free library for encoding X264/AVC streams"
273 -HOMEPAGE="http://www.videolan.org/developers/x264.html"
274 -if [[ ${PV} == 9999 ]]; then
275 - inherit git-2
276 - EGIT_REPO_URI="git://git.videolan.org/x264.git"
277 -else
278 - inherit versionator
279 - MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
280 - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
281 - KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
282 - S="${WORKDIR}/${MY_P}"
283 -fi
284 -
285 -SONAME="142"
286 -SLOT="0/${SONAME}"
287 -
288 -LICENSE="GPL-2"
289 -IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
290 -
291 -ASM_DEP=">=dev-lang/yasm-1.2.0"
292 -DEPEND="abi_x86_32? ( ${ASM_DEP} )
293 - abi_x86_64? ( ${ASM_DEP} )
294 - opencl? ( dev-lang/perl )"
295 -RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
296 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
297 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
298 -
299 -DOCS="AUTHORS doc/*.txt"
300 -
301 -src_prepare() {
302 - # Initial support for x32 ABI, bug #420241
303 - # Avoid messing too much with CFLAGS.
304 - epatch "${FILESDIR}"/x264-0.0.20130912-cflags.patch
305 -}
306 -
307 -multilib_src_configure() {
308 - tc-export CC
309 - local asm_conf=""
310 -
311 - if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
312 - asm_conf=" --disable-asm"
313 - fi
314 -
315 - # Upstream uses this, see the cflags patch
316 - use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
317 -
318 - "${S}/configure" \
319 - --prefix="${EPREFIX}"/usr \
320 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
321 - --disable-cli \
322 - --disable-avs \
323 - --disable-lavf \
324 - --disable-swscale \
325 - --disable-ffms \
326 - --disable-gpac \
327 - --enable-pic \
328 - --enable-shared \
329 - --host="${CHOST}" \
330 - $(usex 10bit "--bit-depth=10" "") \
331 - $(usex interlaced "" "--disable-interlaced") \
332 - $(usex opencl "" "--disable-opencl") \
333 - $(usex static-libs "--enable-static" "") \
334 - $(usex threads "" "--disable-thread") \
335 - ${asm_conf} || die
336 -}
337
338 diff --git a/media-libs/x264/x264-0.0.20150820.ebuild b/media-libs/x264/x264-0.0.20150820.ebuild
339 deleted file mode 100644
340 index 4dc5041..00000000
341 --- a/media-libs/x264/x264-0.0.20150820.ebuild
342 +++ /dev/null
343 @@ -1,74 +0,0 @@
344 -# Copyright 1999-2015 Gentoo Foundation
345 -# Distributed under the terms of the GNU General Public License v2
346 -# $Id$
347 -
348 -EAPI=5
349 -
350 -inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
351 -
352 -DESCRIPTION="A free library for encoding X264/AVC streams"
353 -HOMEPAGE="http://www.videolan.org/developers/x264.html"
354 -if [[ ${PV} == 9999 ]]; then
355 - inherit git-2
356 - EGIT_REPO_URI="git://git.videolan.org/x264.git"
357 -else
358 - inherit versionator
359 - MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
360 - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
361 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
362 - S="${WORKDIR}/${MY_P}"
363 -fi
364 -
365 -SONAME="148"
366 -SLOT="0/${SONAME}"
367 -
368 -LICENSE="GPL-2"
369 -IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
370 -
371 -ASM_DEP=">=dev-lang/yasm-1.2.0"
372 -DEPEND="abi_x86_32? ( ${ASM_DEP} )
373 - abi_x86_64? ( ${ASM_DEP} )
374 - opencl? ( dev-lang/perl )"
375 -RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
376 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
377 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
378 -
379 -DOCS="AUTHORS doc/*.txt"
380 -
381 -src_prepare() {
382 - # Initial support for x32 ABI, bug #420241
383 - # Avoid messing too much with CFLAGS.
384 - epatch "${FILESDIR}"/x264-cflags.patch
385 -}
386 -
387 -multilib_src_configure() {
388 - tc-export CC
389 - local asm_conf=""
390 -
391 - if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
392 - asm_conf=" --disable-asm"
393 - fi
394 -
395 - # Upstream uses this, see the cflags patch
396 - use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
397 - append-flags "-ffast-math"
398 -
399 - "${S}/configure" \
400 - --prefix="${EPREFIX}"/usr \
401 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
402 - --disable-cli \
403 - --disable-avs \
404 - --disable-lavf \
405 - --disable-swscale \
406 - --disable-ffms \
407 - --disable-gpac \
408 - --enable-pic \
409 - --enable-shared \
410 - --host="${CHOST}" \
411 - $(usex 10bit "--bit-depth=10" "") \
412 - $(usex interlaced "" "--disable-interlaced") \
413 - $(usex opencl "" "--disable-opencl") \
414 - $(usex static-libs "--enable-static" "") \
415 - $(usex threads "" "--disable-thread") \
416 - ${asm_conf} || die
417 -}
418
419 diff --git a/media-libs/x264/x264-0.0.20151011.ebuild b/media-libs/x264/x264-0.0.20151011.ebuild
420 deleted file mode 100644
421 index f097db6..00000000
422 --- a/media-libs/x264/x264-0.0.20151011.ebuild
423 +++ /dev/null
424 @@ -1,74 +0,0 @@
425 -# Copyright 1999-2015 Gentoo Foundation
426 -# Distributed under the terms of the GNU General Public License v2
427 -# $Id$
428 -
429 -EAPI=5
430 -
431 -inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
432 -
433 -DESCRIPTION="A free library for encoding X264/AVC streams"
434 -HOMEPAGE="http://www.videolan.org/developers/x264.html"
435 -if [[ ${PV} == 9999 ]]; then
436 - inherit git-2
437 - EGIT_REPO_URI="git://git.videolan.org/x264.git"
438 -else
439 - inherit versionator
440 - MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
441 - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
442 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
443 - S="${WORKDIR}/${MY_P}"
444 -fi
445 -
446 -SONAME="148"
447 -SLOT="0/${SONAME}"
448 -
449 -LICENSE="GPL-2"
450 -IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
451 -
452 -ASM_DEP=">=dev-lang/yasm-1.2.0"
453 -DEPEND="abi_x86_32? ( ${ASM_DEP} )
454 - abi_x86_64? ( ${ASM_DEP} )
455 - opencl? ( dev-lang/perl )"
456 -RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
457 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
458 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
459 -
460 -DOCS="AUTHORS doc/*.txt"
461 -
462 -src_prepare() {
463 - # Initial support for x32 ABI, bug #420241
464 - # Avoid messing too much with CFLAGS.
465 - epatch "${FILESDIR}"/x264-0.0.20151011-cflags.patch
466 -}
467 -
468 -multilib_src_configure() {
469 - tc-export CC
470 - local asm_conf=""
471 -
472 - if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
473 - asm_conf=" --disable-asm"
474 - fi
475 -
476 - # Upstream uses this, see the cflags patch
477 - use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
478 - append-flags "-ffast-math"
479 -
480 - "${S}/configure" \
481 - --prefix="${EPREFIX}"/usr \
482 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
483 - --disable-cli \
484 - --disable-avs \
485 - --disable-lavf \
486 - --disable-swscale \
487 - --disable-ffms \
488 - --disable-gpac \
489 - --enable-pic \
490 - --enable-shared \
491 - --host="${CHOST}" \
492 - $(usex 10bit "--bit-depth=10" "") \
493 - $(usex interlaced "" "--disable-interlaced") \
494 - $(usex opencl "" "--disable-opencl") \
495 - $(usex static-libs "--enable-static" "") \
496 - $(usex threads "" "--disable-thread") \
497 - ${asm_conf} || die
498 -}
499
500 diff --git a/media-libs/x264/x264-0.0.20160523.ebuild b/media-libs/x264/x264-0.0.20160523.ebuild
501 deleted file mode 100644
502 index 278f1fe..00000000
503 --- a/media-libs/x264/x264-0.0.20160523.ebuild
504 +++ /dev/null
505 @@ -1,74 +0,0 @@
506 -# Copyright 1999-2016 Gentoo Foundation
507 -# Distributed under the terms of the GNU General Public License v2
508 -# $Id$
509 -
510 -EAPI=5
511 -
512 -inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
513 -
514 -DESCRIPTION="A free library for encoding X264/AVC streams"
515 -HOMEPAGE="http://www.videolan.org/developers/x264.html"
516 -if [[ ${PV} == 9999 ]]; then
517 - inherit git-2
518 - EGIT_REPO_URI="git://git.videolan.org/x264.git"
519 -else
520 - inherit versionator
521 - MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
522 - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
523 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
524 - S="${WORKDIR}/${MY_P}"
525 -fi
526 -
527 -SONAME="148"
528 -SLOT="0/${SONAME}"
529 -
530 -LICENSE="GPL-2"
531 -IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
532 -
533 -ASM_DEP=">=dev-lang/yasm-1.2.0"
534 -DEPEND="abi_x86_32? ( ${ASM_DEP} )
535 - abi_x86_64? ( ${ASM_DEP} )
536 - opencl? ( dev-lang/perl )"
537 -RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
538 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
539 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
540 -
541 -DOCS="AUTHORS doc/*.txt"
542 -
543 -src_prepare() {
544 - # Initial support for x32 ABI, bug #420241
545 - # Avoid messing too much with CFLAGS.
546 - epatch "${FILESDIR}"/x264-0.0.20160523-cflags.patch
547 -}
548 -
549 -multilib_src_configure() {
550 - tc-export CC
551 - local asm_conf=""
552 -
553 - if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
554 - asm_conf=" --disable-asm"
555 - fi
556 -
557 - # Upstream uses this, see the cflags patch
558 - use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
559 - append-flags "-ffast-math"
560 -
561 - "${S}/configure" \
562 - --prefix="${EPREFIX}"/usr \
563 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
564 - --disable-cli \
565 - --disable-avs \
566 - --disable-lavf \
567 - --disable-swscale \
568 - --disable-ffms \
569 - --disable-gpac \
570 - --enable-pic \
571 - --enable-shared \
572 - --host="${CHOST}" \
573 - $(usex 10bit "--bit-depth=10" "") \
574 - $(usex interlaced "" "--disable-interlaced") \
575 - $(usex opencl "" "--disable-opencl") \
576 - $(usex static-libs "--enable-static" "") \
577 - $(usex threads "" "--disable-thread") \
578 - ${asm_conf} || die
579 -}
Report Message
Find on MARC Find on Google Groups