- and one more

[packages/libx264.git] / libx264-acam.patch

diff --git a/libx264-acam.patch b/libx264-acam.patch
index 1d7f124e2cc7d9b24d725135bb91e19cc5b2dcdd..9a5f0101240f42474041395fbd2ec603b99bdd18 100644 (file)
--- a/libx264-acam.patch
+++ b/libx264-acam.patch
@@ -1,15 +1,16 @@
 diff -Nur x264-snapshot-20051022-2245.orig/common/amd64/Makefile.am x264-snapshot-20051022-2245/common/amd64/Makefile.am
 --- x264-snapshot-20051022-2245.orig/common/amd64/Makefile.am  1970-01-01 01:00:00.000000000 +0100
 +++ x264-snapshot-20051022-2245/common/amd64/Makefile.am       2005-10-24 01:18:29.134240048 +0200
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,19 @@
 +SUFFIXES = .c .o .lo .asm
 +
 +YASM=@YASM@
 +YASMFLAGS=@YASMFLAGS@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +
 +noinst_LTLIBRARIES = lib_x8664_yasm.la
 +
-+lib_x8686_yasm_la_SOURCES = dct-a.asm cpu-a.asm pixel-a.asm mc-a.asm \
++lib_x8664_yasm_la_SOURCES = dct-a.asm cpu-a.asm pixel-a.asm mc-a.asm \
 +      mc-a2.asm predict-a.asm pixel-sse2.asm quant-a.asm
 +
 +am_lib_x8664_yasm_la_OBJECTS = dct-a.lo cpu-a.lo pixel-a.lo mc-a.lo \
@@ -253,9 +254,9 @@ diff -Nur x264-snapshot-20051022-2245.orig/common/ppc/Makefile.am x264-snapshot-
 @@ -0,0 +1,5 @@
 +noinst_LTLIBRARIES = lib_ppc.la
 +
-+noinst_HEADERS = mc.h pixel.h ppccommon.h
++noinst_HEADERS = mc.h pixel.h dct.h ppccommon.h
 +
-+lib_ppc_la_SOURCES = mc.c pixel.c
++lib_ppc_la_SOURCES = mc.c pixel.c dct.c
 diff -Nur x264-snapshot-20051022-2245.orig/common/predict.c x264-snapshot-20051022-2245/common/predict.c
 --- x264-snapshot-20051022-2245.orig/common/predict.c  2005-10-22 22:45:02.000000000 +0200
 +++ x264-snapshot-20051022-2245/common/predict.c       2005-10-23 23:16:54.594178696 +0200
@@ -298,7 +299,7 @@ diff -Nur x264-snapshot-20051022-2245.orig/common/visualize.c x264-snapshot-2005
 diff -Nur x264-snapshot-20051022-2245.orig/configure.ac x264-snapshot-20051022-2245/configure.ac
 --- x264-snapshot-20051022-2245.orig/configure.ac      1970-01-01 01:00:00.000000000 +0100
 +++ x264-snapshot-20051022-2245/configure.ac   2005-10-24 01:03:37.053856880 +0200
-@@ -0,0 +1,138 @@
+@@ -0,0 +1,140 @@
 +AC_INIT(libx264, 0.1.2)
 +AC_PREREQ(2.53)
 +AC_CONFIG_SRCDIR([x264.c])
@@ -379,7 +380,7 @@ diff -Nur x264-snapshot-20051022-2245.orig/configure.ac x264-snapshot-20051022-2
 +                      AC_MSG_ERROR(nasm required for x86 build. Please Install it.)
 +              fi
 +              ;;
-+      x86_64)
++      x86_64-NOTREADY)
 +              AC_DEFINE(CPU_x8664,1)
 +              AC_SUBST(CPU_x8664)
 +              AC_DEFINE(ARCH_X86_64,1)
@@ -432,8 +433,10 @@ diff -Nur x264-snapshot-20051022-2245.orig/configure.ac x264-snapshot-20051022-2
 +
 +AC_CONFIG_FILES([Makefile
 +                 common/Makefile
++                               common/amd64/Makefile
 +                               common/i386/Makefile
 +                               common/ppc/Makefile
++                               common/sparc/Makefile
 +                               encoder/Makefile])
 +CFLAGS="$CFLAGS -D__X264__"
 +AC_OUTPUT