Add a new snapshot

(Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64)

3 files changed, 119 insertions, 1 deletions

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index f52b973ccdc0..638643aaa677 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/x264-encoder
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.3 2008/08/22 11:32:14 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.4 2008/10/07 06:00:33 aballier Exp $
+
+*x264-encoder-0.0.20081006 (07 Oct 2008)
+
+  07 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/x264-encoder-nolib-20081006.patch,
+  +x264-encoder-0.0.20081006.ebuild:
+  Add a new snapshot
 
 *x264-encoder-0.0.20080819 (22 Aug 2008)
 
diff --git a/media-video/x264-encoder/files/x264-encoder-nolib-20081006.patch b/media-video/x264-encoder/files/x264-encoder-nolib-20081006.patch
new file mode 100644
index 000000000000..23f77818a971
--- /dev/null
+++ b/media-video/x264-encoder/files/x264-encoder-nolib-20081006.patch
@@ -0,0 +1,50 @@
+Index: x264-snapshot-20081004-2245/Makefile
+===================================================================
+--- x264-snapshot-20081004-2245.orig/Makefile
++++ x264-snapshot-20081004-2245/Makefile
+@@ -80,8 +80,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
+ $(SONAME): .depend $(OBJS) $(OBJASM)
+ 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
+ 
+-x264$(EXE): $(OBJCLI) libx264.a 
+-	$(CC) -o $@ $+ $(LDFLAGS)
++x264$(EXE): $(OBJCLI)
++	$(CC) -o $@ $+ $(LDFLAGS) `pkg-config --libs x264`
+ 
+ checkasm: tools/checkasm.o libx264.a
+ 	$(CC) -o $@ $+ $(LDFLAGS)
+@@ -144,21 +144,10 @@ distclean: clean
+ 	rm -f config.mak config.h x264.pc
+ 	rm -rf test/
+ 
+-install: x264$(EXE) $(SONAME)
++install: x264$(EXE)
+ 	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$(EXE) $(DESTDIR)$(bindir)
+-	ranlib $(DESTDIR)$(libdir)/libx264.a
+-ifeq ($(SYS),MINGW)
+-	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
+-else
+-	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
+-	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
+-endif
+-	$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a
+Index: x264-snapshot-20081004-2245/configure
+===================================================================
+--- x264-snapshot-20081004-2245.orig/configure
++++ x264-snapshot-20081004-2245/configure
+@@ -442,7 +442,6 @@ if [ "$shared" = "yes" ]; then
+         echo "SONAME=libx264.so.$API" >> config.mak
+         echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
+     fi
+-    echo 'default: $(SONAME)' >> config.mak
+ fi
+ 
+ ./version.sh
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20081006.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20081006.ebuild
new file mode 100644
index 000000000000..2b74e9c179bb
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20081006.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2008 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.20081006.ebuild,v 1.1 2008/10/07 06:00:33 aballier Exp $
+
+EAPI="1"
+inherit multilib eutils 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="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug +mp4 +threads"
+
+RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
+	~media-libs/x264-${PV}"
+
+DEPEND="${RDEPEND}
+	amd64? ( >=dev-lang/yasm-0.6.0 )
+	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm ) )
+	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )
+	dev-util/pkgconfig"
+
+# 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}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-nostrip.patch"
+	epatch "${FILESDIR}/${PN}-nolib-20081006.patch"
+}
+
+src_compile() {
+	local myconf=""
+	use debug && myconf="${myconf} --enable-debug"
+	./configure --prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--enable-pic --enable-shared \
+		"--extra-cflags=${CFLAGS}" \
+		"--extra-ldflags=${LDFLAGS}" \
+		"--extra-asflags=${ASFLAGS}" \
+		${myconf} \
+		$(use_enable threads pthread) \
+		$(use_enable mp4 mp4-output) \
+		|| die "configure failed"
+	emake CC="$(tc-getCC)" || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS doc/*.txt
+}