diff options
| author |   Andrew Savchenko <bircoph@gmail.com> | 2011-05-17 02:07:12 +0400 |
|---|---|---|
| committer | Andrew Savchenko <bircoph@gmail.com> | 2011-05-17 02:07:12 +0400 |
| commit | d7d5ae1b8951c26170d11eeed47683caac652fc9 (patch) | |
| tree | 1b0a1cc0363c697a6564d47d7ec4cb649589f8cd /media-libs | |
| parent | root update, pending for portage (diff) | |
| download | bircoph-d7d5ae1b8951c26170d11eeed47683caac652fc9.tar.gz bircoph-d7d5ae1b8951c26170d11eeed47683caac652fc9.tar.bz2 bircoph-d7d5ae1b8951c26170d11eeed47683caac652fc9.zip | |
x264: update for configure changes
Configure scipt now support all features that were triggered by
patches, thus drop patches away.
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/x264/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/x264/files/x264-nostrip.patch | 16 | ||||
| -rw-r--r-- | media-libs/x264/files/x264-onlylib.patch | 28 | ||||
| -rw-r--r-- | media-libs/x264/x264-9999.ebuild | 2 |
4 files changed, 3 insertions, 47 deletions
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest index 2484b31..ea97abc 100644 --- a/media-libs/x264/Manifest +++ b/media-libs/x264/Manifest @@ -1,5 +1,3 @@ -AUX x264-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa -AUX x264-onlylib.patch 962 RMD160 491d1b537ae4ebb6de9c1de9baa9949de1813e16 SHA1 9975ad04654dfb5dbc6c6f65d72a749194e68c1c SHA256 1d8f22784a94e5d983ffbac11213008e10ca8dd8661f3a9e8298cd15e5a60bf6 -EBUILD x264-9999.ebuild 1380 RMD160 05227a2e3d114569fe9a1ca1ac9e1b531a75d88f SHA1 4b596004013c5abee0f2e88eb345156ac11fa9bd SHA256 3d92218221296ab0b40ed6f33bcef5b7ce3ca81a284fa988e65dd29e5d1e0484 +EBUILD x264-9999.ebuild 1418 RMD160 c0b12cb0595439f800c40950baf6dc0eb8f8f784 SHA1 a04d1acdd46f4237abb68d922c45ffc551e1ccef SHA256 3a1d7a05e6ef776de06d3e84f7ea7d19fad0767ca14edf593b8c1294d61aab2c MISC ChangeLog 7127 RMD160 a953771dbc0e9470382985dab19a3423311eaf6d SHA1 fc366d82a87637c4ac13397d03abd04cc3eb94a2 SHA256 57333369ad4ed88ae6ef2baff8572a2ee7999ca60d1f2ed95ff821a4fa20339d MISC metadata.xml 335 RMD160 782d171712950050c9e34479cedef18983e566e9 SHA1 68e8b7034a5abef5f25463e194936c8d4a837f72 SHA256 18b919bb52e6713ae3919ba49f66caa659304337339e6d317e95d04a6384d23c diff --git a/media-libs/x264/files/x264-nostrip.patch b/media-libs/x264/files/x264-nostrip.patch deleted file mode 100644 index b4e2689..0000000 --- a/media-libs/x264/files/x264-nostrip.patch +++ /dev/null @@ -1,16 +0,0 @@ -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.patch b/media-libs/x264/files/x264-onlylib.patch deleted file mode 100644 index 2f57c3c..0000000 --- a/media-libs/x264/files/x264-onlylib.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile.orig 2011-04-08 03:39:22.000000000 +0400 -+++ Makefile 2011-04-08 03:48:34.000000000 +0400 -@@ -137,7 +137,7 @@ - - .PHONY: all default fprofiled clean distclean install uninstall dox test testclean - --default: $(DEP) x264$(EXE) -+default: $(DEP) - - $(LIBX264): .depend $(OBJS) $(OBJASM) - $(AR)$@ $(OBJS) $(OBJASM) -@@ -207,7 +207,7 @@ - rm -f config.mak x264_config.h config.h config.log x264.pc x264.def - rm -rf test/ - --install: x264$(EXE) $(SONAME) -+install: libx264.a $(SONAME) - install -d $(DESTDIR)$(bindir) - install -d $(DESTDIR)$(includedir) - install -d $(DESTDIR)$(libdir) -@@ -216,7 +216,6 @@ - install -m 644 x264_config.h $(DESTDIR)$(includedir) - install -m 644 $(LIBX264) $(DESTDIR)$(libdir) - install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig -- install x264$(EXE) $(DESTDIR)$(bindir) - $(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264)) - ifeq ($(SYS),WINDOWS) - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir)) diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild index 1a0da0f..4094cba 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-9999.ebuild @@ -42,12 +42,14 @@ src_configure() { --prefix=/usr \ --libdir=/usr/$(get_libdir) \ --disable-avs \ + --disable-cli \ --disable-lavf \ --disable-swscale \ --disable-gpac \ $(use threads || echo "--disable-thread") \ --enable-pic \ --enable-shared \ + --enable-static \ --extra-asflags="${ASFLAGS}" \ --extra-cflags="${CFLAGS}" \ --extra-ldflags="${LDFLAGS}" \ |