Fix bad stride in yuv422 due to non-even width requests.

[mlt] / configure

diff --git a/configure b/configure
index 9eb329bd8732ecc47a8ccd8b389a5c6495fd9226..6d90765f6506ed3c02dedd2689a10420a21be67a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-export version=0.4.3
-export soversion=1
+export version=0.5.5
+export soversion=2
 
 show_help()
 {
@@ -22,6 +22,7 @@ General build options:
   --disable-debug         - Compile without debug support (default: on)
   --disable-mmx           - Compile without MMX support (default: on)
   --disable-sse           - Compile without SSE support (default: on)
+  --disable-sse2          - Compile without SSE2 support (default: on)
   --arch='arch'           - Compile for a specific architecture (default: none)
   --cpu='cpu'             - Compile for a specific CPU (default: none)
 
@@ -58,6 +59,9 @@ build_config()
                [ "$sse" = "true" ] && 
                echo "SSE_FLAGS=-DUSE_SSE"
 
+               [ "$sse2" = "true" ] && 
+               echo "SSE2_FLAGS=-DUSE_SSE2"
+
                [ "$debug" = "true" ] && 
                echo "DEBUG_FLAGS=-g"
 
@@ -67,7 +71,7 @@ build_config()
                [ "$cpu" != "" ] && echo "TARGETCPU=-mcpu=$cpu"
                echo "OPTIMISATIONS=-O2 -pipe -fomit-frame-pointer"
 
-               echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
+               echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(SSE2_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
 
                case $targetos in
                Darwin)
@@ -154,6 +158,7 @@ export help=0
 export debug=true
 export mmx=true
 export sse=true
+export sse2=true
 export gpl=false
 export arch=
 export cpu=
@@ -185,8 +190,9 @@ do
                --datadir=* )           datadir="${i#--datadir=}" ;;
                --mandir=* )            mandir="${i#--mandir=}" ;;
                --disable-debug )       debug=false ;;
-               --disable-mmx )         mmx=false; sse=false ;;
-               --disable-sse )         sse=false ;;
+               --disable-mmx )         mmx=false; sse=false; sse2=false ;;
+               --disable-sse )         sse=false; sse2=false ;;
+               --disable-sse2 )        sse2=false ;;
                --enable-gpl )          gpl=true ;;
                --arch=* )                      arch="${i#--arch=}" ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
@@ -236,6 +242,25 @@ then
        esac
 fi
 
+# Double check SSE2 (Darwin, Linux and FreeBSD supported, may end up disabling SSE2 on other platforms incorrectly)
+if [ "$sse2" = "true" ]
+then
+       case $targetos in
+               Darwin)
+               sysctl -a hw | grep "sse2: 1" > /dev/null || sse2=false
+               ;;
+               Linux)
+               grep sse2 /proc/cpuinfo > /dev/null 2>&1 || sse2=false
+               ;;
+               FreeBSD)
+               [ "$(make -V MACHINE_CPU:Msse2)" ] || sse2=false
+               ;;
+               *)
+               grep sse2 /proc/cpuinfo > /dev/null 2>&1 || sse2=false
+               ;;
+       esac
+fi
+
 # Show help if requested
 if [ $help = 1 ]
 then
@@ -249,7 +274,7 @@ else
 fi
 
 # Iterate through each of the components
-for i in framework modules melt mlt++
+for i in framework modules melt mlt++ swig
 do
        if [ -x src/$i/configure ]
        then