diff options
author | Alexis Ballier <aballier@gentoo.org> | 2009-01-03 13:09:37 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2009-01-03 13:09:37 +0000 |
commit | a318f168da59c64de1e0912887cce20cf7ab758e (patch) | |
tree | 3bdfce421bde8bf0e844812a3bcec632f84caeef /media-video/x264-encoder/files | |
parent | Version bump, Remove old. (diff) | |
download | gentoo-2-a318f168da59c64de1e0912887cce20cf7ab758e.tar.gz gentoo-2-a318f168da59c64de1e0912887cce20cf7ab758e.tar.bz2 gentoo-2-a318f168da59c64de1e0912887cce20cf7ab758e.zip |
remove old
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'media-video/x264-encoder/files')
-rw-r--r-- | media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch | 71 | ||||
-rw-r--r-- | media-video/x264-encoder/files/x264-encoder-nolib.patch | 69 |
2 files changed, 0 insertions, 140 deletions
diff --git a/media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch b/media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch deleted file mode 100644 index 845e0743e50c..000000000000 --- a/media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -rub x264.orig/configure x264/configure ---- x264.orig/configure 2008-04-07 22:20:37.000000000 +0200 -+++ x264/configure 2008-04-07 22:34:00.000000000 +0200 -@@ -465,7 +465,6 @@ - echo "SONAME=libx264.so.$API" >> config.mak - echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak - fi -- echo 'default: $(SONAME)' >> config.mak - if [ "$gtk" = "yes" ]; then - echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak - fi -diff -rub x264.orig/gtk/Makefile x264/gtk/Makefile ---- x264.orig/gtk/Makefile 2008-04-07 22:22:20.000000000 +0200 -+++ x264/gtk/Makefile 2008-04-07 22:34:08.000000000 +0200 -@@ -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 -diff -rub x264.orig/Makefile x264/Makefile ---- x264.orig/Makefile 2008-04-07 22:20:23.000000000 +0200 -+++ x264/Makefile 2008-04-07 22:33:49.000000000 +0200 -@@ -78,10 +78,10 @@ - $(SONAME): .depend $(OBJS) $(OBJASM) - $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(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 -@@ -148,21 +148,10 @@ - rm -rf test/ - $(MAKE) -C gtk distclean - --install: x264$(EXE) $(SONAME) -+install: x264$(EXE) - 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)) --else -- $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so) -- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir)) --endif -- $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)) - - install-gtk: libx264gtk.a - $(MAKE) -C gtk install diff --git a/media-video/x264-encoder/files/x264-encoder-nolib.patch b/media-video/x264-encoder/files/x264-encoder-nolib.patch deleted file mode 100644 index 20ae0cc2b40a..000000000000 --- a/media-video/x264-encoder/files/x264-encoder-nolib.patch +++ /dev/null @@ -1,69 +0,0 @@ -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 |