X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=build-vlc;h=0971fe5263db5825db79edd8f38af5a1b99d0389;hb=b89a1dfc00af298c9eae9b0dd3ab97ae5975ccc4;hp=c43dc23db871f6ab4217ece39845deb3779f2ea3;hpb=c31926a0489ced7523294ef7bd74c3bee9ea3ae0;p=vlc

diff --git a/build-vlc b/build-vlc
index c43dc23db8..0971fe5263 100755
--- a/build-vlc
+++ b/build-vlc
@@ -1,32 +1,134 @@
 #!/bin/sh
 
 FEATURES="
-GNOME gnome
-GTK gtk
-DVDOLD dvd
+SKINS skins2
+FAMILIAR familiar
+WXWINDOWS wxwindows
+OPIE opie
+MACOSX macosx
+QNX qnx
+NCURSES ncurses
+XOSD xosd
+VISUAL visual
+GOOM goom
+SLP slp
+LIRC lirc
+JOYSTICK joystick
+CORBA corba
+LIVEDOTCOM livedotcom
 DVDREAD dvdread
-DVDPLAY dvdplay
-VCD vcd
+DVDNAV dvdnav
+DSHOW dshow
+DVBPSI dvbpsi
 V4L v4l
-SAT satellite
+PVR pvr
+VCD vcd
+SATELLITE satellite
+DVB dvb
+OGG ogg
+MKV mkv
+MOD mod
 X11 x11
 XVIDEO xvideo
-SDL sdl
+GLX glx
 FB fb
+MGA mga
+SDL sdl
+FREETYPE freetype
+FRIBIDI fribidi
+SVG svg
+QTE qte
+HD1000V hd1000v
+DIRECTX directx
+WINGDI wingdi
+SVGALIB svgalib
+GGI ggi
+GLIDE glide
+AA aa
+CACA caca
 OSS oss
 ESD esd
-A52 a52
+ARTS arts
+ALSA alsa
+WAVEOUT waveout
+COREAUDIO coreaudio
+HD1000A hd1000a
 MAD mad
 FFMPEG ffmpeg
+FAAD faad
+QUICKTIME quicktime
+A52 a52
+DTS dts
+FLAC flac
+LIBMPEG2 libmpeg2
+VORBIS vorbis
+TREMOR tremor
+SPEEX speex
+TARKIN tarkin
+THEORA theora
+CMML cmml
+UTF8 utf8
+PTH pth
+ST st
+GPROF gprof
+CPROF cprof
+MOZILLA mozilla
+TESTSUITE testsuite
+OPTIMIZATIONS optimizations
+ALTIVEC altivec
+DEBUG debug
+RELEASE release
+SOUT sout
+WITHFFMPEGMP3LAME ffmpeg-mp3lame
+WITHFFMPEGFAAC ffmpeg-faac
+GALAKTOS galaktos
 "
 PATHS="
-FFMPEG_TREE ffmpeg-tree
+WITHXML2CONFIGPATH xml2-config-path
+WITHWXCONFIGPATH wx-config-path
+WITHQTE qte
+WITHGOOMTREE goom-tree
+WITHSLP slp
+WITHLIVEDOTCOMTREE livedotcom-tree
+WITHDVDREAD dvdread
+WITHDVDREADTREEE dvdread-tree
+WITHDVDNAVCONFIGPATH dvdnav-config-path
+WITHDVBPSI dvbpsi
+WITHDVBPSITREE dvbpsi-tree
+WITHV4L v4l
+WITHDVB dvb
+WITHSDLCONFIGPATH sdl-config-path
+WITHSDLPREFIX sdl-prefix
+WITHFREETYPECONFIGPATH freetype-config-path
+WITHFRIBIDICONFIGPATH fribidi-config-path
+WITHQTE qte
+WITHDIRECTX directx
+WITHGGI ggi
+WITHGLIDE glide
+WITHCACACONFIGPATH caca-config-path
+WITHMAD mad
+WITHMADTREE mad-tree
+WITHFFMPEGTREE ffmpeg-tree
+WITHFAADTREE faad-tree
+WITHA52 a52
+WITHA52TREE a52-tree
+WITHDTSTREE dts-tree
+WITHLIBMPEG2TREE libmpeg2-tree
+WITHTARKINTREE tarkin-tree
+WITHMOZILLASDKPATH mozilla-sdk-path
+ENDIANNESS words
 "
 if [ ! -e .config ]
 then
    ./menuconfig
 fi
 
+if [ -e .cmd ]
+then
+   echo ".cmd still exist. Removing it."
+   rm -f .cmd
+fi
+
 echo -n "./configure " > .cmd
 source .config
 
@@ -36,9 +138,17 @@ do
    eval x="\$CONFIG_$1"
    if [ "$x" == "y" ]
    then
-      echo -n "--enable-$2 " >> .cmd
+      if [ "$1" == "WITHFFMPEGMP3LAME" ] || [ "$1" == "WITHFFMPEGFAAC" ]
+      then
+         echo -n "--with-$2 " >> .cmd
+      else
+         echo -n "--enable-$2 " >> .cmd
+      fi
    else
-      echo -n "--disable-$2 " >> .cmd
+      if [ "$1" != "WITHFFMPEGMP3LAME" ] && [ "$1" != "WITHFFMPEGFAAC" ]
+      then
+         echo -n "--disable-$2 " >> .cmd
+      fi
    fi
    shift; shift
 done
@@ -50,7 +160,10 @@ do
    if [ -n $1 ]
    then
       eval x="\$CONFIG_$1"
-      echo -n "--with-$2=$x" >> .cmd
+      if [ "$x" != "" ]
+      then
+         echo -n "--with-$2=$x " >> .cmd
+      fi
    fi
    shift; shift
 done