summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure237
1 files changed, 3 insertions, 234 deletions
diff --git a/configure b/configure
index ce5faaf432..ae0447bd50 100755
--- a/configure
+++ b/configure
@@ -49,9 +49,9 @@ compile_check() {
echo >> "$TMPLOG"
cat "$source" >> "$TMPLOG"
echo >> "$TMPLOG"
- echo "$_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS $source $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG"
+ echo "$_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS $source $extra_cflags $_ld_static $extra_ldflags $libs_mplayer -o $TMPEXE $@" >> "$TMPLOG"
rm -f "$TMPEXE"
- $_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS "$source" $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
+ $_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS "$source" $extra_cflags $_ld_static $extra_ldflags $libs_mplayer -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
TMPRES="$?"
echo >> "$TMPLOG"
echo >> "$TMPLOG"
@@ -336,10 +336,8 @@ Codecs:
--disable-xanim disable XAnim codecs support [enabled]
--disable-real disable RealPlayer codecs support [enabled]
--disable-xvid disable Xvid [autodetect]
- --disable-x264 disable x264 [autodetect]
--disable-libnut disable libnut [autodetect]
- --disable-ffmpeg_a disable static FFmpeg [autodetect]
- --disable-ffmpeg_so disable shared FFmpeg [autodetect]
+ --disable-ffmpeg disable FFmpeg [autodetect]
--disable-tremor-internal disable internal Tremor [enabled]
--enable-tremor-low enable lower accuracy internal Tremor [disabled]
--enable-tremor enable external Tremor [autodetect]
@@ -349,15 +347,11 @@ Codecs:
--enable-faad enable external FAAD2 (AAC) [autodetect]
--disable-faad-internal disable internal FAAD2 (AAC) [autodetect]
--enable-faad-fixed enable fixed-point mode in internal FAAD2 [disabled]
- --disable-faac disable support for FAAC (AAC encoder) [autodetect]
--disable-ladspa disable LADSPA plugin support [autodetect]
--disable-libbs2b disable libbs2b audio filter support [autodetect]
--disable-libdv disable libdv 0.9.5 en/decoding support [autodetect]
--disable-mpg123 disable libmpg123 MP3 decoding support [autodetect]
--disable-mad disable libmad (MPEG audio) support [autodetect]
- --disable-mp3lame disable LAME MP3 encoding support [autodetect]
- --disable-toolame disable Toolame (MPEG layer 2) encoding [autodetect]
- --disable-twolame disable Twolame (MPEG layer 2) encoding [autodetect]
--enable-xmms enable XMMS input plugin support [disabled]
--enable-libdca enable libdca support [autodetect]
--disable-mp3lib disable builtin mp3lib [autodetect]
@@ -403,7 +397,6 @@ Video output:
--enable-xshape enable XShape support [autodetect]
--disable-xss disable screensaver support via xss [autodetect]
--enable-fbdev enable FBDev video output [autodetect]
- --enable-mlib enable mediaLib video output (Solaris) [disable]
--enable-3dfx enable obsolete /dev/3dfx video output [disable]
--enable-tdfxfb enable tdfxfb video output [disable]
--enable-s3fb enable s3fb (S3 ViRGE) video output [disable]
@@ -552,7 +545,6 @@ _cross_compile=auto
_prefix="/usr/local"
ffmpeg=auto
ffmpeg_internals=no
-_mencoder=no
_mplayer=yes
_x11=auto
_xshape=auto
@@ -603,9 +595,6 @@ _openal=no
_libcdio=auto
_liblzo=auto
_mad=auto
-_mp3lame=auto
-_toolame=auto
-_twolame=auto
_tremor=auto
_tremor_internal=yes
_tremor_low=no
@@ -620,7 +609,6 @@ _libmpeg2=auto
_faad=auto
_faad_internal=auto
_faad_fixed=no
-_faac=auto
_ladspa=auto
_libbs2b=auto
_xmms=no
@@ -642,7 +630,6 @@ _mga=auto
_xmga=auto
_vm=auto
_xf86keysym=auto
-_mlib=no #broken, thus disabled
_sgiaudio=auto
_sunaudio=auto
_alsa=auto
@@ -670,7 +657,6 @@ _dhahelper=no
_svgalib_helper=no
_joystick=no
_xvid=auto
-_x264=auto
_libnut=auto
_lirc=auto
_lircc=auto
@@ -970,12 +956,6 @@ for ac_option do
--disable-dart) _dart=no ;;
--enable-mad) _mad=yes ;;
--disable-mad) _mad=no ;;
- --enable-mp3lame) _mp3lame=yes ;;
- --disable-mp3lame) _mp3lame=no ;;
- --enable-toolame) _toolame=yes ;;
- --disable-toolame) _toolame=no ;;
- --enable-twolame) _twolame=yes ;;
- --disable-twolame) _twolame=no ;;
--enable-libcdio) _libcdio=yes ;;
--disable-libcdio) _libcdio=no ;;
--enable-liblzo) _liblzo=yes ;;
@@ -1010,8 +990,6 @@ for ac_option do
--disable-faad-internal) _faad_internal=no ;;
--enable-faad-fixed) _faad_fixed=yes ;;
--disable-faad-fixed) _faad_fixed=no ;;
- --enable-faac) _faac=yes ;;
- --disable-faac) _faac=no ;;
--enable-ladspa) _ladspa=yes ;;
--disable-ladspa) _ladspa=no ;;
--enable-libbs2b) _libbs2b=yes ;;
@@ -1048,8 +1026,6 @@ for ac_option do
--disable-vm) _vm=no ;;
--enable-xf86keysym) _xf86keysym=yes ;;
--disable-xf86keysym) _xf86keysym=no ;;
- --enable-mlib) _mlib=yes ;;
- --disable-mlib) _mlib=no ;;
--enable-sunaudio) _sunaudio=yes ;;
--disable-sunaudio) _sunaudio=no ;;
--enable-sgiaudio) _sgiaudio=yes ;;
@@ -1100,8 +1076,6 @@ for ac_option do
--disable-joystick) _joystick=no ;;
--enable-xvid) _xvid=yes ;;
--disable-xvid) _xvid=no ;;
- --enable-x264) _x264=yes ;;
- --disable-x264) _x264=no ;;
--enable-libnut) _libnut=yes ;;
--disable-libnut) _libnut=no ;;
--enable-ffmpeg) ffmpeg=yes ;;
@@ -5376,18 +5350,6 @@ fi
echores "$_sunaudio"
-def_mlib='#define CONFIG_MLIB 0'
-if sunos; then
-echocheck "Sun mediaLib"
-if test "$_mlib" = auto ; then
- _mlib=no
- cc_check mlib.h "mlib_VideoColorYUV2ABGR420(0, 0, 0, 0, 0, 0, 0, 0, 0)" -lmlib &&
- _mlib=yes && def_mlib='#define CONFIG_MLIB 1'
-fi
-echores "$_mlib"
-fi #if sunos
-
-
if darwin; then
echocheck "CoreAudio"
if test "$_coreaudio" = auto ; then
@@ -5922,43 +5884,6 @@ else
fi
echores "$_mad"
-echocheck "Twolame"
-if test "$_twolame" = auto ; then
- _twolame=no
- statement_check twolame.h 'twolame_init()' -ltwolame $_ld_lm && _twolame=yes
-fi
-if test "$_twolame" = yes ; then
- def_twolame='#define CONFIG_TWOLAME 1'
- libs_mencoder="$libs_mencoder -ltwolame"
- codecmodules="twolame $codecmodules"
-else
- def_twolame='#undef CONFIG_TWOLAME'
- nocodecmodules="twolame $nocodecmodules"
-fi
-echores "$_twolame"
-
-echocheck "Toolame"
-if test "$_toolame" = auto ; then
- _toolame=no
-if test "$_twolame" = yes ; then
- res_comment="disabled by twolame"
-else
- statement_check toolame.h 'toolame_init()' -ltoolame $_ld_lm && _toolame=yes
-fi
-fi
-if test "$_toolame" = yes ; then
- def_toolame='#define CONFIG_TOOLAME 1'
- libs_mencoder="$libs_mencoder -ltoolame"
- codecmodules="toolame $codecmodules"
-else
- def_toolame='#undef CONFIG_TOOLAME'
- nocodecmodules="toolame $nocodecmodules"
-fi
-if test "$_toolamedir" ; then
- res_comment="using $_toolamedir"
-fi
-echores "$_toolame"
-
echocheck "OggVorbis support"
if test "$_tremor_internal" = yes; then
_libvorbis=no
@@ -6199,28 +6124,6 @@ fi
echores "$_musepack"
-echocheck "FAAC support"
-if test "$_faac" = auto ; then
- cat > $TMPC <<EOF
-#include <inttypes.h>
-#include <faac.h>
-int main(void) { unsigned long x, y; faacEncOpen(48000, 2, &x, &y); return 0; }
-EOF
- _faac=no
- for _ld_faac in "-lfaac" "-lfaac -lmp4v2 -lstdc++" ; do
- cc_check $_ld_faac $_ld_lm && libs_mencoder="$libs_mencoder $_ld_faac" && _faac=yes && break
- done
-fi
-if test "$_faac" = yes ; then
- def_faac="#define CONFIG_FAAC 1"
- codecmodules="faac $codecmodules"
-else
- def_faac="#undef CONFIG_FAAC"
- nocodecmodules="faac $nocodecmodules"
-fi
-echores "$_faac"
-
-
echocheck "FAAD2 support"
if test "$_faad_internal" = auto ; then
if x86_32 && test cc_vendor=gnu; then
@@ -6571,30 +6474,6 @@ else
fi
echores "$_xvid"
-echocheck "x264"
-if test "$_x264" = auto ; then
- cat > $TMPC << EOF
-#include <inttypes.h>
-#include <x264.h>
-#if X264_BUILD < 98
-#error We do not support old versions of x264. Get the latest from git.
-#endif
-int main(void) { x264_encoder_open((void*)0); return 0; }
-EOF
- _x264=no
- for _ld_x264 in "-lx264 $_ld_pthread" "-lx264 $_ld_pthread $_ld_lm" ; do
- cc_check $_ld_x264 && libs_mencoder="$libs_mencoder $_ld_x264" && _x264=yes && break
- done
-fi
-
-if test "$_x264" = yes ; then
- def_x264='#define CONFIG_X264 1'
- codecmodules="x264 $codecmodules"
-else
- def_x264='#undef CONFIG_X264'
- nocodecmodules="x264 $nocodecmodules"
-fi
-echores "$_x264"
echocheck "libnut"
if test "$_libnut" = auto ; then
@@ -6670,42 +6549,6 @@ else
fi
echores "$_zr"
-# mencoder requires (optional) those libs: libmp3lame
-if test "$_mencoder" != no ; then
-
-echocheck "libmp3lame"
-def_mp3lame='#undef CONFIG_MP3LAME'
-def_mp3lame_preset='#undef CONFIG_MP3LAME_PRESET'
-def_mp3lame_preset_medium='#undef CONFIG_MP3LAME_PRESET_MEDIUM'
-if test "$_mp3lame" = auto ; then
- _mp3lame=no
- cat > $TMPC <<EOF
-#include <lame/lame.h>
-int main(void) { lame_version_t lv; lame_init();
- get_lame_version_numerical(&lv);
- return 0; }
-EOF
- cc_check -lmp3lame $_ld_lm && _mp3lame=yes
-fi
-if test "$_mp3lame" = yes ; then
- def_mp3lame="#define CONFIG_MP3LAME 1"
- _ld_mp3lame=-lmp3lame
- libs_mencoder="$libs_mencoder $_ld_mp3lame"
- statement_check lame/lame.h 'lame_set_preset(NULL, STANDARD_FAST)' $_ld_mp3lame $_ld_lm && def_mp3lame_preset="#define CONFIG_MP3LAME_PRESET 1"
- statement_check lame/lame.h 'lame_set_preset(NULL, MEDIUM_FAST)' $_ld_mp3lame $_ld_lm && def_mp3lame_preset_medium="#define CONFIG_MP3LAME_PRESET_MEDIUM 1"
-fi
-echores "$_mp3lame"
-
-fi # test "$_mencoder" != no
-
-echocheck "mencoder"
-if test "$_mencoder" = yes ; then
- def_muxers='#define CONFIG_MUXERS 1'
-else
- def_muxers='#define CONFIG_MUXERS 0'
-fi
-echores "$_mencoder"
-
echocheck "UnRAR executable"
if test "$_unrar_exec" = auto ; then
@@ -7172,19 +7015,6 @@ if os2 ; then
extra_ldflags="$extra_ldflags -Zomf -Zstack 16384 -Zbin-files -Zargs-wild"
fi
-# linker paths should be the same for mencoder and mplayer
-_ld_tmp=""
-for I in $libs_mplayer ; do
- _tmp=$(echo $I | sed -e 's/^-L.*$//')
- if test -z "$_tmp" ; then
- extra_ldflags="$extra_ldflags $I"
- else
- _ld_tmp="$_ld_tmp $I"
- fi
-done
-libs_mplayer=$_ld_tmp
-
-
#############################################################################
# 64 bit file offsets?
if test "$_largefiles" = yes || freebsd ; then
@@ -7304,7 +7134,6 @@ CFLAGS_TREMOR_LOW = $cflags_tremor_low
EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs
EXTRALIBS_MPLAYER = $libs_mplayer
-EXTRALIBS_MENCODER = $libs_mencoder
GETCH = $_getch
TIMER = $_timer
@@ -7317,7 +7146,6 @@ $(mak_enable "$arch_all" "$arch" ARCH)
$(mak_enable "$subarch_all" "$subarch" ARCH)
$(mak_enable "$cpuexts_all" "$cpuexts" HAVE)
-MENCODER = $_mencoder
MPLAYER = $_mplayer
NEED_GETTIMEOFDAY = $_need_gettimeofday
@@ -7359,7 +7187,6 @@ DVDREAD_INTERNAL = $_dvdread_internal
DXR2 = $_dxr2
DXR3 = $_dxr3
ESD = $_esd
-FAAC=$_faac
FAAD = $_faad
FAAD_INTERNAL = $_faad_internal
FASTMEMCPY = $_fastmemcpy
@@ -7404,7 +7231,6 @@ MACOSX_FINDER = $_macosx_finder
MD5SUM = $_md5sum
MGA = $_mga
MNG = $_mng
-MP3LAME = $_mp3lame
MP3LIB = $_mp3lib
MPG123 = $_mpg123
MUSEPACK = $_musepack
@@ -7436,7 +7262,6 @@ SVGA = $_svga
TDFXFB = $_tdfxfb
TDFXVID = $_tdfxvid
TGA = $_tga
-TOOLAME=$_toolame
TREMOR_INTERNAL = $_tremor_internal
TV = $_tv
TV_BSDBT848 = $_tv_bsdbt848
@@ -7444,7 +7269,6 @@ TV_DSHOW = $_tv_dshow
TV_V4L = $_tv_v4l
TV_V4L1 = $_tv_v4l1
TV_V4L2 = $_tv_v4l2
-TWOLAME=$_twolame
UNRAR_EXEC = $_unrar_exec
V4L2 = $_v4l2
VCD = $_vcd
@@ -7474,7 +7298,6 @@ WIN32WAVEOUT = $_win32waveout
WIN32_EMULATION = $_win32_emulation
WINVIDIX = $winvidix
X11 = $_x11
-X264 = $_x264
XANIM_CODECS = $_xanim
XMGA = $_xmga
XMMS_PLUGINS = $_xmms
@@ -7496,20 +7319,7 @@ RANLIB = $_ranlib
YASM = $_yasm
YASMFLAGS = $YASMFLAGS
-# Some FFmpeg codecs depend on these. Enable them unconditionally for now.
-CONFIG_AANDCT = yes
-CONFIG_FFT = yes
-CONFIG_GOLOMB = yes
-CONFIG_H264DSP = yes
-CONFIG_LPC = yes
-CONFIG_MDCT = yes
-CONFIG_RDFT = yes
-
CONFIG_BZLIB = $bzlib
-CONFIG_ENCODERS = yes
-CONFIG_GPL = yes
-CONFIG_MLIB = $_mlib
-CONFIG_MUXERS = $_mencoder
CONFIG_VDPAU = $_vdpau
CONFIG_XVMC = $_xvmc
CONFIG_ZLIB = $_zlib
@@ -7711,7 +7521,6 @@ $def_vcd
/* codec libraries */
-$def_faac
$def_faad
$def_faad_internal
$def_liba52
@@ -7720,19 +7529,13 @@ $def_libdv
$def_liblzo
$def_libmpeg2
$def_mad
-$def_mp3lame
-$def_mp3lame_preset
-$def_mp3lame_preset_medium
$def_mp3lib
$def_mpg123
$def_musepack
$def_speex
$def_theora
-$def_toolame
$def_tremor
-$def_twolame
$def_vorbis
-$def_x264
$def_xvid
$def_zlib
@@ -7904,11 +7707,6 @@ $def_ffmpeg
$def_ffmpeg_eval_api
$def_ffmpeg_internals
-#define CONFIG_DECODERS 1
-#define CONFIG_ENCODERS 1
-#define CONFIG_DEMUXERS 1
-$def_muxers
-
$def_arpa_inet_h
$def_bswap
$def_bzlib
@@ -7922,7 +7720,6 @@ $def_log2
$def_log2f
$def_lrint
$def_memalign_hack
-$def_mlib
$def_mkstemp
$def_posix_memalign
$def_pthreads
@@ -7934,35 +7731,7 @@ $def_truncf
$def_xform_asm
$def_yasm
-#define CONFIG_FASTDIV 0
-#define CONFIG_FFSERVER 0
-#define CONFIG_GPL 1
-#define CONFIG_GRAY 0
-#define CONFIG_HARDCODED_TABLES 0
-#define CONFIG_LIBVORBIS 0
-#define CONFIG_POWERPC_PERF 0
-#define CONFIG_SMALL 0
-#define CONFIG_SWSCALE_ALPHA 1
-
-#define HAVE_ATTRIBUTE_PACKED 1
-#define HAVE_GETHRTIME 0
#define HAVE_INLINE_ASM 1
-#define HAVE_LDBRX 0
-#define HAVE_POLL_H 1
-#define HAVE_PPC4XX 0
-#define HAVE_VFP_ARGS 1
-#define HAVE_VIRTUALALLOC 0
-
-/* Some FFmpeg codecs depend on these. Enable them unconditionally for now. */
-#define CONFIG_AANDCT 1
-#define CONFIG_DCT 1
-#define CONFIG_DWT 1
-#define CONFIG_FFT 1
-#define CONFIG_GOLOMB 1
-#define CONFIG_H264DSP 1
-#define CONFIG_LPC 1
-#define CONFIG_MDCT 1
-#define CONFIG_RDFT 1
/* Use these registers in FFmpeg x86 inline asm. No proper detection yet. */
#ifndef MP_DEBUG