New snapshot

Package-Manager: portage-2.1.2.2

6 files changed, 176 insertions, 9 deletions

diff --git a/media-video/x264-svn-encoder/ChangeLog b/media-video/x264-svn-encoder/ChangeLog
index 11897c41c77c..d1e16d5d1cd4 100644
--- a/media-video/x264-svn-encoder/ChangeLog
+++ b/media-video/x264-svn-encoder/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/x264-svn-encoder
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-svn-encoder/ChangeLog,v 1.6 2007/01/06 15:03:14 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-svn-encoder/ChangeLog,v 1.7 2007/03/25 19:40:48 aballier Exp $
+
+*x264-svn-encoder-20070325 (25 Mar 2007)
+
+  25 Mar 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/x264-svn-encoder-20070325-nolib.patch,
+  +files/x264-svn-encoder-20070325-nostrip.patch,
+  +x264-svn-encoder-20070325.ebuild:
+  New snapshot
 
   06 Jan 2007; Michael Cummings <mcummings@gentoo.org>
   x264-svn-encoder-20061014.ebuild:
diff --git a/media-video/x264-svn-encoder/Manifest b/media-video/x264-svn-encoder/Manifest
index bb4b4af85bac..464c862ef009 100644
--- a/media-video/x264-svn-encoder/Manifest
+++ b/media-video/x264-svn-encoder/Manifest
@@ -9,15 +9,28 @@ AUX x264-svn-encoder-20061014-nostrip.patch 382 RMD160 6fa83e20d77c9cc3e14d1706e
 MD5 c60cd3f4a2be672763caff6203c54388 files/x264-svn-encoder-20061014-nostrip.patch 382
 RMD160 6fa83e20d77c9cc3e14d1706e3dd6b27e9dc4442 files/x264-svn-encoder-20061014-nostrip.patch 382
 SHA256 dad0c80f08c260d6896c6b0a61351e5f3c827e43dcaf26a62a3a335843716687 files/x264-svn-encoder-20061014-nostrip.patch 382
+AUX x264-svn-encoder-20070325-nolib.patch 2382 RMD160 0a2c7d9c5dcd0e03aef048a7752f6cdf5e1e2d11 SHA1 f2bae8f1a8bbb9d19152e69d81d8bafce03e5f0e SHA256 4ea2cde455663ddec69a4bbc63a00331ed60e92b58b0596e2329ae6f64b3e8aa
+MD5 95859dfc9b9cc4e24b8525465f0dd18f files/x264-svn-encoder-20070325-nolib.patch 2382
+RMD160 0a2c7d9c5dcd0e03aef048a7752f6cdf5e1e2d11 files/x264-svn-encoder-20070325-nolib.patch 2382
+SHA256 4ea2cde455663ddec69a4bbc63a00331ed60e92b58b0596e2329ae6f64b3e8aa files/x264-svn-encoder-20070325-nolib.patch 2382
+AUX x264-svn-encoder-20070325-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
+MD5 287a591572985d408a30f928f7b65f2a files/x264-svn-encoder-20070325-nostrip.patch 433
+RMD160 81c3893b1a02839da38f34484c794996855fab5e files/x264-svn-encoder-20070325-nostrip.patch 433
+SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa files/x264-svn-encoder-20070325-nostrip.patch 433
 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
 EBUILD x264-svn-encoder-20061014.ebuild 1472 RMD160 ecd31d1a086087d317f41139e807efa61e3a4708 SHA1 54f1dded73219d6891b2f7921281db54e8a68a34 SHA256 16dc4d1cb5f3457a0c8ef1ee80be08ea86b02819295f55539a4f6cbcfcbad089
 MD5 e3d80d6cbe619ad7ca252aebb1d3284b x264-svn-encoder-20061014.ebuild 1472
 RMD160 ecd31d1a086087d317f41139e807efa61e3a4708 x264-svn-encoder-20061014.ebuild 1472
 SHA256 16dc4d1cb5f3457a0c8ef1ee80be08ea86b02819295f55539a4f6cbcfcbad089 x264-svn-encoder-20061014.ebuild 1472
-MISC ChangeLog 1095 RMD160 089768c9f6a49942194949f3a9436d5c643799d2 SHA1 6ce2b89445e42ba856f4328b7f55e03b0ded71f4 SHA256 eb0e173f1e6ee00f12a469c47d0ad09e0ec1c65a2be7ff53ad2eeabc540fff6c
-MD5 978b529b3f6af223f70c18d2bf63553b ChangeLog 1095
-RMD160 089768c9f6a49942194949f3a9436d5c643799d2 ChangeLog 1095
-SHA256 eb0e173f1e6ee00f12a469c47d0ad09e0ec1c65a2be7ff53ad2eeabc540fff6c ChangeLog 1095
+EBUILD x264-svn-encoder-20070325.ebuild 1445 RMD160 235ff227b45e897bc9e8cf693d618cb6384a41f0 SHA1 6f19844f3c94b264bec9a8840a980cccde73e421 SHA256 e4b8cb6cc53317c98301f12ee432815a266363d3b732be844afb116a065e9e51
+MD5 ad41277e27fbde706847e64f94fcda99 x264-svn-encoder-20070325.ebuild 1445
+RMD160 235ff227b45e897bc9e8cf693d618cb6384a41f0 x264-svn-encoder-20070325.ebuild 1445
+SHA256 e4b8cb6cc53317c98301f12ee432815a266363d3b732be844afb116a065e9e51 x264-svn-encoder-20070325.ebuild 1445
+MISC ChangeLog 1339 RMD160 a8ea0bb79518bb38c1a5955250e3f4f379e52f0d SHA1 c75f31c899a670c9c0f2a3ca82d9def6fd2ceda4 SHA256 54673a39f7ad9f9dbbe524f2cd622587f2087bac0f608424b0ae3cfba6e77763
+MD5 f3a70e045f9f4f27229926b3cf31943b ChangeLog 1339
+RMD160 a8ea0bb79518bb38c1a5955250e3f4f379e52f0d ChangeLog 1339
+SHA256 54673a39f7ad9f9dbbe524f2cd622587f2087bac0f608424b0ae3cfba6e77763 ChangeLog 1339
 MISC metadata.xml 472 RMD160 dba36bb23c9e806f44b0b72b4de9a0eb442c2cef SHA1 ec10e57e2f202a4fe5b05700dfffff5cc50578c0 SHA256 997d208d55bba8def7d5409568a9df5f8b26bc80a32cfc9ffccc97646f0a7129
 MD5 74a760bb9462e29f2304b46694adb01d metadata.xml 472
 RMD160 dba36bb23c9e806f44b0b72b4de9a0eb442c2cef metadata.xml 472
@@ -25,10 +38,13 @@ SHA256 997d208d55bba8def7d5409568a9df5f8b26bc80a32cfc9ffccc97646f0a7129 metadata
 MD5 6d5365124573273cf12da2f1661947c4 files/digest-x264-svn-encoder-20061014 256
 RMD160 77d4aebcff05a92e9ea863b624efba907579947d files/digest-x264-svn-encoder-20061014 256
 SHA256 4eadce87a1d26efb89411dbe5e48facd55b86041f42e243e12d9b83312d04a35 files/digest-x264-svn-encoder-20061014 256
+MD5 b62afa9b61a3b75309e3449e1e66e7f4 files/digest-x264-svn-encoder-20070325 256
+RMD160 5ebd356c5f0a770fbbe59125ae72fec7816e3a94 files/digest-x264-svn-encoder-20070325 256
+SHA256 437d0cf75bd5a0b8447e676f73cd94bc4ffa22fbc0a2abe77cdbf9278f959241 files/digest-x264-svn-encoder-20070325 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFn7o4tG5z4I8BtQoRAi8RAJoD2hYCjdo8dj1MJ5ZiJLJlUZDJQgCdHZt/
-fVH4YPGM2xyx7KZx+0cux28=
-=ZXka
+iD8DBQFGBtBDvFcC4BYPU0oRAqseAJwJFSeC3BwUF/Av+EPhUpA4wRub/wCdG2ko
+nVhboMrdqRGn+Q06tVU5X10=
+=bjdf
 -----END PGP SIGNATURE-----
diff --git a/media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20070325 b/media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20070325
new file mode 100644
index 000000000000..b8d69201ad16
--- /dev/null
+++ b/media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20070325
@@ -0,0 +1,3 @@
+MD5 42f074237b0fbcd107c28360f1c6f1f4 x264-svn-20070325.tar.bz2 492487
+RMD160 38d9c2aa39567de39a950c45cd032ff3599b0d5b x264-svn-20070325.tar.bz2 492487
+SHA256 b2398f83b5949032e9a42bb8b2f70d00a18bdbff2f6b0bb6897d65384c42ca28 x264-svn-20070325.tar.bz2 492487
diff --git a/media-video/x264-svn-encoder/files/x264-svn-encoder-20070325-nolib.patch b/media-video/x264-svn-encoder/files/x264-svn-encoder-20070325-nolib.patch
new file mode 100644
index 000000000000..20ae0cc2b40a
--- /dev/null
+++ b/media-video/x264-svn-encoder/files/x264-svn-encoder-20070325-nolib.patch
@@ -0,0 +1,69 @@
+Index: x264-svn/Makefile
+===================================================================
+--- x264-svn.orig/Makefile
++++ x264-svn/Makefile
+@@ -75,10 +75,10 @@ libx264.a: .depend $(OBJS) $(OBJASM)
+ $(SONAME): .depend $(OBJS) $(OBJASM)
+ 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
+ 
+-x264$(EXE): $(OBJCLI) libx264.a 
+-	$(CC) -o $@ $+ $(LDFLAGS)
++x264$(EXE): $(OBJCLI) 
++	$(CC) -o $@ $+ $(LDFLAGS) `pkg-config --libs x264`
+ 
+-libx264gtk.a: muxers.o libx264.a
++libx264gtk.a: muxers.o
+ 	$(MAKE) -C gtk
+ 
+ checkasm: tools/checkasm.o libx264.a
+@@ -142,16 +142,10 @@ distclean: clean
+ 	rm -rf test/
+ 	$(MAKE) -C gtk distclean
+ 
+-install: x264 $(SONAME)
++install: x264 
+ 	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))
+ 
+ install-gtk: libx264gtk.a
+ 	$(MAKE) -C gtk install
+Index: x264-svn/configure
+===================================================================
+--- x264-svn.orig/configure
++++ x264-svn/configure
+@@ -423,7 +423,6 @@ cp config.mak gtk/config.mak
+ if [ "$shared" = "yes" ]; then
+     API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
+     echo "SONAME=libx264.so.$API" >> config.mak
+-    echo 'default: $(SONAME)' >> config.mak
+     if [ "$gtk" = "yes" ]; then
+         echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak
+     fi
+Index: x264-svn/gtk/Makefile
+===================================================================
+--- x264-svn.orig/gtk/Makefile
++++ x264-svn/gtk/Makefile
+@@ -46,14 +46,14 @@ SOURCES_ALL = $(OBJECTS_ALL:%.o=%.c)
+ 
+ X264GTK_PC = x264gtk.pc
+ 
+-EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a
++EXTERNAL_DEPS= ../muxers.o ../matroska.o 
+ 
+ 
+ all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC)
+ 
+ # Already provides iconv/intl
+ CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\"
+-LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a
++LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264`
+ 
+ 
+ # gettext rules
diff --git a/media-video/x264-svn-encoder/files/x264-svn-encoder-20070325-nostrip.patch b/media-video/x264-svn-encoder/files/x264-svn-encoder-20070325-nostrip.patch
new file mode 100644
index 000000000000..b4e2689a18e6
--- /dev/null
+++ b/media-video/x264-svn-encoder/files/x264-svn-encoder-20070325-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-video/x264-svn-encoder/x264-svn-encoder-20070325.ebuild b/media-video/x264-svn-encoder/x264-svn-encoder-20070325.ebuild
new file mode 100644
index 000000000000..6b6882eec4c4
--- /dev/null
+++ b/media-video/x264-svn-encoder/x264-svn-encoder-20070325.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-svn-encoder/x264-svn-encoder-20070325.ebuild,v 1.1 2007/03/25 19:40:48 aballier Exp $
+
+inherit multilib eutils toolchain-funcs
+
+IUSE="debug mp4 gtk threads"
+
+X264_SVN_P=${P/-encoder/}
+
+DESCRIPTION="A free library for encoding X264/AVC streams."
+HOMEPAGE="http://developers.videolan.org/x264.html"
+SRC_URI="mirror://gentoo/${X264_SVN_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
+	gtk? ( >=x11-libs/gtk+-2.6.10 >=dev-libs/glib-2.10.3 )
+	~media-libs/${X264_SVN_P}"
+
+DEPEND="${RDEPEND}
+	amd64? ( >=dev-lang/yasm-0.6.0 )
+	x86? ( dev-lang/nasm )
+	x86-fbsd? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN/-encoder/}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
+	epatch "${FILESDIR}/${P}-nolib.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) \
+		$(use_enable mp4 mp4-output) \
+		$(use_enable gtk) \
+		|| die "configure failed"
+	emake CC="$(tc-getCC)" || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS
+}