new snapshot

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 106 insertions, 1 deletions

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index 1ab2a82fa4cb..e7100fbe3a63 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.29 2010/01/09 15:24:13 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.30 2010/01/19 11:39:50 aballier Exp $
+
+*x264-encoder-0.0.20100118 (19 Jan 2010)
+
+  19 Jan 2010; Alexis Ballier <aballier@gentoo.org>
+  +x264-encoder-0.0.20100118.ebuild,
+  +files/x264-encoder-nolib-20100118.patch:
+  new snapshot
 
   09 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   x264-encoder-0.0.20091021.ebuild:
diff --git a/media-video/x264-encoder/files/x264-encoder-nolib-20100118.patch b/media-video/x264-encoder/files/x264-encoder-nolib-20100118.patch
new file mode 100644
index 000000000000..1268d05be22c
--- /dev/null
+++ b/media-video/x264-encoder/files/x264-encoder-nolib-20100118.patch
@@ -0,0 +1,39 @@
+Index: x264-snapshot-20100118-2245/Makefile
+===================================================================
+--- x264-snapshot-20100118-2245.orig/Makefile
++++ x264-snapshot-20100118-2245/Makefile
+@@ -123,8 +123,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
+ $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
+ 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
+ 
+-x264$(EXE): $(OBJCLI) libx264.a
+-	$(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI)
++x264$(EXE): $(OBJCLI)
++	$(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI) `pkg-config --libs x264`
+ 
+ checkasm: tools/checkasm.o libx264.a
+ 	$(CC) -o $@ $+ $(LDFLAGS)
+@@ -189,21 +189,9 @@ distclean: clean
+ 	rm -f config.mak config.h x264.pc
+ 	rm -rf test/
+ 
+-install: x264$(EXE) $(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$(EXE)
++	install -d $(DESTDIR)$(bindir)
+ 	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
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20100118.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20100118.ebuild
new file mode 100644
index 000000000000..ad3d8abde403
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20100118.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 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.20100118.ebuild,v 1.1 2010/01/19 11:39:50 aballier Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs versionator
+
+MY_P=x264-snapshot-$(get_version_component_range 3)-2245
+
+DESCRIPTION="A free commandline encoder for 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug ffmpeg +mp4 +threads"
+
+RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
+	~media-libs/x264-${PV}
+	ffmpeg? ( media-video/ffmpeg )"
+DEPEND="${RDEPEND}
+	amd64? ( >=dev-lang/yasm-0.6.2 )
+	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm )
+		!<dev-lang/yasm-0.6.2 )
+	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-nostrip.patch \
+		"${FILESDIR}"/${PN}-nolib-20100118.patch
+}
+
+src_configure() {
+	tc-export CC
+
+	local myconf=""
+	use debug && myconf="${myconf} --enable-debug"
+
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--disable-avs-input \
+		$(use_enable ffmpeg lavf-input) \
+		$(use_enable mp4 mp4-output) \
+		$(use_enable threads pthread) \
+		--extra-asflags="${ASFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--host="${CHOST}" \
+		${myconf} \
+		|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}