Commit f9fca27a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

*Contribs: Yet another x264 patch

parent d75145f3
Index: configure Index: configure
=================================================================== ===================================================================
--- configure (rvision 547) --- configure (revision 560)
+++ configure (copie de travail) +++ configure (working copy)
@@ -66,48 +66,147 @@ @@ -66,8 +66,109 @@
EXE="" EXE=""
-UNAMES="`uname -s`"
+AR="ar" +AR="ar"
+AROPTS="rc" +AROPTS="rc"
+RANLIB="ranlib" +RANLIB="ranlib"
+ +
+UNAMES="`uname -s |tr A-Z a-z`" MACHINE="$(./config.guess)"
+UNAMEM="`uname -m |tr A-Z a-z`"
+
+# parse options +# parse options
+ +
+for opt do +for opt do
+ optarg="${opt#*=}" + optarg="${opt#*=}"
+ case "$opt" in + case "$opt" in
+ --crosscompile=*) + --crosscompile=*)
+ CROSS="$optarg" + CROSS="$optarg"
+ CC="$CROSS-gcc" + CC="$CROSS-gcc"
+ AR="$CROSS-ar" + AR="$CROSS-ar"
+ RANLIB="$CROSS-ranlib" + RANLIB="$CROSS-ranlib"
+ UNAMES="`echo $CROSS | cut -d- -f2`" + MACHINE="`echo $CROSS | sed -e 's/-/-x-/g'`"
+ UNAMEM="`echo $CROSS | cut -d- -f1`" + ;;
+ ;; + --prefix=*)
+ --prefix=*) + prefix="$optarg"
+ prefix="$optarg" + ;;
+ ;; + --exec-prefix=*)
+ --exec-prefix=*) + exec_prefix="$optarg"
+ eprefix="$optarg" + ;;
+ ;; + --bindir=*)
+ --bindir=*) + bindir="$optarg"
+ bindir="$optarg" + ;;
+ ;; + --libdir=*)
+ --libdir=*) + libdir="$optarg"
+ libdir="$optarg" + ;;
+ ;; + --includedir=*)
+ --includedir=*) + includedir="$optarg"
+ includedir="$optarg" + ;;
+ ;;
+ --enable-avis-input) + --enable-avis-input)
+ if [ $SYS = CYGWIN -o $SYS = MINGW ]; then + avis_input="yes"
+ CFLAGS="$CFLAGS -DAVIS_INPUT" + ;;
+ LDFLAGS="$LDFLAGS -lvfw32" + --disable-avis-input)
+ avis_input="yes" + avis_input="no"
+ fi
+ ;; + ;;
+ --enable-mp4-output) + --enable-mp4-output)
+ CFLAGS="$CFLAGS -DMP4_OUTPUT"
+ LDFLAGS="$LDFLAGS -lgpac_static"
+ if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
+ LDFLAGS="$LDFLAGS -lwinmm"
+ fi
+ mp4_output="yes" + mp4_output="yes"
+ ;; + ;;
+ --disable-mp4-output)
+ mp4_output="no"
+ ;;
+ --extra-asflags=*) + --extra-asflags=*)
+ ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}" + ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
+ ;; + ;;
...@@ -69,18 +63,12 @@ Index: configure ...@@ -69,18 +63,12 @@ Index: configure
+ VFW_LDFLAGS="${opt#--extra-ldflags=}" + VFW_LDFLAGS="${opt#--extra-ldflags=}"
+ ;; + ;;
+ --enable-pthread) + --enable-pthread)
+ CFLAGS="$CFLAGS -DHAVE_PTHREAD=1"
+ pthread="yes" + pthread="yes"
+ case $SYS in + ;;
+ MINGW|CYGWIN|BEOS) + --disable-pthread)
+ ;; + pthread="no"
+ *)
+ LDFLAGS="$LDFLAGS -lpthread"
+ ;;
+ esac
+ ;; + ;;
+ --enable-debug) + --enable-debug)
+ CFLAGS="$CFLAGS -g"
+ debug="yes" + debug="yes"
+ ;; + ;;
+ --enable-gprof) + --enable-gprof)
...@@ -89,13 +77,26 @@ Index: configure ...@@ -89,13 +77,26 @@ Index: configure
+ gprof="yes" + gprof="yes"
+ ;; + ;;
+ --enable-pic) + --enable-pic)
+ CFLAGS="$CFLAGS -fPIC"
+ ASFLAGS="$ASFLAGS -D__PIC__"
+ pic="yes" + pic="yes"
+ ;; + ;;
+ --enable-vfw) + --enable-vfw)
+ vfw="yes" + vfw="yes"
+ ;; + ;;
+ --disable-vfw)
+ vfw="no"
+ ;;
+ --enable-gtk)
+ gtk="yes"
+ ;;
+ --disable-gtk)
+ gtk="no"
+ ;;
+ --enable-shared)
+ shared="yes"
+ if [ $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" ] ; then
+ pic="yes"
+ fi
+ ;;
+ --enable-visualize) + --enable-visualize)
+ LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11" + LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
+ CFLAGS="$CFLAGS -DVISUALIZE=1" + CFLAGS="$CFLAGS -DVISUALIZE=1"
...@@ -107,83 +108,16 @@ Index: configure ...@@ -107,83 +108,16 @@ Index: configure
+ esac + esac
+done +done
+ +
case "$UNAMES" in +
- BeOS) case "${MACHINE#*-*-}" in
+ beos) beos*)
SYS="BEOS" SYS="BEOS"
CFLAGS="$CFLAGS -DHAVE_MALLOC_H" @@ -180,96 +281,6 @@
;;
- Darwin)
+ darwin)
SYS="MACOSX"
CFLAGS="$CFLAGS -falign-loops=16"
LDFLAGS="$LDFLAGS -lm -lmx"
;;
- FreeBSD)
+ freebsd)
SYS="FREEBSD"
LDFLAGS="$LDFLAGS -lm"
;;
- NetBSD)
+ netbsd)
SYS="NETBSD"
LDFLAGS="$LDFLAGS -lm"
;;
- OpenBSD)
+ openbsd)
SYS="OPENBSD"
CFLAGS="$CFLAGS -I/usr/X11R6/include"
LDFLAGS="$LDFLAGS -lm"
;;
- Linux)
+ linux)
SYS="LINUX"
CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
LDFLAGS="$LDFLAGS -lm"
;;
- CYGWIN*)
+ cygwin*)
SYS="CYGWIN"
CFLAGS="$CFLAGS -mno-cygwin"
LDFLAGS="$LDFLAGS -mno-cygwin"
EXE=".exe"
DEVNULL="NUL"
;;
- MINGW*)
+ mingw*)
SYS="MINGW"
EXE=".exe"
DEVNULL="NUL"
;;
- SunOS)
+ sunos)
SYS="SunOS"
CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
LDFLAGS="$LDFLAGS -lm"
@@ -119,9 +218,8 @@
;;
esac esac
-UNAMEM="`uname -m`"
case "$UNAMEM" in
- i386|i486|i586|i686|BePC)
+ i386|i486|i586|i686|bepc)
ARCH="X86"
CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
AS="nasm"
@@ -142,7 +240,7 @@
AS="yasm"
ASFLAGS="-f elf -m amd64"
;;
- "Power Macintosh"|ppc|ppc64)
+ "power macintosh"|ppc|ppc64)
ARCH="PPC"
if [ $SYS = MACOSX ]
then
@@ -191,95 +289,6 @@
CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS" CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
-
# parse options -# parse options
- -
-for opt do -for opt do
- optarg="${opt#*=}" - optarg="${opt#*=}"
...@@ -233,7 +167,6 @@ Index: configure ...@@ -233,7 +167,6 @@ Index: configure
- pthread="no" - pthread="no"
- ;; - ;;
- --enable-debug) - --enable-debug)
- CFLAGS="$CFLAGS -g"
- debug="yes" - debug="yes"
- ;; - ;;
- --enable-gprof) - --enable-gprof)
...@@ -276,20 +209,20 @@ Index: configure ...@@ -276,20 +209,20 @@ Index: configure
# autodetect options that weren't forced nor disabled # autodetect options that weren't forced nor disabled
if test "$pthread" = "auto" ; then if test "$pthread" = "auto" ; then
@@ -365,6 +374,9 @@ @@ -361,6 +372,9 @@
VFW=$vfw VFW=$vfw
GTK=$gtk GTK=$gtk
EXE=$EXE EXE=$EXE
+AR=$AR +AR=$AR
+AROPTS=$AROPTS +AROPTS=$AROPTS
+RANLIB=$RANLIB +RANLIB=$RANLIB
VIS=$vis VIS=$vis
HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
DEVNULL=$DEVNULL DEVNULL=$DEVNULL
Index: Makefile Index: Makefile
=================================================================== ===================================================================
--- Makefile (rvision 547) --- Makefile (revision 560)
+++ Makefile (copie de travail) +++ Makefile (working copy)
@@ -64,8 +64,8 @@ @@ -64,8 +64,8 @@
default: $(DEP) x264$(EXE) default: $(DEP) x264$(EXE)
...@@ -314,7 +247,7 @@ Index: Makefile ...@@ -314,7 +247,7 @@ Index: Makefile
install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
- install x264 $(DESTDIR)$(bindir) - install x264 $(DESTDIR)$(bindir)
- ranlib $(DESTDIR)$(libdir)/libx264.a - ranlib $(DESTDIR)$(libdir)/libx264.a
+ install x264$(EXE) $(DESTDIR)$(bindir) + install x264$(EXE) $(DESTDIR)$(bindir)
+ $(RANLIB) $(DESTDIR)$(libdir)/libx264.a + $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so) $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir)) $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment