* update x264 to revision 604 and disable the usage of a custom nasm. Removed...

* update x264 to revision 604 and disable the usage of a custom nasm. Removed my patch which was disabling SSE2. (basically back-porting [18212])

extras/contrib/src/Makefile

@@ -1190,7 +1190,7 @@ CLEAN_PKG += libdca
 
 ifdef SVN
 x264: 
-	$(SVN) co svn://svn.videolan.org/x264/trunk/ -r 501 x264
+	$(SVN) co svn://svn.videolan.org/x264/trunk/ -r 604 x264
 ifdef HAVE_WIN32
 	(cd x264; patch -p 0 < ../Patches/x264-svn-win32.patch )
 endif
@@ -1208,16 +1208,8 @@ else
 endif
 endif
 
-ifeq ($(HOST),i686-apple-darwin8)
-.x264: x264 .nasm
-else
 .x264: x264
-endif
-ifeq ($(HOST),i686-apple-darwin8)
-	(cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && patch -p0 <../Patches/x264-osx-intel.patch && make && make install)
-else
 	(cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
-endif
 	touch $@
 
 CLEAN_FILE += .x264

extras/contrib/src/Patches/x264-osx-intel.patch

---- config.mak	2006-10-15 16:52:23.000000000 +0200
-+++ config.mak	2006-10-15 16:52:34.000000000 +0200
-@@ -6,7 +6,7 @@
- ARCH=X86
- SYS=MACOSX
- CC=gcc
--CFLAGS=-Wall -I. -O4 -ffast-math -D__X264__ -falign-loops=16 -DHAVE_MMXEXT -DHAVE_SSE2 -DARCH_X86 -DSYS_MACOSX -DHAVE_PTHREAD -fPIC -s -fomit-frame-pointer
-+CFLAGS=-Wall -I. -O4 -ffast-math -D__X264__ -falign-loops=16 -DHAVE_MMXEXT -DARCH_X86 -DSYS_MACOSX -DHAVE_PTHREAD -fPIC -s -fomit-frame-pointer
- LDFLAGS= -lm -lmx -lpthread -s
- AS=nasm
- ASFLAGS=-O2 -f macho -DPREFIX -D__PIC__