diff options
author | Alexis Ballier <aballier@gentoo.org> | 2007-03-25 19:40:48 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2007-03-25 19:40:48 +0000 |
commit | 024f445c7abc0555a4d41fa4ad876c71e4d34e4c (patch) | |
tree | 046244699c094b741dc8f3d9d408542a7012a6e4 /media-video | |
parent | Stable on x86, security bug #170881. (diff) | |
download | gentoo-2-024f445c7abc0555a4d41fa4ad876c71e4d34e4c.tar.gz gentoo-2-024f445c7abc0555a4d41fa4ad876c71e4d34e4c.tar.bz2 gentoo-2-024f445c7abc0555a4d41fa4ad876c71e4d34e4c.zip |
New snapshot
(Portage version: 2.1.2.2)
Diffstat (limited to 'media-video')
5 files changed, 152 insertions, 1 deletions
diff --git a/media-video/x264-svn-encoder/ChangeLog b/media-video/x264-svn-encoder/ChangeLog index 11897c41c77c..d1e16d5d1cd4 100644 --- a/media-video/x264-svn-encoder/ChangeLog +++ b/media-video/x264-svn-encoder/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-video/x264-svn-encoder # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/x264-svn-encoder/ChangeLog,v 1.6 2007/01/06 15:03:14 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-svn-encoder/ChangeLog,v 1.7 2007/03/25 19:40:48 aballier Exp $ + +*x264-svn-encoder-20070325 (25 Mar 2007) + + 25 Mar 2007; Alexis Ballier <aballier@gentoo.org> + +files/x264-svn-encoder-20070325-nolib.patch, + +files/x264-svn-encoder-20070325-nostrip.patch, + +x264-svn-encoder-20070325.ebuild: + New snapshot 06 Jan 2007; Michael Cummings <mcummings@gentoo.org> x264-svn-encoder-20061014.ebuild: diff --git a/media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20070325 b/media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20070325 new file mode 100644 index 000000000000..b8d69201ad16 --- /dev/null +++ b/media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20070325 @@ -0,0 +1,3 @@ +MD5 42f074237b0fbcd107c28360f1c6f1f4 x264-svn-20070325.tar.bz2 492487 +RMD160 38d9c2aa39567de39a950c45cd032ff3599b0d5b x264-svn-20070325.tar.bz2 492487 +SHA256 b2398f83b5949032e9a42bb8b2f70d00a18bdbff2f6b0bb6897d65384c42ca28 x264-svn-20070325.tar.bz2 492487 diff --git a/media-video/x264-svn-encoder/files/x264-svn-encoder-20070325-nolib.patch b/media-video/x264-svn-encoder/files/x264-svn-encoder-20070325-nolib.patch new file mode 100644 index 000000000000..20ae0cc2b40a --- /dev/null +++ b/media-video/x264-svn-encoder/files/x264-svn-encoder-20070325-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-svn-encoder/files/x264-svn-encoder-20070325-nostrip.patch b/media-video/x264-svn-encoder/files/x264-svn-encoder-20070325-nostrip.patch new file mode 100644 index 000000000000..b4e2689a18e6 --- /dev/null +++ b/media-video/x264-svn-encoder/files/x264-svn-encoder-20070325-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-svn-encoder/x264-svn-encoder-20070325.ebuild b/media-video/x264-svn-encoder/x264-svn-encoder-20070325.ebuild new file mode 100644 index 000000000000..6b6882eec4c4 --- /dev/null +++ b/media-video/x264-svn-encoder/x264-svn-encoder-20070325.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2007 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-20070325.ebuild,v 1.1 2007/03/25 19:40:48 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="mp4? ( >=media-video/gpac-0.4.1_pre20060122 ) + gtk? ( >=x11-libs/gtk+-2.6.10 >=dev-libs/glib-2.10.3 ) + ~media-libs/${X264_SVN_P}" + +DEPEND="${RDEPEND} + amd64? ( >=dev-lang/yasm-0.6.0 ) + x86? ( dev-lang/nasm ) + x86-fbsd? ( dev-lang/nasm )" + +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) \ + || die "configure failed" + emake CC="$(tc-getCC)" || die "make failed" +} + +src_install() { + make DESTDIR="${D}" install || die + dodoc AUTHORS +} |