commit: 86a2ad4e3faca504bd6f3d20e0226e8071276636
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 11:11:50 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 11:23:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a2ad4e
media-libs/x264: Drop 0.0.20170701
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/x264/Manifest | 1 -
media-libs/x264/metadata.xml | 1 -
media-libs/x264/x264-0.0.20170701.ebuild | 61 --------------------------------
3 files changed, 63 deletions(-)
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index ab3b20f2392..9e07ce682c0 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,2 +1 @@
-DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B
ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867
SHA512
28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f
DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B
d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6
SHA512
c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
diff --git a/media-libs/x264/metadata.xml b/media-libs/x264/metadata.xml
index 1ab4b5f7443..5f2a5026900 100644
--- a/media-libs/x264/metadata.xml
+++ b/media-libs/x264/metadata.xml
@@ -5,7 +5,6 @@
<email>[email protected]</email>
</maintainer>
<use>
- <flag name="10bit">Set output bit depth to 10, this may not be
compatible with all decoders</flag>
<flag name="interlaced">enable interlaced encoding support,
this can decrease encoding speed by up to 2%</flag>
<flag name="opencl">Add support for OpenCL.</flag>
<flag name="pic">disable optimized assembly code that is not
PIC friendly</flag>
diff --git a/media-libs/x264/x264-0.0.20170701.ebuild
b/media-libs/x264/x264-0.0.20170701.ebuild
deleted file mode 100644
index 284bd9ada4b..00000000000
--- a/media-libs/x264/x264-0.0.20170701.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="https://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-
SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="alpha amd64 arm ~arm64 ~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="152"
-SLOT="0/${SONAME}"
-
-LICENSE="GPL-2"
-IUSE="10bit altivec +interlaced opencl pic static-libs cpu_flags_x86_sse
+threads"
-
-ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
- abi_x86_64? ( ${ASM_DEP} )
- opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
-
-DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
-
-multilib_src_configure() {
- tc-export CC
- local asm_conf=""
-
- if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } ||
[[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && {
use !altivec ; }; then
- asm_conf=" --disable-asm"
- fi
-
- "${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
-}