Pkgmove from x264-svn-encoder to x264-encoder, and adding fresh snapshot

Package-Manager: portage-2.1.5_rc2
RepoMan-Options: --force

9 files changed, 375 insertions, 0 deletions

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
new file mode 100644
index 000000000000..119ce885172e
--- /dev/null
+++ b/media-video/x264-encoder/ChangeLog
@@ -0,0 +1,16 @@
+# 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.1 2008/04/07 21:50:34 yngwin Exp $
+
+*x264-encoder-0.0.20080406 (07 Apr 2008)
+*x264-encoder-0.0.20080301 (07 Apr 2008)
+*x264-encoder-0.0.20070924 (07 Apr 2008)
+
+  07 Apr 2008; Ben de Groot <yngwin@gentoo.org>
+  +files/x264-encoder-nolib.patch, +files/x264-encoder-nostrip.patch,
+  +files/x264-encoder-nolib-20080406.patch, +metadata.xml,
+  +x264-encoder-0.0.20070924.ebuild, +x264-encoder-0.0.20080301.ebuild,
+  +x264-encoder-0.0.20080406.ebuild:
+  Initial commit, pkgmove from x264-svn-encoder. Version bump 0.0.20080406
+  using upstream's nightly git snapshot tarball.
+
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
new file mode 100644
index 000000000000..98b4e49cfb92
--- /dev/null
+++ b/media-video/x264-encoder/Manifest
@@ -0,0 +1,11 @@
+AUX x264-encoder-nolib-20080406.patch 2458 RMD160 da856c353a3f131f48cb51181deafcb5dcc29434 SHA1 e68ed08d13ea4aa603a10edf0859f06e401fa381 SHA256 83b7bf84a108b45748434ac557595e5d411488b799e72755f52d1d50c48f343e
+AUX x264-encoder-nolib.patch 2382 RMD160 0a2c7d9c5dcd0e03aef048a7752f6cdf5e1e2d11 SHA1 f2bae8f1a8bbb9d19152e69d81d8bafce03e5f0e SHA256 4ea2cde455663ddec69a4bbc63a00331ed60e92b58b0596e2329ae6f64b3e8aa
+AUX x264-encoder-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
+DIST x264-snapshot-20080406-2245.tar.bz2 1920060 RMD160 35a6aff1cf4c3540a8391697976b8c314beca20d SHA1 fd67ac51e807e295ae678a069dee3132637e08bd SHA256 675fc90e16af3116ce835fdd9d12f10f69b8a6f17539f4dc225d222c9b613cb6
+DIST x264-svn-20070924.tar.bz2 323590 RMD160 f2f4460e594d9898edfb480ee7bc20a136d69b87 SHA1 4295457ecd61e2398ed34db76fb48ca19e35059b SHA256 2d5b119175a6876f509570b7f077ac65666b743d7c851a443f39ec39449940a4
+DIST x264-svn-20080301.tar.bz2 333496 RMD160 07887edb4a15dc9574de94416fabf16bc8c4350c SHA1 8ef6bf916f72c34bea70a0f7da3672361b9b2422 SHA256 df4e36a632b4f2aa499d924b60081c005c22848019fe7105947aed3be2fdb732
+EBUILD x264-encoder-0.0.20070924.ebuild 1790 RMD160 0ddabfe0e87815410a7bca52e04e57744d133c88 SHA1 3c5ef786bce4cde06516a641bc91a27ddafe09a7 SHA256 6d3529c450f2ec710bce811c62e942aaaf5d85dddeb180585c2a64f9e46d59eb
+EBUILD x264-encoder-0.0.20080301.ebuild 1795 RMD160 d53273a04e47b298b4800bbf2efa99858825fd59 SHA1 61217915ea3e3a2dedbab32f105289afdb1c199a SHA256 1a76cca1b528c29793cd93ee017820e3d520c3fa2fbc4780fdf8bd9870a30eba
+EBUILD x264-encoder-0.0.20080406.ebuild 1857 RMD160 a85ef6deabf3dec08c19de7c3c5cd692b39002a0 SHA1 4078d0a72d82286d58653a25f786d39aaa84b213 SHA256 b9f54de58bd7828d9c58a549f16a59d6b51dff5eb124a0ebb002b621a46ca86a
+MISC ChangeLog 756 RMD160 5cc67a4c437da2b143265408ed3ecd01d46f14c5 SHA1 f2c8a30fd2fba631ac5050a6d5a508321136b977 SHA256 1127fe1ef34c5e218d56319fb4be0b0dfab22471304340933b81f76ce8e43307
+MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
diff --git a/media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch b/media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch
new file mode 100644
index 000000000000..845e0743e50c
--- /dev/null
+++ b/media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch
@@ -0,0 +1,71 @@
+diff -rub x264.orig/configure x264/configure
+--- x264.orig/configure	2008-04-07 22:20:37.000000000 +0200
++++ x264/configure	2008-04-07 22:34:00.000000000 +0200
+@@ -465,7 +465,6 @@
+         echo "SONAME=libx264.so.$API" >> config.mak
+         echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
+     fi
+-    echo 'default: $(SONAME)' >> config.mak
+     if [ "$gtk" = "yes" ]; then
+         echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak
+     fi
+diff -rub x264.orig/gtk/Makefile x264/gtk/Makefile
+--- x264.orig/gtk/Makefile	2008-04-07 22:22:20.000000000 +0200
++++ x264/gtk/Makefile	2008-04-07 22:34:08.000000000 +0200
+@@ -46,14 +46,14 @@
+ 
+ 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 -rub x264.orig/Makefile x264/Makefile
+--- x264.orig/Makefile	2008-04-07 22:20:23.000000000 +0200
++++ x264/Makefile	2008-04-07 22:33:49.000000000 +0200
+@@ -78,10 +78,10 @@
+ $(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`
+ 
+-libx264gtk.a: muxers.o libx264.a
++libx264gtk.a: muxers.o
+ 	$(MAKE) -C gtk
+ 
+ checkasm: tools/checkasm.o libx264.a
+@@ -148,21 +148,10 @@
+ 	rm -rf test/
+ 	$(MAKE) -C gtk distclean
+ 
+-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.so)
+-	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
+-endif
+-	$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
+ 
+ install-gtk: libx264gtk.a
+ 	$(MAKE) -C gtk install
diff --git a/media-video/x264-encoder/files/x264-encoder-nolib.patch b/media-video/x264-encoder/files/x264-encoder-nolib.patch
new file mode 100644
index 000000000000..20ae0cc2b40a
--- /dev/null
+++ b/media-video/x264-encoder/files/x264-encoder-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-encoder/files/x264-encoder-nostrip.patch b/media-video/x264-encoder/files/x264-encoder-nostrip.patch
new file mode 100644
index 000000000000..b4e2689a18e6
--- /dev/null
+++ b/media-video/x264-encoder/files/x264-encoder-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-encoder/metadata.xml b/media-video/x264-encoder/metadata.xml
new file mode 100644
index 000000000000..92e4dbc04f50
--- /dev/null
+++ b/media-video/x264-encoder/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>video</herd>
+</pkgmetadata>
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20070924.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20070924.ebuild
new file mode 100644
index 000000000000..9eb96a30b162
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20070924.ebuild
@@ -0,0 +1,62 @@
+# 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.20070924.ebuild,v 1.1 2008/04/07 21:50:34 yngwin Exp $
+
+inherit multilib eutils toolchain-funcs versionator
+
+X264_SVN_P="x264-svn-$(get_version_component_range 3)"
+
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+SRC_URI="mirror://gentoo/${X264_SVN_P}.tar.bz2"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="debug mp4 gtk threads"
+
+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-${PV}"
+
+DEPEND="${RDEPEND}
+	amd64? ( >=dev-lang/yasm-0.6.0 )
+	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm ) )
+	x86-fbsd? ( dev-lang/nasm )
+	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}/x264-svn"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-nostrip.patch"
+	epatch "${FILESDIR}/${PN}-nolib.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) \
+		$(use_enable gtk) \
+		|| die "configure failed"
+	emake CC="$(tc-getCC)" || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS
+}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20080301.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20080301.ebuild
new file mode 100644
index 000000000000..c22ab7bbe4ca
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20080301.ebuild
@@ -0,0 +1,62 @@
+# 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.20080301.ebuild,v 1.1 2008/04/07 21:50:34 yngwin Exp $
+
+inherit multilib eutils toolchain-funcs versionator
+
+X264_SVN_P="x264-svn-$(get_version_component_range 3)"
+
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+SRC_URI="mirror://gentoo/${X264_SVN_P}.tar.bz2"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug mp4 gtk threads"
+
+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-${PV}"
+
+DEPEND="${RDEPEND}
+	amd64? ( >=dev-lang/yasm-0.6.0 )
+	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm ) )
+	x86-fbsd? ( dev-lang/nasm )
+	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}/x264-svn"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-nostrip.patch"
+	epatch "${FILESDIR}/${PN}-nolib.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) \
+		$(use_enable gtk) \
+		|| die "configure failed"
+	emake CC="$(tc-getCC)" || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS
+}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20080406.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20080406.ebuild
new file mode 100644
index 000000000000..ab35f10b7f39
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20080406.ebuild
@@ -0,0 +1,63 @@
+# 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.20080406.ebuild,v 1.1 2008/04/07 21:50:34 yngwin 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 gtk +mp4 +threads"
+
+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-${PV}"
+
+DEPEND="${RDEPEND}
+	amd64? ( >=dev-lang/yasm-0.6.0 )
+	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm ) )
+	x86-fbsd? ( dev-lang/nasm )
+	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-20080406.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) \
+		$(use_enable gtk) \
+		|| die "configure failed"
+	emake CC="$(tc-getCC)" || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS doc/*.txt
+}