commit: b26b633577e74cfc7f9b6dca36dbf47bcedbdc06
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 14:04:12 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 14:04:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26b6335
media-libs/x264: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/x264/Manifest | 4 --
.../x264/files/x264-0.0.20130912-cflags.patch | 54 ----------------
.../x264/files/x264-0.0.20151011-cflags.patch | 51 ---------------
.../x264/files/x264-0.0.20160523-cflags.patch | 40 ------------
media-libs/x264/files/x264-cflags.patch | 51 ---------------
media-libs/x264/x264-0.0.20140308.ebuild | 73 ---------------------
media-libs/x264/x264-0.0.20150820.ebuild | 74 ----------------------
media-libs/x264/x264-0.0.20151011.ebuild | 74 ----------------------
media-libs/x264/x264-0.0.20160523.ebuild | 74 ----------------------
9 files changed, 495 deletions(-)
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 499d998..a8c4173 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,5 +1 @@
-DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256
b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512
42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629
WHIRLPOOL
b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
-DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256
0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512
6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44
WHIRLPOOL
daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024
-DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256
80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512
a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3
WHIRLPOOL
520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
-DIST x264-snapshot-20160523-2245.tar.bz2 729952 SHA256
1176c018e4896a440bf0b18ed76e3d92de7a7ce5b1e28a7efd5f6e54bf1d6860 SHA512
71cce21acec300842a8323ef8999e655520e2d47288fe983631e0d6fa180155badd9026d58057edebfd73b002f79c9c0011439e8ee9878b3bf0574e8a16fdff9
WHIRLPOOL
fb844e07752a9e48ed2ccd75f34730528c60c22f9a17791c0e002f1c7d25224b814af288e6f6a9563da832bb2fc9a0fed6c92e60bb102e244ee0de24eee40b24
DIST x264-snapshot-20160712-2245.tar.bz2 730644 SHA256
d5033882bbc7e2908f74970931c7dc2044191cc9fa7c7435dc85ad334f23078e SHA512
ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963
WHIRLPOOL
d42459a93e8ff1b69d16f7adecaf3486d102e6fe4ee0d8dd991cdbb7a233bb9975faabc79ff7d2dfd2f67fa1f69a729e617ae868ee127cc0306dfc897db7053b
diff --git a/media-libs/x264/files/x264-0.0.20130912-cflags.patch
b/media-libs/x264/files/x264-0.0.20130912-cflags.patch
deleted file mode 100644
index c08a0d7..00000000
--- a/media-libs/x264/files/x264-0.0.20130912-cflags.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/configure b/configure
-index 07796b1..afdda94 100755
---- a/configure
-+++ b/configure
-@@ -556,11 +556,6 @@ case $host_cpu in
- if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
- CFLAGS="$CFLAGS -march=i686"
- fi
-- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
-- CFLAGS="$CFLAGS -mfpmath=sse -msse"
-- fi
-- CFLAGS="-m32 $CFLAGS"
-- LDFLAGS="-m32 $LDFLAGS"
- else
- # icc on linux has various degrees of mod16 stack support
- if [ $SYS = LINUX ]; then
-@@ -591,13 +586,8 @@ case $host_cpu in
- x86_64)
- ARCH="X86_64"
- AS="yasm"
-- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64
$LDFLAGS"
- if [ "$SYS" = MACOSX ]; then
- ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX"
-- if cc_check '' "-arch x86_64"; then
-- CFLAGS="$CFLAGS -arch x86_64"
-- LDFLAGS="$LDFLAGS -arch x86_64"
-- fi
- elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
- ASFLAGS="$ASFLAGS -f win32 -m amd64"
- # only the GNU toolchain is inconsistent in prefixing function
names with _
-@@ -605,7 +595,11 @@ case $host_cpu in
- [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat
-Wl,--dynamicbase"
- [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS"
- else
-- ASFLAGS="$ASFLAGS -f elf -m amd64"
-+ if cpp_check "" "" "__ILP32__" ; then
-+ ASFLAGS="$ASFLAGS -f elf -m x32"
-+ else
-+ ASFLAGS="$ASFLAGS -f elf -m amd64"
-+ fi
- fi
- ;;
- powerpc|powerpc64)
-@@ -971,10 +965,6 @@ if [ "$pic" = "yes" ] ; then
- [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
- fi
-
--if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
-- CFLAGS="$CFLAGS -fomit-frame-pointer"
--fi
--
- if [ "$strip" = "yes" ]; then
- CFLAGS="$CFLAGS -s"
- LDFLAGS="$LDFLAGS -s"
diff --git a/media-libs/x264/files/x264-0.0.20151011-cflags.patch
b/media-libs/x264/files/x264-0.0.20151011-cflags.patch
deleted file mode 100644
index 851e3f0..00000000
--- a/media-libs/x264/files/x264-0.0.20151011-cflags.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: x264-snapshot-20151011-2245/configure
-===================================================================
---- x264-snapshot-20151011-2245.orig/configure
-+++ x264-snapshot-20151011-2245/configure
-@@ -672,11 +672,6 @@ case $host_cpu in
- if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
- CFLAGS="$CFLAGS -march=i686"
- fi
-- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
-- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
-- fi
-- CFLAGS="-m32 $CFLAGS"
-- LDFLAGS="-m32 $LDFLAGS"
- fi
- if [ "$SYS" = MACOSX ]; then
- ASFLAGS="$ASFLAGS -f macho32 -DPREFIX"
-@@ -695,13 +690,8 @@ case $host_cpu in
- AS_EXT=".asm"
- ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
- stack_alignment=16
-- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64
$LDFLAGS"
- if [ "$SYS" = MACOSX ]; then
- ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX"
-- if cc_check '' "-arch x86_64"; then
-- CFLAGS="$CFLAGS -arch x86_64"
-- LDFLAGS="$LDFLAGS -arch x86_64"
-- fi
- elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
- ASFLAGS="$ASFLAGS -f win64"
- # only the GNU toolchain is inconsistent in prefixing function
names with _
-@@ -1148,20 +1138,10 @@ if [ "$pic" = "yes" ] ; then
- [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
- fi
-
--if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
-- CFLAGS="$CFLAGS -fomit-frame-pointer"
--fi
--
- if [ "$strip" = "yes" ]; then
- LDFLAGS="$LDFLAGS -s"
- fi
-
--if [ "$debug" = "yes" ]; then
-- CFLAGS="-O1 -g $CFLAGS"
--else
-- CFLAGS="-O3 -ffast-math $CFLAGS"
--fi
--
- if cc_check '' -fno-tree-vectorize ; then
- CFLAGS="$CFLAGS -fno-tree-vectorize"
- fi
diff --git a/media-libs/x264/files/x264-0.0.20160523-cflags.patch
b/media-libs/x264/files/x264-0.0.20160523-cflags.patch
deleted file mode 100644
index 25b7e2e..00000000
--- a/media-libs/x264/files/x264-0.0.20160523-cflags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: x264-9999/configure
-===================================================================
---- x264-9999.orig/configure
-+++ x264-9999/configure
-@@ -667,8 +667,6 @@ case $host_cpu in
- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
- fi
-- CFLAGS="-m32 $CFLAGS"
-- LDFLAGS="-m32 $LDFLAGS"
- fi
- if [ "$SYS" = MACOSX ]; then
- ASFLAGS="$ASFLAGS -f macho32 -DPREFIX"
-@@ -687,13 +685,8 @@ case $host_cpu in
- AS_EXT=".asm"
- ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
- stack_alignment=16
-- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64
$LDFLAGS"
- if [ "$SYS" = MACOSX ]; then
- ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX"
-- if cc_check '' "-arch x86_64"; then
-- CFLAGS="$CFLAGS -arch x86_64"
-- LDFLAGS="$LDFLAGS -arch x86_64"
-- fi
- elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
- ASFLAGS="$ASFLAGS -f win64"
- if [ $compiler = GNU ]; then
-@@ -1173,10 +1166,10 @@ if [ "$strip" = "yes" ]; then
- fi
-
- if [ "$debug" = "yes" ]; then
-- CFLAGS="-O1 -g $CFLAGS"
-+ CFLAGS="$CFLAGS"
- RCFLAGS="$RCFLAGS -DDEBUG"
- else
-- CFLAGS="-O3 -ffast-math $CFLAGS"
-+ CFLAGS="-ffast-math $CFLAGS"
- fi
-
- if cc_check '' -fno-tree-vectorize ; then
diff --git a/media-libs/x264/files/x264-cflags.patch
b/media-libs/x264/files/x264-cflags.patch
deleted file mode 100644
index c3b5137..00000000
--- a/media-libs/x264/files/x264-cflags.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: x264-9999/configure
-===================================================================
---- x264-9999.orig/configure
-+++ x264-9999/configure
-@@ -669,11 +669,6 @@ case $host_cpu in
- if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
- CFLAGS="$CFLAGS -march=i686"
- fi
-- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
-- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
-- fi
-- CFLAGS="-m32 $CFLAGS"
-- LDFLAGS="-m32 $LDFLAGS"
- elif [ $compiler = ICC ]; then
- # icc on linux has various degrees of mod16 stack support
- if [ $SYS = LINUX ]; then
-@@ -706,13 +701,8 @@ case $host_cpu in
- AS="${AS-yasm}"
- AS_EXT=".asm"
- ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
-- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64
$LDFLAGS"
- if [ "$SYS" = MACOSX ]; then
- ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX"
-- if cc_check '' "-arch x86_64"; then
-- CFLAGS="$CFLAGS -arch x86_64"
-- LDFLAGS="$LDFLAGS -arch x86_64"
-- fi
- elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
- ASFLAGS="$ASFLAGS -f win64"
- # only the GNU toolchain is inconsistent in prefixing function
names with _
-@@ -1139,20 +1129,10 @@ if [ "$pic" = "yes" ] ; then
- [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
- fi
-
--if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
-- CFLAGS="$CFLAGS -fomit-frame-pointer"
--fi
--
- if [ "$strip" = "yes" ]; then
- LDFLAGS="$LDFLAGS -s"
- fi
-
--if [ "$debug" = "yes" ]; then
-- CFLAGS="-O1 -g $CFLAGS"
--else
-- CFLAGS="-O3 -ffast-math $CFLAGS"
--fi
--
- if cc_check '' -fno-tree-vectorize ; then
- CFLAGS="$CFLAGS -fno-tree-vectorize"
- fi
diff --git a/media-libs/x264/x264-0.0.20140308.ebuild
b/media-libs/x264/x264-0.0.20140308.ebuild
deleted file mode 100644
index aee8bc8..00000000
--- a/media-libs/x264/x264-0.0.20140308.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html";
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2";
- 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"
- S="${WORKDIR}/${MY_P}"
-fi
-
-SONAME="142"
-SLOT="0/${SONAME}"
-
-LICENSE="GPL-2"
-IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
- abi_x86_64? ( ${ASM_DEP} )
- opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-DOCS="AUTHORS doc/*.txt"
-
-src_prepare() {
- # Initial support for x32 ABI, bug #420241
- # Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/x264-0.0.20130912-cflags.patch
-}
-
-multilib_src_configure() {
- tc-export CC
- local asm_conf=""
-
- if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
- asm_conf=" --disable-asm"
- fi
-
- # Upstream uses this, see the cflags patch
- use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
-
- "${S}/configure" \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex opencl "" "--disable-opencl") \
- $(usex static-libs "--enable-static" "") \
- $(usex threads "" "--disable-thread") \
- ${asm_conf} || die
-}
diff --git a/media-libs/x264/x264-0.0.20150820.ebuild
b/media-libs/x264/x264-0.0.20150820.ebuild
deleted file mode 100644
index 4dc5041..00000000
--- a/media-libs/x264/x264-0.0.20150820.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html";
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2";
- 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"
- S="${WORKDIR}/${MY_P}"
-fi
-
-SONAME="148"
-SLOT="0/${SONAME}"
-
-LICENSE="GPL-2"
-IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
- abi_x86_64? ( ${ASM_DEP} )
- opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-DOCS="AUTHORS doc/*.txt"
-
-src_prepare() {
- # Initial support for x32 ABI, bug #420241
- # Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/x264-cflags.patch
-}
-
-multilib_src_configure() {
- tc-export CC
- local asm_conf=""
-
- if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
- asm_conf=" --disable-asm"
- fi
-
- # Upstream uses this, see the cflags patch
- use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
- append-flags "-ffast-math"
-
- "${S}/configure" \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex opencl "" "--disable-opencl") \
- $(usex static-libs "--enable-static" "") \
- $(usex threads "" "--disable-thread") \
- ${asm_conf} || die
-}
diff --git a/media-libs/x264/x264-0.0.20151011.ebuild
b/media-libs/x264/x264-0.0.20151011.ebuild
deleted file mode 100644
index f097db6..00000000
--- a/media-libs/x264/x264-0.0.20151011.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html";
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2";
- 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"
- S="${WORKDIR}/${MY_P}"
-fi
-
-SONAME="148"
-SLOT="0/${SONAME}"
-
-LICENSE="GPL-2"
-IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
- abi_x86_64? ( ${ASM_DEP} )
- opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-DOCS="AUTHORS doc/*.txt"
-
-src_prepare() {
- # Initial support for x32 ABI, bug #420241
- # Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/x264-0.0.20151011-cflags.patch
-}
-
-multilib_src_configure() {
- tc-export CC
- local asm_conf=""
-
- if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
- asm_conf=" --disable-asm"
- fi
-
- # Upstream uses this, see the cflags patch
- use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
- append-flags "-ffast-math"
-
- "${S}/configure" \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex opencl "" "--disable-opencl") \
- $(usex static-libs "--enable-static" "") \
- $(usex threads "" "--disable-thread") \
- ${asm_conf} || die
-}
diff --git a/media-libs/x264/x264-0.0.20160523.ebuild
b/media-libs/x264/x264-0.0.20160523.ebuild
deleted file mode 100644
index 278f1fe..00000000
--- a/media-libs/x264/x264-0.0.20160523.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html";
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2";
- 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"
- S="${WORKDIR}/${MY_P}"
-fi
-
-SONAME="148"
-SLOT="0/${SONAME}"
-
-LICENSE="GPL-2"
-IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
- abi_x86_64? ( ${ASM_DEP} )
- opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-DOCS="AUTHORS doc/*.txt"
-
-src_prepare() {
- # Initial support for x32 ABI, bug #420241
- # Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/x264-0.0.20160523-cflags.patch
-}
-
-multilib_src_configure() {
- tc-export CC
- local asm_conf=""
-
- if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
- asm_conf=" --disable-asm"
- fi
-
- # Upstream uses this, see the cflags patch
- use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
- append-flags "-ffast-math"
-
- "${S}/configure" \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex opencl "" "--disable-opencl") \
- $(usex static-libs "--enable-static" "") \
- $(usex threads "" "--disable-thread") \
- ${asm_conf} || die
-}
