[gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     8544f30e250fdd6a265f34bfaef9592f5ae3c419
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 11:10:37 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=8544f30e

media-video/x264-encoder: Drop 0.0.20170701

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/x264-encoder/Manifest                  |  1 -
 media-video/x264-encoder/metadata.xml              |  1 -
 .../x264-encoder/x264-encoder-0.0.20170701.ebuild  | 73 ----------------------
 3 files changed, 75 deletions(-)

diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index ab3b20f2392..9e07ce682c0 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/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-video/x264-encoder/metadata.xml b/media-video/x264-encoder/metadata.xml
index b78e7f5a76e..cdf2dbfca75 100644
--- a/media-video/x264-encoder/metadata.xml
+++ b/media-video/x264-encoder/metadata.xml
@@ -5,7 +5,6 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="10bit">Set output bit depth to 10</flag>
     <flag name="avs">enable AvxSynth support in the AviSynth input module</flag>
     <flag name="ffmpegsource">Enable ffmpegsource aka ffms support, disables lavf</flag>
     <flag name="interlaced">Enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag>

diff --git a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
deleted file mode 100644
index 05428fbc201..00000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A free commandline encoder for 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"
-	SRC_URI=""
-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 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="
-	~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
-	ffmpeg? ( virtual/ffmpeg )
-	ffmpegsource? ( media-libs/ffmpegsource )
-	mp4? ( >=media-video/gpac-0.5.2:= )"
-
-ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="${RDEPEND}
-	amd64? ( ${ASM_DEP} )
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/gpac.patch" )
-
-src_configure() {
-	tc-export CC
-
-	# let upstream pick the optimization level by default
-	use custom-cflags || filter-flags -O?
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--system-libx264 \
-		--host="${CHOST}" \
-		--disable-lsmash \
-		$(usex 10bit "--bit-depth=10" "") \
-		$(usex avs "" "--disable-avs") \
-		$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
-		$(usex ffmpegsource "" "--disable-ffms") \
-		$(usex interlaced "" "--disable-interlaced") \
-		$(usex mp4 "" "--disable-gpac") \
-		$(usex threads "" "--disable-thread") || die
-
-	# this is a nasty workaround for bug #376925 for x264 that also applies
-	# here, needed because as upstream doesn't like us fiddling with their CFLAGS
-	if use custom-cflags; then
-		local cflags
-		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
-		cflags="${cflags//$(get-flag O)/}"
-		cflags="${cflags//-O? /$(get-flag O) }"
-		cflags="${cflags//-g /}"
-		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
-	fi
-}