NEWS, configure: set version to 0.3.4 and add release notes

[mlt] / configure

diff --git a/configure b/configure
index 65961fa052ca8b0b1bcfcff25a0862e17b1f0f3c..b6334385d1d8f6974f5cdde4eeedff8ee67776a3 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-export version=0.2.5
-export soversion=0
+export version=0.3.4
+export soversion=1
 
 show_help()
 {
@@ -17,9 +17,9 @@ General build options:
   --prefix=directory      - install prefix for path (default: $prefix)
   --libdir=directory      - lib directory (default: $prefix/lib)
   --enable-gpl            - Enable GPL components
-  --enable-motion-est    - Enable motion estimation components
   --disable-debug         - Compile without debug support (default: on)
   --disable-mmx           - Compile without MMX support (default: on)
+  --disable-sse           - Compile without SSE support (default: on)
   --cpu='cpu'             - Compile for a specific CPU/architectre (default: none)
 
 Module disables options:
@@ -50,6 +50,9 @@ build_config()
                [ "$mmx" = "true" ] && 
                echo "MMX_FLAGS=-DUSE_MMX"
 
+               [ "$sse" = "true" ] && 
+               echo "SSE_FLAGS=-DUSE_SSE"
+
                [ "$debug" = "true" ] && 
                echo "DEBUG_FLAGS=-g"
 
@@ -58,23 +61,32 @@ build_config()
                [ "$cpu" != "" ] &&
                echo "TARGETARCH=-march=$cpu" &&
                echo "TARGETCPU=-mcpu=$cpu"
-               echo "OPTIMISATIONS=-O4 -pipe -fomit-frame-pointer"
+               echo "OPTIMISATIONS=-O3 -pipe -fomit-frame-pointer"
 
-               echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
+               echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
 
                case $targetos in
                Darwin)
+               sysctl -a hw | grep "x86_64: 1" > /dev/null && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
                echo "CFLAGS+=-D__DARWIN__ `sdl-config --cflags`"
                echo "SHFLAGS=-dynamiclib"
                echo "LDFLAGS+=`sdl-config --libs`"
                ;;
                Linux)
+               [ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
                echo "OPTIMISATIONS+=-ffast-math"
                echo "CFLAGS+=-pthread"
                echo "SHFLAGS=-shared"
                echo "LIBDL=-ldl"
                echo "RDYNAMIC=-rdynamic"
                ;;
+               FreeBSD)
+               [ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
+               echo "OPTIMISATIONS+=-ffast-math"
+               echo "CFLAGS+=-pthread"
+               echo "SHFLAGS=-shared"
+               echo "RDYNAMIC=-rdynamic"
+               ;;
                *)
                ;;
                esac
@@ -121,9 +133,10 @@ export libdir=""
 export help=0
 export debug=true
 export mmx=true
+export sse=true
 export gpl=false
 export cpu=
-export motionest=false
+export targetos=
 
 # Determine OS
 targetos=$(uname -s)
@@ -131,9 +144,8 @@ targetos=$(uname -s)
 case $targetos in
        Darwin)
        LIBSUF=".dylib"
-       mmx=false
        ;;
-       Linux)
+       Linux|FreeBSD)
        LIBSUF=".so"
        ;;
        *)
@@ -150,9 +162,9 @@ do
                --prefix=* )            prefix="${i#--prefix=}" ;;
                --libdir=* )            libdir="${i#--libdir=}" ;;
                --disable-debug )       debug=false ;;
-               --disable-mmx )         mmx=false ;;
+               --disable-mmx )         mmx=false; sse=false ;;
+               --disable-sse )         sse=false ;;
                --enable-gpl )          gpl=true ;;
-               --enable-motion-est )   motionest=true ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
        esac
 done
@@ -160,10 +172,42 @@ done
 # Determine the libdir if it's not specified in the args
 [ "$libdir" = "" ] && libdir=$prefix/lib
 
-# Double check mmx (may end up disabling mmx on non-linux platforms incorrectly)
+# Double check mmx (Linux and FreeBSD supported, may end up disabling mmx on other platforms incorrectly)
 if [ "$mmx" = "true" ]
 then
-       grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
+       case $targetos in
+               Darwin)
+               sysctl -a hw | grep "mmx: 1" > /dev/null || mmx=false
+               ;;
+               Linux)
+               grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
+               ;;
+               FreeBSD)
+               [ "$(make -V MACHINE_CPU:Mmmx)" ] || mmx=false
+               ;;
+               *)
+               grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
+               ;;
+       esac
+fi
+
+# Double check SSE (Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
+if [ "$sse" = "true" ]
+then
+       case $targetos in
+               Darwin)
+               sysctl -a hw | grep "sse: 1" > /dev/null || sse=false
+               ;;
+               Linux)
+               grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false
+               ;;
+               FreeBSD)
+               [ "$(make -V MACHINE_CPU:Msse)" ] || sse=false
+               ;;
+               *)
+               grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false
+               ;;
+       esac
 fi
 
 # Show help if requested
@@ -200,8 +244,3 @@ build_pkgconfig
 ( [ "$gpl" = "false" ] && 
 echo "GPL Components are disabled" || 
 echo "GPL License Used" )
-
-if [ "$motionest" = "true" -a "$gpl" = "false" ]
-then
-       echo "Add the --enable-gpl flag to build the motion estimation components."
-fi