version bump now that yasm issues on x86 have been fixed, bug #180666, block older version of yasm because of this

Package-Manager: portage-2.1.3.9

6 files changed, 148 insertions, 5 deletions

diff --git a/media-libs/x264-svn/ChangeLog b/media-libs/x264-svn/ChangeLog
index 9d1c016eb5ac..072c8a0fff0e 100644
--- a/media-libs/x264-svn/ChangeLog
+++ b/media-libs/x264-svn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/x264-svn
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264-svn/ChangeLog,v 1.48 2007/09/07 08:53:40 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264-svn/ChangeLog,v 1.49 2007/09/23 18:10:45 aballier Exp $
+
+*x264-svn-20070923 (23 Sep 2007)
+
+  23 Sep 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/x264-svn-20070923-nostrip.patch,
+  +files/x264-svn-20070923-onlylib.patch, +x264-svn-20070923.ebuild:
+  version bump now that yasm issues on x86 have been fixed, bug #180666, block
+  older version of yasm because of this
 
   07 Sep 2007; Stuart Longland <redhatter@gentoo.org>
   x264-svn-20070325.ebuild:
diff --git a/media-libs/x264-svn/Manifest b/media-libs/x264-svn/Manifest
index f08c3e7d3214..271e4bcaf391 100644
--- a/media-libs/x264-svn/Manifest
+++ b/media-libs/x264-svn/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX x264-svn-20060302-nostrip.patch 551 RMD160 7a570670550f52d8ef0bfd453a507f4c03a3e113 SHA1 8769a5fceb6eef902996818d35d12ba08b2dce30 SHA256 c2e37410125dfe3dcd54fb2e0a5f935de6527b1feefc0a1e0740ee29467c6a37
 MD5 57e7820574c843c1c1a93edc16ae58b9 files/x264-svn-20060302-nostrip.patch 551
 RMD160 7a570670550f52d8ef0bfd453a507f4c03a3e113 files/x264-svn-20060302-nostrip.patch 551
@@ -18,9 +21,18 @@ AUX x264-svn-20070325-onlylib.patch 1021 RMD160 daed97f749a1d6a1a9cf58135dffb550
 MD5 08d9a075d5328234a0a4dc7667ef7023 files/x264-svn-20070325-onlylib.patch 1021
 RMD160 daed97f749a1d6a1a9cf58135dffb55002ead0f5 files/x264-svn-20070325-onlylib.patch 1021
 SHA256 42a96152f790654585a79a849a757394f3fb48caee74c3a8ca4d8ba076c5250a files/x264-svn-20070325-onlylib.patch 1021
+AUX x264-svn-20070923-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
+MD5 287a591572985d408a30f928f7b65f2a files/x264-svn-20070923-nostrip.patch 433
+RMD160 81c3893b1a02839da38f34484c794996855fab5e files/x264-svn-20070923-nostrip.patch 433
+SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa files/x264-svn-20070923-nostrip.patch 433
+AUX x264-svn-20070923-onlylib.patch 1021 RMD160 daed97f749a1d6a1a9cf58135dffb55002ead0f5 SHA1 5675c3502ac81b0efb42bbaffd2c7af7583d3298 SHA256 42a96152f790654585a79a849a757394f3fb48caee74c3a8ca4d8ba076c5250a
+MD5 08d9a075d5328234a0a4dc7667ef7023 files/x264-svn-20070923-onlylib.patch 1021
+RMD160 daed97f749a1d6a1a9cf58135dffb55002ead0f5 files/x264-svn-20070923-onlylib.patch 1021
+SHA256 42a96152f790654585a79a849a757394f3fb48caee74c3a8ca4d8ba076c5250a files/x264-svn-20070923-onlylib.patch 1021
 DIST x264-svn-20060612.tar.bz2 303875 RMD160 96aebd16a5d59eeb278118e41bd3ed13991901bc SHA1 be6fe19ad3e0a091077dcc94f7d4a80820fe3454 SHA256 18b2e756aa9fdb71194b0b98412f36bb633f7b76d8629327619fb621b0f2a92d
 DIST x264-svn-20061014.tar.bz2 288203 RMD160 c6f7275a3691c18821d1562a3b7db8e3b01ac886 SHA1 32e68b019f0871eb85cb29084008e54175a49de0 SHA256 4a26b883d7f9c4f3cff56a3034e9f7617d2b1cd4f8d1846b886130fffdbf6bbc
 DIST x264-svn-20070325.tar.bz2 492487 RMD160 38d9c2aa39567de39a950c45cd032ff3599b0d5b SHA1 b3ac04e09af1f936fb67b13c20c8f82b4b9c448d SHA256 b2398f83b5949032e9a42bb8b2f70d00a18bdbff2f6b0bb6897d65384c42ca28
+DIST x264-svn-20070923.tar.bz2 322704 RMD160 5a6c643521b98fe10ebb6c63168d0a9b7a9dc548 SHA1 5776cf5495c9c60cf2dda4188c5a9a13413ef614 SHA256 39d8a8b72ede15efda9b3ad9f9583dfcdf8c750587f62d5caf5e4e0462acfa50
 EBUILD x264-svn-20060612.ebuild 1243 RMD160 efc5a6eb420c5972b831cdf374e6b1016e27b045 SHA1 6d58135ea9029dfb386aafa962bbd0c06665ef9c SHA256 2851d394d618e2b4eef260a89bfb7decd39297aa6282ea208eda349c30562292
 MD5 4ac8ccfabed868a14af8540f66a346be x264-svn-20060612.ebuild 1243
 RMD160 efc5a6eb420c5972b831cdf374e6b1016e27b045 x264-svn-20060612.ebuild 1243
@@ -37,10 +49,14 @@ EBUILD x264-svn-20070325.ebuild 1409 RMD160 f707a8d5032749428629760f717f59a7aef0
 MD5 3114e8e89eea88280338c430aa8a93f1 x264-svn-20070325.ebuild 1409
 RMD160 f707a8d5032749428629760f717f59a7aef00375 x264-svn-20070325.ebuild 1409
 SHA256 132a2e022b6db85f2b014ab09f20c40d879a1cab39300c7d22fe63ca6243e04c x264-svn-20070325.ebuild 1409
-MISC ChangeLog 6522 RMD160 6186558dc0c8550939c1b6bc3b18548ba6f2214c SHA1 15b73b619f3446c0db6cf07078641902c2d52fb4 SHA256 0ee5eef02f60a18bda6dab4cac7332465ad5d6ccb8161f7da73d5fdad738af56
-MD5 4beb71866b526668d015cfbb21460817 ChangeLog 6522
-RMD160 6186558dc0c8550939c1b6bc3b18548ba6f2214c ChangeLog 6522
-SHA256 0ee5eef02f60a18bda6dab4cac7332465ad5d6ccb8161f7da73d5fdad738af56 ChangeLog 6522
+EBUILD x264-svn-20070923.ebuild 1643 RMD160 6e20c137bdf67fd570bf9fd79c093936ed973d2e SHA1 058cd32ae75f4048681223ef6ca27c0d2247c24f SHA256 288614365f179581c2df08fbd3bb7f03a6030ea6d02929d29a43f9e5ed0ae5e9
+MD5 8ff9059fa2554d56ba13e272ba946654 x264-svn-20070923.ebuild 1643
+RMD160 6e20c137bdf67fd570bf9fd79c093936ed973d2e x264-svn-20070923.ebuild 1643
+SHA256 288614365f179581c2df08fbd3bb7f03a6030ea6d02929d29a43f9e5ed0ae5e9 x264-svn-20070923.ebuild 1643
+MISC ChangeLog 6838 RMD160 94e23a6f4f90872c14986c3af5df9e20b56f876f SHA1 530d8fdb2d08db773e50f22b0a7d5571fa1bff4c SHA256 24f385b33e19ca32e779ec13c448a9361da918c0c29c0c7d75782c323ed7aec9
+MD5 860e6f3bea7f9ec1cf8019189ee5dba1 ChangeLog 6838
+RMD160 94e23a6f4f90872c14986c3af5df9e20b56f876f ChangeLog 6838
+SHA256 24f385b33e19ca32e779ec13c448a9361da918c0c29c0c7d75782c323ed7aec9 ChangeLog 6838
 MISC metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d SHA1 a8362b29138cd87a592947af33840bf3210cfc59 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
@@ -57,3 +73,13 @@ SHA256 4eadce87a1d26efb89411dbe5e48facd55b86041f42e243e12d9b83312d04a35 files/di
 MD5 b62afa9b61a3b75309e3449e1e66e7f4 files/digest-x264-svn-20070325 256
 RMD160 5ebd356c5f0a770fbbe59125ae72fec7816e3a94 files/digest-x264-svn-20070325 256
 SHA256 437d0cf75bd5a0b8447e676f73cd94bc4ffa22fbc0a2abe77cdbf9278f959241 files/digest-x264-svn-20070325 256
+MD5 884507177accd59fcffc342e3b46ff32 files/digest-x264-svn-20070923 256
+RMD160 ae9458e52cf9340bb710bd3ba2bd08094841bc49 files/digest-x264-svn-20070923 256
+SHA256 e7d51cf2269c4d0fbf719901a286890bacfe4bf02b48013bfa6a98ecec8dcd4c files/digest-x264-svn-20070923 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFG9qwvvFcC4BYPU0oRAs+iAJ0Umlcju6bYx9RKk6URnu766vcBcwCeMm1L
+gc4dg9lVxg3jq2twCSYlImk=
+=aVu2
+-----END PGP SIGNATURE-----
diff --git a/media-libs/x264-svn/files/digest-x264-svn-20070923 b/media-libs/x264-svn/files/digest-x264-svn-20070923
new file mode 100644
index 000000000000..06a24bc198b6
--- /dev/null
+++ b/media-libs/x264-svn/files/digest-x264-svn-20070923
@@ -0,0 +1,3 @@
+MD5 3f6e81f8fd33c4bd9ee558ee3ec1f920 x264-svn-20070923.tar.bz2 322704
+RMD160 5a6c643521b98fe10ebb6c63168d0a9b7a9dc548 x264-svn-20070923.tar.bz2 322704
+SHA256 39d8a8b72ede15efda9b3ad9f9583dfcdf8c750587f62d5caf5e4e0462acfa50 x264-svn-20070923.tar.bz2 322704
diff --git a/media-libs/x264-svn/files/x264-svn-20070923-nostrip.patch b/media-libs/x264-svn/files/x264-svn-20070923-nostrip.patch
new file mode 100644
index 000000000000..b4e2689a18e6
--- /dev/null
+++ b/media-libs/x264-svn/files/x264-svn-20070923-nostrip.patch
@@ -0,0 +1,16 @@
+Index: x264-svn/configure
+===================================================================
+--- x264-svn.orig/configure
++++ x264-svn/configure
+@@ -374,11 +374,6 @@ if [ "$pic" = "yes" ] ; then
+     ASFLAGS="$ASFLAGS -D__PIC__"
+ fi
+ 
+-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
+-    CFLAGS="$CFLAGS -s -fomit-frame-pointer"
+-    LDFLAGS="$LDFLAGS -s"
+-fi
+-
+ if [ "$debug" = "yes" ]; then
+     CFLAGS="-O1 -g $CFLAGS"
+ else
diff --git a/media-libs/x264-svn/files/x264-svn-20070923-onlylib.patch b/media-libs/x264-svn/files/x264-svn-20070923-onlylib.patch
new file mode 100644
index 000000000000..d429ac0952f8
--- /dev/null
+++ b/media-libs/x264-svn/files/x264-svn-20070923-onlylib.patch
@@ -0,0 +1,28 @@
+Index: x264-svn/Makefile
+===================================================================
+--- x264-svn.orig/Makefile
++++ x264-svn/Makefile
+@@ -66,7 +66,7 @@ DEP  = depend
+ .PHONY: all default fprofiled clean distclean install install-gtk uninstall dox test testclean
+ all: default
+ 
+-default: $(DEP) x264$(EXE)
++default: $(DEP) 
+ 
+ libx264.a: .depend $(OBJS) $(OBJASM)
+ 	ar rc libx264.a $(OBJS) $(OBJASM)
+@@ -142,13 +142,12 @@ distclean: clean
+ 	rm -rf test/
+ 	$(MAKE) -C gtk distclean
+ 
+-install: x264 $(SONAME)
++install: libx264.a $(SONAME)
+ 	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
+ 	install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
+ 	install -m 644 x264.h $(DESTDIR)$(includedir)
+ 	install -m 644 libx264.a $(DESTDIR)$(libdir)
+ 	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
+-	install x264 $(DESTDIR)$(bindir)
+ 	ranlib $(DESTDIR)$(libdir)/libx264.a
+ 	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
+ 	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
diff --git a/media-libs/x264-svn/x264-svn-20070923.ebuild b/media-libs/x264-svn/x264-svn-20070923.ebuild
new file mode 100644
index 000000000000..76cb908b5726
--- /dev/null
+++ b/media-libs/x264-svn/x264-svn-20070923.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264-svn/x264-svn-20070923.ebuild,v 1.1 2007/09/23 18:10:45 aballier Exp $
+
+inherit multilib eutils toolchain-funcs
+
+IUSE="debug threads"
+
+DESCRIPTION="A free library for encoding X264/AVC streams."
+HOMEPAGE="http://developers.videolan.org/x264.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	amd64? ( >=dev-lang/yasm-0.6.0 )
+	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm ) )
+	x86-fbsd? ( dev-lang/nasm )"
+
+# Block older than 0.6.2 versions of yasm
+# It generates incorect pic code and will cause segfaults
+# See http://www.tortall.net/projects/yasm/ticket/114
+DEPEND="${DEPEND}
+	x86? ( !<dev-lang/yasm-0.6.2 )"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
+	epatch "${FILESDIR}/${P}-onlylib.patch"
+}
+
+src_compile() {
+	./configure --prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--enable-pic --enable-shared \
+		"--extra-cflags=${CFLAGS}" \
+		"--extra-ldflags=${LDFLAGS}" \
+		"--extra-asflags=${ASFLAGS}" \
+		$(use_enable debug) \
+		$(use_enable threads pthread) \
+		--disable-mp4-output \
+		|| die "configure failed"
+	emake CC="$(tc-getCC)" || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS
+}
+
+pkg_postinst() {
+	elog "Please note that this package now only installs"
+	elog "${PN} libraries. In order to have the encoder,"
+	elog "please emerge media-video/x264-svn-encoder"
+}