diff options
author | Alexis Ballier <aballier@gentoo.org> | 2007-09-23 18:11:50 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2007-09-23 18:11:50 +0000 |
commit | 715390b901ba14c02338b39cca91f673754ec3cc (patch) | |
tree | d14ed2a61d40c3388b599b4299ebfc890651cff6 | |
parent | version bump now that yasm issues on x86 have been fixed, bug #180666, block ... (diff) | |
download | gentoo-2-715390b901ba14c02338b39cca91f673754ec3cc.tar.gz gentoo-2-715390b901ba14c02338b39cca91f673754ec3cc.tar.bz2 gentoo-2-715390b901ba14c02338b39cca91f673754ec3cc.zip |
version bump now that yasm issues on x86 have been fixed, bug #180666, block older version of yasm because of this
(Portage version: 2.1.3.9)
5 files changed, 159 insertions, 1 deletions
diff --git a/media-video/x264-svn-encoder/ChangeLog b/media-video/x264-svn-encoder/ChangeLog index d1e16d5d1cd4..c61664bcfef6 100644 --- a/media-video/x264-svn-encoder/ChangeLog +++ b/media-video/x264-svn-encoder/ChangeLog @@ -1,6 +1,15 @@ # 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.7 2007/03/25 19:40:48 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-svn-encoder/ChangeLog,v 1.8 2007/09/23 18:11:50 aballier Exp $ + +*x264-svn-encoder-20070923 (23 Sep 2007) + + 23 Sep 2007; Alexis Ballier <aballier@gentoo.org> + +files/x264-svn-encoder-20070923-nolib.patch, + +files/x264-svn-encoder-20070923-nostrip.patch, + +x264-svn-encoder-20070923.ebuild: + version bump now that yasm issues on x86 have been fixed, bug #180666, block + older version of yasm because of this *x264-svn-encoder-20070325 (25 Mar 2007) diff --git a/media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20070923 b/media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20070923 new file mode 100644 index 000000000000..06a24bc198b6 --- /dev/null +++ b/media-video/x264-svn-encoder/files/digest-x264-svn-encoder-20070923 @@ -0,0 +1,3 @@ +MD5 3f6e81f8fd33c4bd9ee558ee3ec1f920 x264-svn-20070923.tar.bz2 322704 +RMD160 5a6c643521b98fe10ebb6c63168d0a9b7a9dc548 x264-svn-20070923.tar.bz2 322704 +SHA256 39d8a8b72ede15efda9b3ad9f9583dfcdf8c750587f62d5caf5e4e0462acfa50 x264-svn-20070923.tar.bz2 322704 diff --git a/media-video/x264-svn-encoder/files/x264-svn-encoder-20070923-nolib.patch b/media-video/x264-svn-encoder/files/x264-svn-encoder-20070923-nolib.patch new file mode 100644 index 000000000000..20ae0cc2b40a --- /dev/null +++ b/media-video/x264-svn-encoder/files/x264-svn-encoder-20070923-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-20070923-nostrip.patch b/media-video/x264-svn-encoder/files/x264-svn-encoder-20070923-nostrip.patch new file mode 100644 index 000000000000..b4e2689a18e6 --- /dev/null +++ b/media-video/x264-svn-encoder/files/x264-svn-encoder-20070923-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-20070923.ebuild b/media-video/x264-svn-encoder/x264-svn-encoder-20070923.ebuild new file mode 100644 index 000000000000..4af89f4ece0a --- /dev/null +++ b/media-video/x264-svn-encoder/x264-svn-encoder-20070923.ebuild @@ -0,0 +1,61 @@ +# 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-20070923.ebuild,v 1.1 2007/09/23 18:11:50 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/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/-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 +} |