new snapshot

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

4 files changed, 106 insertions, 5 deletions

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index 1a0cac3450f8..367048a08718 100644
--- a/media-libs/x264/ChangeLog
+++ b/media-libs/x264/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/x264
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.48 2011/02/24 13:25:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.49 2011/04/27 17:20:07 aballier Exp $
+
+*x264-0.0.20110426 (27 Apr 2011)
+
+  27 Apr 2011; Alexis Ballier <aballier@gentoo.org> +x264-0.0.20110426.ebuild,
+  +files/x264-onlylib-20110425.patch:
+  new snapshot
 
 *x264-0.0.20110223 (24 Feb 2011)
 
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 87682abbb81d..b38c0df67ca1 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -4,18 +4,21 @@ Hash: SHA1
 AUX x264-altivec.patch 2529 RMD160 a898058a653d55a65ddd070285b649b8569b3215 SHA1 849970574883c079b8b63cdb0922018c32d43532 SHA256 e36a5fe0ff284e0cf7ee1ddeec06f2f083ff1d740e9317d82a3f83dc23a924e6
 AUX x264-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
 AUX x264-onlylib-20100605.patch 1078 RMD160 a40e8e298cef462b2c1a393d56184c84a901eb28 SHA1 085e8c16226ad9bb1cfb7efe6065cd80a7c2f358 SHA256 557c818204143440b982bae758103898078d014d145176267329d368b2b44fa4
+AUX x264-onlylib-20110425.patch 1120 RMD160 b67837ba873f9d721b4a545db0615055b0e60767 SHA1 ac74558bc2e93870f2717b482a3d63c803511fcc SHA256 a0bdcfe1a86fdde9f56d7842f203d90eefcc4080664653ea42a8a4cc6231dbbe
 DIST x264-snapshot-20100605-2245.tar.bz2 422713 RMD160 379b728d53b642bb5ac6d82765325f4c2bbcec00 SHA1 d923e2168d9e4e3f339bfa1588b8d5d748a9a1ba SHA256 29d01cf362770658caea4aa7c9a62319053b113d25d0cbbd4e5b0a697284d692
 DIST x264-snapshot-20101029-2245.tar.bz2 449078 RMD160 65691ea49254ac769a1dde5c03bbe190d7758390 SHA1 3153e901b69acbfcade2af9a59b52d357166ece0 SHA256 d6d1ac9450e2e345d6a4bf7e62a9b03256b10da8e4d62c829ba683a7566711f3
 DIST x264-snapshot-20110223-2245.tar.bz2 485914 RMD160 796edaaaa4c0983e48202628abc1624445c7dac7 SHA1 68cf65982666390cec2d875c521090958e4fd338 SHA256 95c0287102ab4f9b736fc83a1a17b74f6d4b1725ccf23cc619d453293f76a551
+DIST x264-snapshot-20110426-2245.tar.bz2 495607 RMD160 3104b39f695a08c8199298eb89d5c500ffebfb45 SHA1 b2aa061648354aa80adeeba33819d8b961185dbc SHA256 2610ea30eb8857f7b8933137f8994f83243038fd8e336343e3422a5f25459fcc
 EBUILD x264-0.0.20100605.ebuild 1502 RMD160 70f9d093035eac1511eac5f3ef001f88e17f0fec SHA1 fdadbfcd76a3e60198ba6d1ed09bea59a5b8b2d3 SHA256 bd8e77d53bfe9cddea913da054704d046676fbc47e6c6826a8746ebbf3d951b1
 EBUILD x264-0.0.20101029.ebuild 1563 RMD160 ba1d7f7a2a22b57f5b77c5b72c9a77fc3d1d071f SHA1 de8a05e549b5633d7694ce249639a7aa5027b932 SHA256 56bb1399d2ea33336c65a7a643937557953a4b48c148ef5844f0119cc2ff4580
 EBUILD x264-0.0.20110223.ebuild 1526 RMD160 fb57c899f11215174009a1da6afcb0527f924164 SHA1 0845dcc3b312da131449e97cf8f77bdd6f5f9632 SHA256 760d2d03ce5b70789b6a9d137428e3263650ddcee8f7dcaae5063f5e6a0eb13d
-MISC ChangeLog 7127 RMD160 a953771dbc0e9470382985dab19a3423311eaf6d SHA1 fc366d82a87637c4ac13397d03abd04cc3eb94a2 SHA256 57333369ad4ed88ae6ef2baff8572a2ee7999ca60d1f2ed95ff821a4fa20339d
+EBUILD x264-0.0.20110426.ebuild 1526 RMD160 cbaf2d376b3c4942cc6dc00d5afe70811e47bdb3 SHA1 fa36c6ac5f64661e5fba66fcba8d50ec6145577b SHA256 903673fa4f95dbddb82954bf3e71c985d7b549f71b46cd483f0b9f70474cfdb9
+MISC ChangeLog 7294 RMD160 dec6b6fe9440ebb08312085a5625180e543e5480 SHA1 e586542fd00da9884bff0bc87dcf5a076441024e SHA256 eeeebfa16307d072be056964a71aaed1f10317ba10098d47de4d831ef24f017c
 MISC metadata.xml 335 RMD160 782d171712950050c9e34479cedef18983e566e9 SHA1 68e8b7034a5abef5f25463e194936c8d4a837f72 SHA256 18b919bb52e6713ae3919ba49f66caa659304337339e6d317e95d04a6384d23c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1mXF4ACgkQvFcC4BYPU0p0+QCfVdi9YxAyjJaCVAMjAC6h57dZ
-A9MAoKRjDyLcbfk3kFH/GuAIgVTGfCxy
-=ewy8
+iEYEARECAAYFAk24UEwACgkQvFcC4BYPU0qwHgCdFxKthFMHPvP+mWZy7H3lYpfV
+EcAAn05y3KEmcAs4EyBsTDzQqwI775X8
+=3Kj2
 -----END PGP SIGNATURE-----
diff --git a/media-libs/x264/files/x264-onlylib-20110425.patch b/media-libs/x264/files/x264-onlylib-20110425.patch
new file mode 100644
index 000000000000..6f216b92fa8e
--- /dev/null
+++ b/media-libs/x264/files/x264-onlylib-20110425.patch
@@ -0,0 +1,30 @@
+Index: x264-snapshot-20110425-2245/Makefile
+===================================================================
+--- x264-snapshot-20110425-2245.orig/Makefile
++++ x264-snapshot-20110425-2245/Makefile
+@@ -137,7 +137,7 @@ DEP  = depend
+ 
+ .PHONY: all default fprofiled clean distclean install uninstall dox test testclean
+ 
+-default: $(DEP) x264$(EXE)
++default: $(DEP)
+ 
+ $(LIBX264): .depend $(OBJS) $(OBJASM)
+ 	$(AR)$@ $(OBJS) $(OBJASM)
+@@ -207,7 +207,7 @@ distclean: clean
+ 	rm -f config.mak x264_config.h config.h config.log x264.pc x264.def
+ 	rm -rf test/
+ 
+-install: x264$(EXE) $(SONAME)
++install: $(LIBX264) $(SONAME)
+ 	install -d $(DESTDIR)$(bindir)
+ 	install -d $(DESTDIR)$(includedir)
+ 	install -d $(DESTDIR)$(libdir)
+@@ -216,7 +216,6 @@ install: x264$(EXE) $(SONAME)
+ 	install -m 644 x264_config.h $(DESTDIR)$(includedir)
+ 	install -m 644 $(LIBX264) $(DESTDIR)$(libdir)
+ 	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
+-	install x264$(EXE) $(DESTDIR)$(bindir)
+ 	$(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
+ ifeq ($(SYS),WINDOWS)
+ 	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
diff --git a/media-libs/x264/x264-0.0.20110426.ebuild b/media-libs/x264/x264-0.0.20110426.ebuild
new file mode 100644
index 000000000000..bf92c374adc7
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20110426.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20110426.ebuild,v 1.1 2011/04/27 17:20:07 aballier Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs versionator
+
+MY_P=x264-snapshot-$(get_version_component_range 3)-2245
+
+DESCRIPTION="A free library for encoding 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug +threads pic"
+
+RDEPEND=""
+DEPEND="amd64? ( >=dev-lang/yasm-0.6.2 )
+	x86? ( >=dev-lang/yasm-0.6.2 )
+	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-nostrip.patch \
+		"${FILESDIR}"/${PN}-onlylib-20110425.patch
+}
+
+src_configure() {
+	tc-export CC
+
+	local myconf=""
+	use debug && myconf="${myconf} --enable-debug"
+
+	if use x86 && use pic; then
+		myconf="${myconf} --disable-asm"
+	fi
+
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--disable-avs \
+		--disable-lavf \
+		--disable-swscale \
+		--disable-gpac \
+		$(use threads || echo "--disable-thread") \
+		--enable-pic \
+		--enable-shared \
+		--extra-asflags="${ASFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--host="${CHOST}" \
+		${myconf} \
+		|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS doc/*.txt
+}