From b57cc610daa257d779bb5540318dbfa1b7c5d44b Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 4 Jan 2009 11:52:37 +0000 Subject: Update JACK configure test to match r28241 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28242 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 4ef38def50..8a350fd073 100755 --- a/configure +++ b/configure @@ -5242,7 +5242,7 @@ if test "$_jack" = auto ; then cat > $TMPC << EOF #include -int main(void) { jack_client_new("test"); return 0; } +int main(void) { jack_client_open("test", JackUseExactName, NULL); return 0; } EOF if cc_check -ljack ; then _libs_mplayer="$_libs_mplayer -ljack" -- cgit v1.2.3 From 143661f942e2707eb9a4fefe57576b247a7aaeb2 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 4 Jan 2009 13:05:24 +0000 Subject: Sync ARMv6t2 optimization support from FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28243 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 8a350fd073..d060f2a80a 100755 --- a/configure +++ b/configure @@ -450,6 +450,7 @@ Advanced options: --enable-altivec enable AltiVec (PowerPC) [autodetect] --enable-armv5te enable DSP extensions (ARM) [autodetect] --enable-armv6 enable ARMv6 (ARM) [autodetect] + --enable-armv6t2 enable ARMv6t2 (ARM) [autodetect] --enable-armvfp enable ARM VFP (ARM) [autodetect] --enable-iwmmxt enable iWMMXt (ARM) [autodetect] --disable-fastmemcpy disable 3DNow!/SSE/MMX optimized memcpy [enable] @@ -499,6 +500,7 @@ _cmov=auto _fast_cmov=auto _armv5te=auto _armv6=auto +_armv6t2=auto _armvfp=auto _iwmmxt=auto _mtrr=auto @@ -1266,6 +1268,8 @@ for ac_option do --disable-armv5te) _armv5te=no ;; --enable-armv6) _armv6=yes ;; --disable-armv6) _armv6=no ;; + --enable-armv6t2) _armv6t2=yes ;; + --disable-armv6t2) _armv6t2=no ;; --enable-armvfp) _armvfp=yes ;; --disable-armvfp) _armvfp=no ;; --enable-iwmmxt) _iwmmxt=yes ;; @@ -2545,6 +2549,16 @@ EOF fi echores "$_armv6" + echocheck "ARMv6t2 (SIMD instructions)" + if test $_armv6t2 = "auto" ; then + cat > $TMPC << EOF +int main(void) { __asm__ volatile ("movt r0, #0"); return 0; } +EOF + _armv6t2=no + cc_check && _armv6t2=yes + fi + echores "$_armv6" + echocheck "ARM VFP" if test $_armvfp = "auto" ; then cat > $TMPC << EOF -- cgit v1.2.3 From 5efcd82cb15de12f241b4838214fead28943734f Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 4 Jan 2009 13:08:13 +0000 Subject: Add ARMv6t2 CPU extension additions missed in previous commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28244 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index d060f2a80a..4dc69fc55b 100755 --- a/configure +++ b/configure @@ -2580,7 +2580,7 @@ EOF echores "$_iwmmxt" fi -_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEX SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMVFP IWMMXT MLIB MMI SH4 VIS MVI' +_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEX SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP IWMMXT MLIB MMI SH4 VIS MVI' test "$_altivec" = yes && _cpuexts="ALTIVEC $_cpuexts" test "$_mmx" = yes && _cpuexts="MMX $_cpuexts" test "$_mmxext" = yes && _cpuexts="MMX2 $_cpuexts" @@ -2594,6 +2594,7 @@ test "$_fast_cmov" = yes && _cpuexts="FAST_CMOV $_cpuexts" test "$pld" = yes && _cpuexts="PLD $_cpuexts" test "$_armv5te" = yes && _cpuexts="ARMV5TE $_cpuexts" test "$_armv6" = yes && _cpuexts="ARMV6 $_cpuexts" +test "$_armv6t2" = yes && _cpuexts="ARMV6T2 $_cpuexts" test "$_armvfp" = yes && _cpuexts="ARMVFP $_cpuexts" test "$_iwmmxt" = yes && _cpuexts="IWMMXT $_cpuexts" test "$_vis" = yes && _cpuexts="VIS $_cpuexts" -- cgit v1.2.3 From f3ca83902fe03e4d519a66b21bd4d08374223ae0 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 4 Jan 2009 16:01:52 +0000 Subject: EXTERN_PREFIX is not only used in FFmpeg code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28246 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 4dc69fc55b..e873a1f3fa 100755 --- a/configure +++ b/configure @@ -8285,6 +8285,7 @@ $_def_vsscanf $_def_asmalign_pot $_def_builtin_expect $_def_dl +$_def_extern_prefix $_def_iconv $_def_kstat $_def_macosx_bundle @@ -8552,7 +8553,6 @@ $_def_libswscale_a $_def_libswscale_so $_def_dcbzl -$_def_extern_prefix $def_fast_64bit $_def_fast_unaligned $_def_mkstemp -- cgit v1.2.3 From bfe2fa547fb73fec79b16d1a164388bf1282653e Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sun, 4 Jan 2009 23:41:56 +0000 Subject: Fix compilation after upcoming H264_VDPAU patch for FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28252 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index e873a1f3fa..1b982943e0 100755 --- a/configure +++ b/configure @@ -523,7 +523,7 @@ _libavcodec_a=auto _libamr_nb=auto _libamr_wb=auto _libavdecoders_all=`sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'` -_libavdecoders=` echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER// ` +_libavdecoders=` echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER// -e s/H264_VDPAU_DECODER// ` _libavencoders_all=`sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'` _libavencoders=` echo $_libavencoders_all | sed 's/ LIB[A-Z0-9_]*_ENCODER//g'` _libavparsers_all=`sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'` -- cgit v1.2.3 From 4af9bf7e02295e001a0a1b16ac77d63d543f1bb6 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 8 Jan 2009 19:28:28 +0000 Subject: Switch internal dvdread to libdvdread SVN external. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 1b982943e0..ab4136a930 100755 --- a/configure +++ b/configure @@ -5525,6 +5525,7 @@ if test "$_dvdread_internal" = auto ; then || darwin || win32; then _dvdread_internal=yes _dvdread=yes + _inc_extra="$_inc_extra -Ilibdvdread4" fi elif test "$_dvdread" = auto ; then _dvdread=no @@ -5550,7 +5551,6 @@ EOF fi if test "$_dvdread_internal" = yes; then - _def_dvdread_internal="#define CONFIG_DVDREAD_INTERNAL 1" _def_dvdread='#define CONFIG_DVDREAD 1' _inputmodules="dvdread(internal) $_inputmodules" _largefiles=yes @@ -5562,7 +5562,6 @@ elif test "$_dvdread" = yes; then _inputmodules="dvdread(external) $_inputmodules" _res_comment="external" else - _def_dvdread_internal="#undef CONFIG_DVDREAD_INTERNAL" _def_dvdread='#undef CONFIG_DVDREAD' _noinputmodules="dvdread $_noinputmodules" fi @@ -8335,7 +8334,6 @@ $_def_dvd_openbsd $_def_dvdio $_def_dvdnav $_def_dvdread -$_def_dvdread_internal $_def_hpux_scsi_h $_def_libcdio $_def_sol_scsi_h -- cgit v1.2.3 From 1ee1a271f8fd49398a182f483cf5e6811704dbc7 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 10 Jan 2009 13:51:02 +0000 Subject: Support an "internal" dvdnav version to make it easier to compile with, test and debug dvdnav SVN. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28291 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index ab4136a930..d91bdf32f7 100755 --- a/configure +++ b/configure @@ -7775,10 +7775,12 @@ fi #because libdvdnavmini is intentionally not linked against libdvdread (to permit mplayer # to use its own copy of the library) echocheck "DVD support (libdvdnav)" +dvdnav_internal=no if test "$_dvdnav" = auto ; then if test "$_dvdread_internal" = yes ; then - _dvdnav=no - _res_comment="Disabled in favor of the internal copy of dvdread. Append --disable-dvdread-internal." + _dvdnav=yes + dvdnav_internal=yes + _res_comment="internal" else $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no fi @@ -7797,8 +7799,12 @@ fi if test "$_dvdnav" = yes ; then _largefiles=yes _def_dvdnav='#define CONFIG_DVDNAV 1' + if test "$dvdnav_internal" = yes ; then + _inc_extra="$_inc_extra -Ilibdvdnav" + else _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`" _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`" + fi _inputmodules="dvdnav $_inputmodules" else _def_dvdnav='#undef CONFIG_DVDNAV' @@ -7975,6 +7981,7 @@ DIRECTFB = $_directfb DIRECTX = $_directx DVBIN = $_dvbin DVDNAV = $_dvdnav +DVDNAV_INTERNAL = $dvdnav_internal DVDREAD = $_dvdread DVDREAD_INTERNAL = $_dvdread_internal DXR2 = $_dxr2 -- cgit v1.2.3 From f5676d066b20965602cee6aed93f6690c74b4564 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 10 Jan 2009 13:57:33 +0000 Subject: Reindent for "if" added in internal dvdnav patch git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28292 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index d91bdf32f7..929a939f1c 100755 --- a/configure +++ b/configure @@ -7802,8 +7802,8 @@ if test "$_dvdnav" = yes ; then if test "$dvdnav_internal" = yes ; then _inc_extra="$_inc_extra -Ilibdvdnav" else - _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`" - _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`" + _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`" + _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`" fi _inputmodules="dvdnav $_inputmodules" else -- cgit v1.2.3 From 9c46f5530c5ab032eab756beacdd02b5654a326d Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 11 Jan 2009 11:16:20 +0000 Subject: Only print "using XYZ" comment if XYZ has been set. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28295 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 929a939f1c..404e83e4f7 100755 --- a/configure +++ b/configure @@ -2891,7 +2891,7 @@ if test "$_winsock2_h" = yes ; then elif cc_check $_ld_sock ; then # NOTE: Linux has libresolv but does not need it : - _res_comment="using $_ld_sock" + test $_ld_sock && _res_comment="using $_ld_sock" echores "yes" elif cc_check $_ld_sock -lresolv ; then # NOTE: needed for SunOS at least @@ -2913,7 +2913,7 @@ EOF if cc_check $_ld_sock ; then # NOTE: Linux has libresolv but does not need it : - _res_comment="using $_ld_sock" + test $_ld_sock && _res_comment="using $_ld_sock" elif cc_check $_ld_sock -lresolv ; then # NOTE: needed for SunOS at least _ld_sock="$_ld_sock -lresolv" @@ -3151,7 +3151,7 @@ if ! hpux ; then fi fi if test "$_pthreads" = yes ; then - _res_comment="using $_ld_pthread" + test $_ld_pthread && _res_comment="using $_ld_pthread" _def_pthreads='#define HAVE_PTHREADS 1' _def_threads='#define HAVE_THREADS 1' else @@ -3396,7 +3396,7 @@ EOF fi if test "$_termcap" = yes ; then _def_termcap='#define HAVE_TERMCAP 1' - _res_comment="using $_ld_tmp" + test $_ld_tmp && _res_comment="using $_ld_tmp" else _def_termcap='#undef HAVE_TERMCAP' fi @@ -6500,7 +6500,7 @@ EOF fi fi if test "$_live" = yes && test "$_network" = yes; then - _res_comment="using $_livelibdir" + test $_livelibdir && _res_comment="using $_livelibdir" _def_live='#define CONFIG_LIVE555 1' _inputmodules="live555 $_inputmodules" elif test "$_live_dist" = yes && test "$_network" = yes; then -- cgit v1.2.3 From ebd030116fd8c6179cfb69e4b75514f32aa7c827 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 11 Jan 2009 11:28:01 +0000 Subject: console output cosmetics git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28296 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 404e83e4f7..1cc7539d49 100755 --- a/configure +++ b/configure @@ -3414,7 +3414,7 @@ if test "$_termios" = auto ; then #include <$_termios_header> int main(void) { return 0; } EOF - cc_check && _termios=yes && _res_comment="$_termios_header" && break + cc_check && _termios=yes && _res_comment="using $_termios_header" && break done fi @@ -5740,7 +5740,7 @@ echores "$_freetype" if test "$_freetype" = no ; then _fontconfig=no - _res_comment="freetype support needed" + _res_comment="FreeType support needed" fi echocheck "fontconfig" if test "$_fontconfig" = auto ; then @@ -6976,7 +6976,7 @@ echores "$_zr" # mencoder requires (optional) those libs: libmp3lame if test "$_mencoder" != no ; then -echocheck "libmp3lame (for mencoder)" +echocheck "libmp3lame" _def_mp3lame_preset='#undef CONFIG_MP3LAME_PRESET' _def_mp3lame_preset_medium='#undef CONFIG_MP3LAME_PRESET_MEDIUM' if test "$_mp3lame" = auto ; then -- cgit v1.2.3 From 7daf30cd9c12fcd86791cd062ba5141241c6394b Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 11 Jan 2009 12:58:06 +0000 Subject: cosmetics: Move some checks to more logical places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28298 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 170 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 87 insertions(+), 83 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 1cc7539d49..2cde77b630 100755 --- a/configure +++ b/configure @@ -2977,6 +2977,53 @@ else fi echores "$_network" + +echocheck "inet6" +if test "$_inet6" = auto ; then + cat > $TMPC << EOF +#include +#if !defined(_WIN32) || defined(__CYGWIN__) +#include +#include +#else +#include +#endif +int main(void) { struct sockaddr_in6 six; socket(AF_INET6, SOCK_STREAM, AF_INET6); return 0; } +EOF + _inet6=no + if cc_check $_ld_sock ; then + _inet6=yes + fi +fi +if test "$_inet6" = yes ; then + _def_inet6='#define HAVE_AF_INET6 1' +else + _def_inet6='#undef HAVE_AF_INET6' +fi +echores "$_inet6" + + +echocheck "gethostbyname2" +if test "$_gethostbyname2" = auto ; then +cat > $TMPC << EOF +#include +#include +#include +int main(void) { gethostbyname2("", AF_INET); return 0; } +EOF + _gethostbyname2=no + if cc_check ; then + _gethostbyname2=yes + fi +fi +if test "$_gethostbyname2" = yes ; then + _def_gethostbyname2='#define HAVE_GETHOSTBYNAME2 1' +else + _def_gethostbyname2='#undef HAVE_GETHOSTBYNAME2' +fi +echores "$_gethostbyname2" + + echocheck "inttypes.h (required)" cat > $TMPC << EOF #include @@ -3074,6 +3121,16 @@ fi echores "$_alloca" +echocheck "fastmemcpy" +# fastmemcpy check is done earlier with tests of CPU & binutils features +if test "$_fastmemcpy" = yes ; then + _def_fastmemcpy='#define CONFIG_FASTMEMCPY 1' +else + _def_fastmemcpy='#undef CONFIG_FASTMEMCPY' +fi +echores "$_fastmemcpy" + + echocheck "mman.h" cat > $TMPC << EOF #include @@ -3517,6 +3574,15 @@ _def_posix_select='#undef HAVE_POSIX_SELECT' echores "$_posix_select" +echocheck "audio select()" +if test "$_select" = no ; then + _def_select='#undef HAVE_AUDIO_SELECT' +elif test "$_select" = yes ; then + _def_select='#define HAVE_AUDIO_SELECT 1' +fi +echores "$_select" + + echocheck "gettimeofday()" cat > $TMPC << EOF #include @@ -4988,25 +5054,6 @@ echores "$_directx" fi #if win32; then -echocheck "NAS" -if test "$_nas" = auto ; then - cat > $TMPC << EOF -#include