Revision bump. Re-add ffmpegsource USE flag, add interlaced use flag as media-libs/x264 now has. Add the 10bit USE flag from the multimedia overlay. Add custom-cflags USE flag as well, as upstream doesn't like us messing around with their CFLAGS. Use stable snapshot rather than unstable one.

(Portage version: 2.1.10.11/cvs/Linux x86_64)

4 files changed, 99 insertions, 54 deletions

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index 91708a72c568..d5c9f8ed2e70 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/x264-encoder
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.58 2011/09/07 15:09:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.59 2011/09/07 23:47:21 chutzpah Exp $
+
+*x264-encoder-0.0.20110825-r1 (07 Sep 2011)
+
+  07 Sep 2011; Patrick McLean <chutzpah@gentoo.org>
+  x264-encoder-0.0.20110825.ebuild, +x264-encoder-0.0.20110825-r1.ebuild,
+  metadata.xml:
+  Revision bump. Re-add ffmpegsource USE flag, add interlaced use flag as
+  media-libs/x264 now has. Add the 10bit USE flag from the multimedia overlay.
+  Add custom-cflags USE flag as well, as upstream doesn't like us messing
+  around with their CFLAGS. Use stable snapshot rather than unstable one.
 
   07 Sep 2011; Alexis Ballier <aballier@gentoo.org>
   x264-encoder-0.0.20110825.ebuild, x264-encoder-9999.ebuild, metadata.xml:
diff --git a/media-video/x264-encoder/metadata.xml b/media-video/x264-encoder/metadata.xml
index d8a22487e4b5..de9b645c7fb3 100644
--- a/media-video/x264-encoder/metadata.xml
+++ b/media-video/x264-encoder/metadata.xml
@@ -6,6 +6,8 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="ffmpegsource">Enable ffmpegsource aka ffms support, disables lavf</flag>
+      <flag name="10bit">Set output bit depth to 10</flag>
+      <flag name="interlaced">Enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag>
+      <flag name="ffmpegsource">Enable ffmpegsource aka ffms support, disables lavf</flag>
   </use>
 </pkgmetadata>
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20110825-r1.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20110825-r1.ebuild
new file mode 100644
index 000000000000..74122f0bd673
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20110825-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110825-r1.ebuild,v 1.1 2011/09/07 23:47:21 chutzpah Exp $
+
+EAPI=4
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	V_ECLASS="git-2"
+else
+	V_ECLASS="versionator"
+fi
+
+inherit flag-o-matic multilib toolchain-funcs ${V_ECLASS}
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	MY_P="x264-snapshot-$(get_version_component_range 3)-2245-stable"
+fi
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	EGIT_REPO_URI="git://git.videolan.org/x264.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+IUSE="10bit custom-cflags debug ffmpeg ffmpegsource +interlaced mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="ffmpeg? ( virtual/ffmpeg )
+	ffmpegsource? ( media-libs/ffmpegsource )
+	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
+
+DEPEND="${RDEPEND}
+	amd64? ( >=dev-lang/yasm-0.6.2 )
+	x86? ( >=dev-lang/yasm-0.6.2 )
+	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )
+	dev-util/pkgconfig"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S=${WORKDIR}/${MY_P}
+fi
+
+src_configure() {
+	tc-export CC
+
+	local myconf=""
+	use 10bit && myconf+=" --bit-depth=10"
+	use debug && myconf+=" --enable-debug"
+	use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
+	use ffmpegsource || myconf+=" --disable-ffms"
+	use interlaced || myconf+=" --disable-interlaced"
+	use mp4 || myconf+=" --disable-gpac"
+	use threads || myconf+=" --disable-thread"
+
+	# let upstream pick the optimization level by default
+	use custom-cflags || filter-flags -O?
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-avs \
+		--system-libx264 \
+		--host="${CHOST}" \
+		${myconf} || 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
+}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild
deleted file mode 100644
index 04440554e9dd..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild,v 1.2 2011/09/07 15:09:35 aballier Exp $
-
-EAPI=4
-inherit eutils multilib toolchain-funcs versionator
-
-MY_P=x264-snapshot-$(get_version_component_range 3)-2245
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-SRC_URI="http://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug ffmpeg mp4 +threads"
-
-RDEPEND="ffmpeg? ( media-video/ffmpeg )
-	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
-	~media-libs/x264-${PV}"
-DEPEND="${RDEPEND}
-	amd64? ( >=dev-lang/yasm-0.6.2 )
-	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm )
-		!<dev-lang/yasm-0.6.2 )
-	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	tc-export CC
-
-	local myconf=""
-	use debug && myconf+=" --enable-debug"
-	use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
-	use mp4 || myconf+=" --disable-gpac"
-	use threads || myconf+=" --disable-thread"
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-avs \
-		--disable-ffms \
-		--extra-asflags="${ASFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--host="${CHOST}" \
-		--system-libx264 \
-		${myconf} \
-		|| die
-}