New version using the 120 api

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index f5b2325e9aa8f5583c21235f9f62bb2ac252b076..816cb66d26996c10565e14cfde0603f5c8d57a09 100644 (file)
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,12 @@
 # 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.61 2011/12/19 17:17:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.62 2011/12/21 23:10:46 lu_zero Exp $
+
+*x264-encoder-0.0.20111220 (21 Dec 2011)
+
+  21 Dec 2011; Luca Barbato <lu_zero@gentoo.org>
+  +x264-encoder-0.0.20111220.ebuild:
+  New version using the 120 api
 
 *x264-encoder-0.0.20111218 (19 Dec 2011)
 

diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 5ac409e2d3850b26daf0f6c9eca7c2925074ad10..c19e1d02efc925a2d096800b08c1576caa8167f0 100644 (file)
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX x264-encoder-nolib-20110425.patch 1547 RMD160 ace0273445d751bf1b538abad364e3b738dad21c SHA1 2cdb96488785f1f355018d0b6727b3bd373d43a6 SHA256 124955cb5322d5f40771669798217991826dbc1f8ca9daac821d672238011c88
 AUX x264-encoder-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
@@ -7,17 +7,19 @@ DIST x264-snapshot-20110426-2245.tar.bz2 495607 RMD160 3104b39f695a08c8199298eb8
 DIST x264-snapshot-20110825-2245-stable.tar.bz2 516879 RMD160 4f1e00ddd170c75c6d3e140085358ff95c8e861f SHA1 0e8fff6252397d453b0f38cc0fdaf9699558194d SHA256 ab0ed4046a36093f00dfa572d7234c59cec5f6cb674d8bb0fe4e6bdd7604efa0
 DIST x264-snapshot-20111017-2245.tar.bz2 525683 RMD160 c8758e99017bdb7c70991e0ba35c4c79e3b34232 SHA1 8a007bbe5720f74ecbcf9f4fb71ad8cc6bd974d4 SHA256 b1b9450835ffece5079c9167d92c20486b97bb14fc33b34b1faf7443728d4c2e
 DIST x264-snapshot-20111218-2245-stable.tar.bz2 531234 RMD160 b60e78475239d7e187576e48c03c9e580379f43d SHA1 ccf6720a0b8d4078b1babee40c8b1bbde5ea7dce SHA256 8dc5edd9aa7fb0247605ec7db1bd48013849ec200d420d78ad7bce427d0db866
+DIST x264-snapshot-20111220-2245.tar.bz2 532402 RMD160 3e9dce921fa8d7a9dadacd6e9cc0d9a1ec884860 SHA1 8e1958383ba08d9dc4b3e6c0e209243111a10c39 SHA256 c360b0320cc72a77c5f2ececbd100bbbdd0461227f7c4bc06212e86f5aa0fb8a
 EBUILD x264-encoder-0.0.20110426.ebuild 1601 RMD160 662ea7c2892182b8f34c9dea40a4b2311716e145 SHA1 7c02087be895a085e1735feb9429fe19b0984346 SHA256 02761fcfe6dc5ba24bd994c5d9a74c95bb5e41633f52096f8b7d05374069ed70
 EBUILD x264-encoder-0.0.20110825-r1.ebuild 2480 RMD160 8e7bf4f9877f2c6bb77fb307d3e9d9031a7637bf SHA1 92fa203a559060e0274e3fafd2613c46840ceb25 SHA256 cdd24a42c93ba69ab28031511f5f50f5722816244c90118b81672fda22ccdc55
 EBUILD x264-encoder-0.0.20111017.ebuild 2469 RMD160 b060bb2fd3222d8e9fa90afb83968b3dd54dae29 SHA1 068d06c7ce39be7946de686c37c309d7e1ca386c SHA256 744af0015a80589d12a2ea946243d1441b345248eadc5f4ea4a7ab95278dcdea
 EBUILD x264-encoder-0.0.20111218.ebuild 1986 RMD160 b7ae7106c3f2cf33ae79aa6c16f8bd477bcdad76 SHA1 4b9246fe044aeedf103149c1c6a5c7d91355514a SHA256 bc8ae011d07a36432a9ca461267df6fd6ecefd089b3d396f785351dbc52e7016
+EBUILD x264-encoder-0.0.20111220.ebuild 2469 RMD160 5db1ec7fed95b8156f12c28389b2c1a200099ae3 SHA1 afa5519e8dc2b551b7e316aa7a84bda6a8a0af1a SHA256 29c371c33df6713168b11fefe01ad6f8aa980c7fccf09eda3b6f5110fc4df6a9
 EBUILD x264-encoder-9999.ebuild 1978 RMD160 9d8918893284f4dbc6b2472c6f214f17c740cf28 SHA1 7e55d81845b0bb522e12088840bf1630053a81a7 SHA256 b81858a1841906def5447eb36e385eec6d1ad00a6c484a9e4eb7955a09ee09db
-MISC ChangeLog 10517 RMD160 c46568fba5e6a1f0065d11feb1eadf59ecda3446 SHA1 c78c41998a151fbec69d0de993b3ce47fd82ab9b SHA256 f73f698557e6f55495588586dffddfc164beabfae6ce317de91e93cdef91d009
+MISC ChangeLog 10677 RMD160 fb75d9acd0eb3b205f9932bcd8364396bae831b4 SHA1 8312233a179731c8ebd4872d6f9458bc8b4c290a SHA256 f0d7d087fc410ff9e7037a5623482de47ae75b5bc09b1a5f0ca423929ffa34e1
 MISC metadata.xml 518 RMD160 3440b9fcbcb5cf3ae84df312121c234cd798893d SHA1 7807975d69297fe975731d8626323abaeacb05e2 SHA256 3c234897ff680a5fe89179bd8da788695cee616a856c0e9fbc20eb6c388b01b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7vcagACgkQvFcC4BYPU0r/5gCeMMwFQFsisGonNgA7I3yWTNeK
-Y54AniKW78Ojv5KqWC0jpOAL/t2vdJrN
-=DOE8
+iF4EAREIAAYFAk7yZ4MACgkQYpJnKVbCxcx8JQD+MqlWS5pY46oiu7JQC4V8QRjT
+EJuivbyfdr4k85DUtkoA/R6w3A4zfzRFjlxUBMco/wi/Tua3qm2Bx9AqLjFbEcqZ
+=UMvQ
 -----END PGP SIGNATURE-----

diff --git a/media-video/x264-encoder/x264-encoder-0.0.20111220.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20111220.ebuild
new file mode 100644 (file)
index 0000000..f2fc285
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20111220.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.20111220.ebuild,v 1.1 2011/12/21 23:10:46 lu_zero 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"
+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
+}