diff options
Diffstat (limited to 'multimedia/x264-devel/files')
-rw-r--r-- | multimedia/x264-devel/files/patch-Makefile | 20 | ||||
-rw-r--r-- | multimedia/x264-devel/files/patch-configure | 30 | ||||
-rw-r--r-- | multimedia/x264-devel/files/patch-gtk_Makefile | 20 |
3 files changed, 0 insertions, 70 deletions
diff --git a/multimedia/x264-devel/files/patch-Makefile b/multimedia/x264-devel/files/patch-Makefile deleted file mode 100644 index 6e29cc11c6ac..000000000000 --- a/multimedia/x264-devel/files/patch-Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.orig 2007-07-09 10:11:24.000000000 -0400 -+++ Makefile 2007-07-09 10:11:49.000000000 -0400 -@@ -18,7 +18,7 @@ - endif - - # MMX/SSE optims --ifeq ($(ARCH),X86) -+ifeq ($(ARCH),i386) - ifneq ($(AS),) - SRCS += common/i386/mc-c.c common/i386/predict-c.c - ASMSRC = common/i386/dct-a.asm common/i386/cpu-a.asm \ -@@ -32,7 +32,7 @@ - endif - - # MMX/SSE optims --ifeq ($(ARCH),X86_64) -+ifeq ($(ARCH),amd64) - ifneq ($(AS),) - SRCS += common/i386/mc-c.c common/i386/predict-c.c - ASMSRC = common/amd64/dct-a.asm common/amd64/cpu-a.asm \ diff --git a/multimedia/x264-devel/files/patch-configure b/multimedia/x264-devel/files/patch-configure deleted file mode 100644 index b3dd7ddf0f2a..000000000000 --- a/multimedia/x264-devel/files/patch-configure +++ /dev/null @@ -1,30 +0,0 @@ ---- configure.orig 2007-09-13 16:45:04.000000000 -0400 -+++ configure 2007-09-14 10:39:22.000000000 -0400 -@@ -252,7 +252,7 @@ - fi - as_check || AS="nasm" - ;; -- x86_64) -+ x86_64 | amd64) - ARCH="X86_64" - AS="yasm" - ASFLAGS="-f elf -m amd64" -@@ -361,7 +361,7 @@ - LDFLAGS="$LDFLAGS $libpthread" - fi - --MP4_LDFLAGS="-lgpac_static" -+MP4_LDFLAGS="-lgpac" - if [ $SYS = CYGWIN -o $SYS = MINGW ]; then - MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm" - fi -@@ -443,7 +443,8 @@ - cp config.mak gtk/config.mak - - if [ "$shared" = "yes" ]; then -- API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ') -+# API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ') -+ API=50 - echo "SONAME=libx264.so.$API" >> config.mak - echo 'default: $(SONAME)' >> config.mak - if [ "$gtk" = "yes" ]; then diff --git a/multimedia/x264-devel/files/patch-gtk_Makefile b/multimedia/x264-devel/files/patch-gtk_Makefile deleted file mode 100644 index c03a6c7bef82..000000000000 --- a/multimedia/x264-devel/files/patch-gtk_Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- gtk/Makefile.orig Fri Jun 1 08:18:59 2007 -+++ gtk/Makefile Fri Jun 1 08:19:28 2007 -@@ -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 -+CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0 x264` -I.. -DX264_DATA_DIR=\"${datadir}\" -+LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264` - - - # gettext rules |