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

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

9 files changed, 288 insertions, 0 deletions

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
new file mode 100644
index 000000000000..625faf21b34b
--- /dev/null
+++ b/media-libs/x264/ChangeLog
@@ -0,0 +1,15 @@
+# ChangeLog for media-libs/x264
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.1 2008/04/07 21:43:23 yngwin Exp $
+
+*x264-0.0.20080406 (07 Apr 2008)
+*x264-0.0.20080301 (07 Apr 2008)
+*x264-0.0.20070924 (07 Apr 2008)
+
+  07 Apr 2008; Ben de Groot <yngwin@gentoo.org> +files/x264-nostrip.patch,
+  +files/x264-onlylib.patch, +files/x264-onlylib-20080406.patch,
+  +metadata.xml, +x264-0.0.20070924.ebuild, +x264-0.0.20080301.ebuild,
+  +x264-0.0.20080406.ebuild:
+  Initial commit, pkgmove from x264-svn. Version bump 0.0.20080406 using
+  upstream's nightly git snapshot tarball.
+
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
new file mode 100644
index 000000000000..4229b1464943
--- /dev/null
+++ b/media-libs/x264/Manifest
@@ -0,0 +1,11 @@
+AUX x264-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
+AUX x264-onlylib-20080406.patch 937 RMD160 4160694018d2ba426be7e4f84fccec877f031ead SHA1 f38122bfebdfe3a526a62982f97b6e24e8fd7e91 SHA256 08c6e6f2454f995b4ed4e555d7d9cf5c1d7af334db3761f6c0a7386411837ba4
+AUX x264-onlylib.patch 1021 RMD160 daed97f749a1d6a1a9cf58135dffb55002ead0f5 SHA1 5675c3502ac81b0efb42bbaffd2c7af7583d3298 SHA256 42a96152f790654585a79a849a757394f3fb48caee74c3a8ca4d8ba076c5250a
+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-0.0.20070924.ebuild 1767 RMD160 06df06170761dfda9265d49fcd8aa1a29152ae9c SHA1 94a8fd92ae11fe7c95c6e8f6865c55b0a65eb6de SHA256 988463d79cbf383681cca0cba6a6a832a9b379bcafd9568a7d2137e59256c5fe
+EBUILD x264-0.0.20080301.ebuild 1773 RMD160 e555cc8553d0d995413e786d26ddfbce8a409097 SHA1 2775639279c73824e0caeed7a28263d3d08fd20d SHA256 47ebc7e1c42506cc199d0772a7d4cc97843ce3310d6a114736f2a83cddb0d16c
+EBUILD x264-0.0.20080406.ebuild 1833 RMD160 f4f496e83d96abc64ab9d98051deeae24492a9b2 SHA1 2c1b96b689faa8943c21e1ee545d8de0c19d09f6 SHA256 b939c2ed39bcadb8ab9ae3ea48b046bdaa8f935848083d773324539300ab6492
+MISC ChangeLog 660 RMD160 7de501b56c3ab070b220baba2ce364ebcc7211a4 SHA1 9a7c8d453fc67c186bf1c043def2b01498d6a1aa SHA256 8f8e8f115600d0e00726bcd24eb8ada29e57a2867cfe0fe88a543134bad90ff6
+MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
diff --git a/media-libs/x264/files/x264-nostrip.patch b/media-libs/x264/files/x264-nostrip.patch
new file mode 100644
index 000000000000..b4e2689a18e6
--- /dev/null
+++ b/media-libs/x264/files/x264-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/files/x264-onlylib-20080406.patch b/media-libs/x264/files/x264-onlylib-20080406.patch
new file mode 100644
index 000000000000..3585ee675b70
--- /dev/null
+++ b/media-libs/x264/files/x264-onlylib-20080406.patch
@@ -0,0 +1,26 @@
+--- x264.orig/Makefile	2008-04-07 21:55:13.000000000 +0200
++++ x264-snapshot-20080406-2245/Makefile	2008-04-07 21:57:25.000000000 +0200
+@@ -69,7 +69,7 @@
+ 
+ .PHONY: all default fprofiled clean distclean install install-gtk uninstall dox test testclean
+ 
+-default: $(DEP) x264$(EXE)
++default: $(DEP)
+ 
+ libx264.a: .depend $(OBJS) $(OBJASM)
+ 	ar rc libx264.a $(OBJS) $(OBJASM)
+@@ -148,13 +148,12 @@
+ 	rm -rf test/
+ 	$(MAKE) -C gtk distclean
+ 
+-install: x264$(EXE) $(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$(EXE) $(DESTDIR)$(bindir)
+ 	ranlib $(DESTDIR)$(libdir)/libx264.a
+ ifeq ($(SYS),MINGW)
+ 	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
diff --git a/media-libs/x264/files/x264-onlylib.patch b/media-libs/x264/files/x264-onlylib.patch
new file mode 100644
index 000000000000..d429ac0952f8
--- /dev/null
+++ b/media-libs/x264/files/x264-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/metadata.xml b/media-libs/x264/metadata.xml
new file mode 100644
index 000000000000..92e4dbc04f50
--- /dev/null
+++ b/media-libs/x264/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-libs/x264/x264-0.0.20070924.ebuild b/media-libs/x264/x264-0.0.20070924.ebuild
new file mode 100644
index 000000000000..de9b5d50ca8a
--- /dev/null
+++ b/media-libs/x264/x264-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-libs/x264/x264-0.0.20070924.ebuild,v 1.1 2008/04/07 21:43:23 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 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="debug threads"
+
+RDEPEND=""
+DEPEND="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}-svn"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-nostrip.patch"
+	epatch "${FILESDIR}/${PN}-onlylib.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}" \
+		$(use_enable threads pthread) \
+		${myconf} \
+		--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"
+}
diff --git a/media-libs/x264/x264-0.0.20080301.ebuild b/media-libs/x264/x264-0.0.20080301.ebuild
new file mode 100644
index 000000000000..3099cd288a4f
--- /dev/null
+++ b/media-libs/x264/x264-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-libs/x264/x264-0.0.20080301.ebuild,v 1.1 2008/04/07 21:43:23 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug threads"
+
+RDEPEND=""
+DEPEND="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}-svn"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-nostrip.patch"
+	epatch "${FILESDIR}/${PN}-onlylib.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}" \
+		$(use_enable threads pthread) \
+		${myconf} \
+		--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"
+}
diff --git a/media-libs/x264/x264-0.0.20080406.ebuild b/media-libs/x264/x264-0.0.20080406.ebuild
new file mode 100644
index 000000000000..9e2206be8ff6
--- /dev/null
+++ b/media-libs/x264/x264-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-libs/x264/x264-0.0.20080406.ebuild,v 1.1 2008/04/07 21:43:23 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug +threads"
+
+RDEPEND=""
+DEPEND="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}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-nostrip.patch"
+	epatch "${FILESDIR}/${PN}-onlylib-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}" \
+		$(use_enable threads pthread) \
+		${myconf} \
+		--disable-mp4-output \
+		|| die "configure failed"
+	emake CC="$(tc-getCC)" || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS doc/*.txt
+}
+
+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"
+}