3 files changed, 9 insertions, 61 deletions
diff --git a/multimedia/x264-devel/files/patch-Makefile b/multimedia/x264-devel/files/patch-Makefile
index 3bbfaefda8da..af5638d37df6 100644
--- a/multimedia/x264-devel/files/patch-Makefile
+++ b/multimedia/x264-devel/files/patch-Makefile
@@ -1,20 +1,17 @@
---- Makefile.orig	2008-04-09 16:45:06.000000000 -0400
-+++ Makefile	2008-04-09 20:47:32.490510083 -0400
-@@ -26,7 +26,7 @@
-           cpu-32.asm dct-32.asm
+--- ./Makefile.orig	2008-12-18 22:45:07.000000000 +0100
++++ ./Makefile	2009-03-17 19:09:28.000000000 +0100
+@@ -26,12 +26,12 @@
+           cpu-a.asm dct-32.asm
  X86SRC = $(X86SRC0:%=common/x86/%)
  
 -ifeq ($(ARCH),X86)
 +ifeq ($(ARCH),i386)
- SRCS   += common/x86/mc-c.c common/x86/predict-c.c
- ASMSRC  = $(X86SRC) common/x86/pixel-32.asm
- OBJASM  = $(ASMSRC:%.asm=%.o)
-@@ -35,7 +35,7 @@
- checkasm: tools/checkasm-32.o
+ ARCH_X86 = yes
+ ASMSRC   = $(X86SRC) common/x86/pixel-32.asm
  endif
  
 -ifeq ($(ARCH),X86_64)
 +ifeq ($(ARCH),amd64)
- SRCS   += common/x86/mc-c.c common/x86/predict-c.c
- ASMSRC  = $(X86SRC:-32.asm=-64.asm)
- OBJASM  = $(ASMSRC:%.asm=%.o)
+ ARCH_X86 = yes
+ ASMSRC   = $(X86SRC:-32.asm=-64.asm)
+ ASFLAGS += -DARCH_X86_64
diff --git a/multimedia/x264-devel/files/patch-configure b/multimedia/x264-devel/files/patch-configure
deleted file mode 100644
index 052d3036cd26..000000000000
--- a/multimedia/x264-devel/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	2008-04-09 16:45:06.000000000 -0400
-+++ configure	2008-04-09 20:48:37.722733173 -0400
-@@ -248,7 +248,7 @@
-     fi
-     as_check || AS="nasm"
-     ;;
--  x86_64)
-+  x86_64 | amd64)
-     ARCH="X86_64"
-     AS="yasm"
-     if [ "$SYS" = MACOSX ];then
-@@ -372,7 +372,7 @@
-     LDFLAGS="$LDFLAGS $libpthread"
- fi
- 
--MP4_LDFLAGS="-lgpac_static"
-+MP4_LDFLAGS="-lgpac"
- if [ $SYS = MINGW ]; then
-     MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
- fi
-@@ -458,7 +458,7 @@
- cp config.mak gtk/config.mak
- 
- if [ "$shared" = "yes" ]; then
--    API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
-+    API=50
-     if [ "$SYS" = "MINGW" ]; then
-         echo "SONAME=libx264-$API.dll" >> config.mak
-         echo 'IMPLIBNAME=libx264.dll.a' >> config.mak
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