From 8afea12c5b44f24337870831bff8a5fc9f58862b Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 7 Dec 2006 12:55:05 +0000 Subject: [PATCH] x264 encoder that comes with x264-svn, splitted ebuild for the encoder part Package-Manager: portage-2.1.2_rc2-r5 --- media-video/ffmpeg/Manifest | 16 ++--- media-video/x264-svn-encoder/ChangeLog | 12 ++++ media-video/x264-svn-encoder/Manifest | 34 ++++++++++ .../files/digest-x264-svn-encoder-20061014 | 3 + .../x264-svn-encoder-20061014-nolib.patch | 63 +++++++++++++++++++ .../x264-svn-encoder-20061014-nostrip.patch | 14 +++++ media-video/x264-svn-encoder/metadata.xml | 14 +++++ .../x264-svn-encoder-20061014.ebuild | 58 +++++++++++++++++ 8 files changed, 206 insertions(+), 8 deletions(-) create mode 100644 media-video/x264-svn-encoder/ChangeLog create mode 100644 media-video/x264-svn-encoder/Manifest create mode 100644 media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20061014 create mode 100644 media-video/x264-svn-encoder/files/x264-svn-encoder-20061014-nolib.patch create mode 100644 media-video/x264-svn-encoder/files/x264-svn-encoder-20061014-nostrip.patch create mode 100644 media-video/x264-svn-encoder/metadata.xml create mode 100644 media-video/x264-svn-encoder/x264-svn-encoder-20061014.ebuild diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index eea04d576dad..c51b4bf283b2 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -75,14 +75,14 @@ EBUILD ffmpeg-0.4.9_p20060816.ebuild 5535 RMD160 53617589539a993da866f151c2d46fd MD5 3a46efe772823ca62a14382e52512a1c ffmpeg-0.4.9_p20060816.ebuild 5535 RMD160 53617589539a993da866f151c2d46fd7c35df62e ffmpeg-0.4.9_p20060816.ebuild 5535 SHA256 35e9f61ee732c6cc6a5c62b2e0b2df37f4d22e3b24527e0f1d4f5167604c21d4 ffmpeg-0.4.9_p20060816.ebuild 5535 -EBUILD ffmpeg-0.4.9_p20061016.ebuild 5536 RMD160 9591cbc027e1183082c0ed04e715c2bfa9fc1aa6 SHA1 a3b0548a2fc2e6d41e84b43af6cb941d148681c9 SHA256 5e3891aa12af1c79b0b5b549eb67637594d8072323d4ac6b19ff419028379519 -MD5 8463e960ff842658924885dd267e9038 ffmpeg-0.4.9_p20061016.ebuild 5536 -RMD160 9591cbc027e1183082c0ed04e715c2bfa9fc1aa6 ffmpeg-0.4.9_p20061016.ebuild 5536 -SHA256 5e3891aa12af1c79b0b5b549eb67637594d8072323d4ac6b19ff419028379519 ffmpeg-0.4.9_p20061016.ebuild 5536 -MISC ChangeLog 24964 RMD160 4d05f98cf508492cb12fa18ef9a5e637f9796ac7 SHA1 b02f2e5cec79e34fb082bd4ca0ee3a80681c1a5b SHA256 c46cd6cc58e7c14758e71176324d87aa8a1cf5a68c94cae535f5ceff209cfa45 -MD5 1ab07deac27f5a13ed866ebc32f9ff38 ChangeLog 24964 -RMD160 4d05f98cf508492cb12fa18ef9a5e637f9796ac7 ChangeLog 24964 -SHA256 c46cd6cc58e7c14758e71176324d87aa8a1cf5a68c94cae535f5ceff209cfa45 ChangeLog 24964 +EBUILD ffmpeg-0.4.9_p20061016.ebuild 5596 RMD160 a8a534529624a1f99374712c287213bc9de393ef SHA1 64c1fd39e795ce4e6613547af74697e54d30e9f8 SHA256 2c7b326f51901bc87debcac4ffd5edc838513c66595964f9d4f7ff9aff763e73 +MD5 24f03ed2557722b36d66384179bafdca ffmpeg-0.4.9_p20061016.ebuild 5596 +RMD160 a8a534529624a1f99374712c287213bc9de393ef ffmpeg-0.4.9_p20061016.ebuild 5596 +SHA256 2c7b326f51901bc87debcac4ffd5edc838513c66595964f9d4f7ff9aff763e73 ffmpeg-0.4.9_p20061016.ebuild 5596 +MISC ChangeLog 25095 RMD160 61332b3ef254f564b730f75bad1ce9015ae5972d SHA1 ca468513ff7967f8f7b22693ffc84bb148fef7b2 SHA256 167033fa80cc8c59de550c3bb08fce7e02e9394ef8290dda48cabc4194f9e556 +MD5 fed7feb0a5897e8f6a14459f69126d06 ChangeLog 25095 +RMD160 61332b3ef254f564b730f75bad1ce9015ae5972d ChangeLog 25095 +SHA256 167033fa80cc8c59de550c3bb08fce7e02e9394ef8290dda48cabc4194f9e556 ChangeLog 25095 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223 diff --git a/media-video/x264-svn-encoder/ChangeLog b/media-video/x264-svn-encoder/ChangeLog new file mode 100644 index 000000000000..6d96f7afd3b9 --- /dev/null +++ b/media-video/x264-svn-encoder/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for media-video/x264-svn-encoder +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-svn-encoder/ChangeLog,v 1.1 2006/12/07 12:55:05 aballier Exp $ + +*x264-svn-encoder-20061014 (07 Dec 2006) + + 07 Dec 2006; Alexis Ballier + +files/x264-svn-encoder-20061014-nolib.patch, + +files/x264-svn-encoder-20061014-nostrip.patch, +metadata.xml, + +x264-svn-encoder-20061014.ebuild: + Initial import + diff --git a/media-video/x264-svn-encoder/Manifest b/media-video/x264-svn-encoder/Manifest new file mode 100644 index 000000000000..f6dea6a7ada7 --- /dev/null +++ b/media-video/x264-svn-encoder/Manifest @@ -0,0 +1,34 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX x264-svn-encoder-20061014-nolib.patch 2212 RMD160 c36a4ed96d1577778ba4adb9fad04823ab7385cd SHA1 7cd4c5c91ec726fce6367240d068556abce8a202 SHA256 f7ac4e0a109e3a2cf1e1185f3695c2bf0d648cf3993a036eb6a0edf7edca01ad +MD5 167583a3de38a1462566e3d5f346c0ed files/x264-svn-encoder-20061014-nolib.patch 2212 +RMD160 c36a4ed96d1577778ba4adb9fad04823ab7385cd files/x264-svn-encoder-20061014-nolib.patch 2212 +SHA256 f7ac4e0a109e3a2cf1e1185f3695c2bf0d648cf3993a036eb6a0edf7edca01ad files/x264-svn-encoder-20061014-nolib.patch 2212 +AUX x264-svn-encoder-20061014-nostrip.patch 382 RMD160 6fa83e20d77c9cc3e14d1706e3dd6b27e9dc4442 SHA1 fd7c177fde56fd66f8b89a59deb0f1a4dcd5daac SHA256 dad0c80f08c260d6896c6b0a61351e5f3c827e43dcaf26a62a3a335843716687 +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 +DIST x264-svn-20061014.tar.bz2 288203 RMD160 c6f7275a3691c18821d1562a3b7db8e3b01ac886 SHA1 32e68b019f0871eb85cb29084008e54175a49de0 SHA256 4a26b883d7f9c4f3cff56a3034e9f7617d2b1cd4f8d1846b886130fffdbf6bbc +EBUILD x264-svn-encoder-20061014.ebuild 1479 RMD160 b1e459ad879cf8fc849c51f41eaa5a251f8eb722 SHA1 dae1b765efb5c8f655c3df25d8d5960a7bffea72 SHA256 bd51f0f86aea368555fa2c59afe7ff4b2b1524a5f70bbbdffcc2dc2b52b07977 +MD5 c476105bf440fc43cc75a4c35c76a79a x264-svn-encoder-20061014.ebuild 1479 +RMD160 b1e459ad879cf8fc849c51f41eaa5a251f8eb722 x264-svn-encoder-20061014.ebuild 1479 +SHA256 bd51f0f86aea368555fa2c59afe7ff4b2b1524a5f70bbbdffcc2dc2b52b07977 x264-svn-encoder-20061014.ebuild 1479 +MISC ChangeLog 493 RMD160 6713a076f16cd04bb77d10276acaeb4801f1ce4e SHA1 db95560817d1cc35b42b9048cf81b41b7609eeee SHA256 719436b0bbd2358e9340d57079b6eca3ef62de327333691e7b97098e3d86f8a8 +MD5 ee9597724482d63e934639dd062f55ef ChangeLog 493 +RMD160 6713a076f16cd04bb77d10276acaeb4801f1ce4e ChangeLog 493 +SHA256 719436b0bbd2358e9340d57079b6eca3ef62de327333691e7b97098e3d86f8a8 ChangeLog 493 +MISC metadata.xml 472 RMD160 dba36bb23c9e806f44b0b72b4de9a0eb442c2cef SHA1 ec10e57e2f202a4fe5b05700dfffff5cc50578c0 SHA256 997d208d55bba8def7d5409568a9df5f8b26bc80a32cfc9ffccc97646f0a7129 +MD5 74a760bb9462e29f2304b46694adb01d metadata.xml 472 +RMD160 dba36bb23c9e806f44b0b72b4de9a0eb442c2cef metadata.xml 472 +SHA256 997d208d55bba8def7d5409568a9df5f8b26bc80a32cfc9ffccc97646f0a7129 metadata.xml 472 +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 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFFeA7OvFcC4BYPU0oRAgq7AJ9dNNdanMh34rkBDr8aoDoUGi1unwCePaBq +6zuYtp1oI4Beo3no7zT3Wpc= +=z0yr +-----END PGP SIGNATURE----- diff --git a/media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20061014 b/media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20061014 new file mode 100644 index 000000000000..603b1a1f94dd --- /dev/null +++ b/media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20061014 @@ -0,0 +1,3 @@ +MD5 0f8a75d1a0ffa3f0f2449a92247eb7e1 x264-svn-20061014.tar.bz2 288203 +RMD160 c6f7275a3691c18821d1562a3b7db8e3b01ac886 x264-svn-20061014.tar.bz2 288203 +SHA256 4a26b883d7f9c4f3cff56a3034e9f7617d2b1cd4f8d1846b886130fffdbf6bbc x264-svn-20061014.tar.bz2 288203 diff --git a/media-video/x264-svn-encoder/files/x264-svn-encoder-20061014-nolib.patch b/media-video/x264-svn-encoder/files/x264-svn-encoder-20061014-nolib.patch new file mode 100644 index 000000000000..9ffea98b9cd0 --- /dev/null +++ b/media-video/x264-svn-encoder/files/x264-svn-encoder-20061014-nolib.patch @@ -0,0 +1,63 @@ +--- x264-svn/Makefile.old 2006-12-06 22:09:18.000000000 +0100 ++++ x264-svn/Makefile 2006-12-06 22:10:56.000000000 +0100 +@@ -73,10 +73,10 @@ + $(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 +@@ -139,16 +139,10 @@ + rm -f config.mak config.h x264.pc + $(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 +--- x264-svn/gtk/Makefile.old 2006-12-06 22:15:06.000000000 +0100 ++++ x264-svn/gtk/Makefile 2006-12-06 22:15:29.000000000 +0100 +@@ -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 +--- x264-svn/configure.old 2006-12-07 09:09:30.000000000 +0100 ++++ x264-svn/configure 2006-12-07 09:09:37.000000000 +0100 +@@ -360,7 +360,6 @@ + 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 diff --git a/media-video/x264-svn-encoder/files/x264-svn-encoder-20061014-nostrip.patch b/media-video/x264-svn-encoder/files/x264-svn-encoder-20061014-nostrip.patch new file mode 100644 index 000000000000..868c302920ae --- /dev/null +++ b/media-video/x264-svn-encoder/files/x264-svn-encoder-20061014-nostrip.patch @@ -0,0 +1,14 @@ +--- x264-svn.orig/configure 2006-10-14 23:20:20.000000000 +0200 ++++ x264-svn/configure 2006-10-14 23:20:30.000000000 +0200 +@@ -313,11 +313,6 @@ + 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/metadata.xml b/media-video/x264-svn-encoder/metadata.xml new file mode 100644 index 000000000000..7fffea03d44e --- /dev/null +++ b/media-video/x264-svn-encoder/metadata.xml @@ -0,0 +1,14 @@ + + + +video + + media-video@gentoo.org + + + x264 encoder that comes with x264-svn. + The package is now splitted in two parts : media-libs/x264-svn and + media-video/x264-svn-encoder to avoid circular dependencies between + ffmpeg/gpac/x264-svn. + + diff --git a/media-video/x264-svn-encoder/x264-svn-encoder-20061014.ebuild b/media-video/x264-svn-encoder/x264-svn-encoder-20061014.ebuild new file mode 100644 index 000000000000..6822aef74d01 --- /dev/null +++ b/media-video/x264-svn-encoder/x264-svn-encoder-20061014.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2006 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-20061014.ebuild,v 1.1 2006/12/07 12:55:04 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="" + +DEPEND="${RDEPEND} + ~media-libs/${X264_SVN_P} + !<=media-libs/x264-svn-20061014 + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/nasm ) + x86-fbsd? ( dev-lang/nasm ) + mp4? ( >=media-video/gpac-0.4.1_pre20060122 ) + gtk? ( >=x11-libs/gtk+-2.6.10 >=dev-libs/glib-2.10.3 ) " + +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) \ + $myconf \ + || die "configure failed" + emake CC="$(tc-getCC)" || die "make failed" +} + +src_install() { + make DESTDIR="${D}" install || die + dodoc AUTHORS +} -- 2.26.2