From 5423c418c257bca03b44db285797b0a82fb72f84 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 16 May 2008 09:42:28 +0000 Subject: cosmetics: Remove useless parentheses from return statements. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index c6d649deed..bede9a9006 100755 --- a/configure +++ b/configure @@ -1565,7 +1565,7 @@ if x86 && test "$_runtime_cpudetection" = no ; then void catch() { exit(1); } int main(void) { signal(SIGILL, catch); - __asm__ __volatile__ ("$3":::"memory");return(0); + __asm__ __volatile__ ("$3":::"memory"); return 0; } EOF @@ -4512,7 +4512,7 @@ cat > $TMPC << EOF int main(void) { printf("png.h : %s\n", PNG_LIBPNG_VER_STRING); printf("libpng: %s\n", png_libpng_ver); - return (strcmp(PNG_LIBPNG_VER_STRING, png_libpng_ver)); + return strcmp(PNG_LIBPNG_VER_STRING, png_libpng_ver); } EOF if cc_check -lpng -lz $_ld_lm ; then -- cgit v1.2.3 From dc6d14fb1b20e86cc24c6fbe5ce239566e5d588e Mon Sep 17 00:00:00 2001 From: ben Date: Sun, 18 May 2008 11:53:00 +0000 Subject: Add support for AppleIR Remote as an input under Linux systems. This requires Linux 2.6 with evdev and appleir drivers. The keymapping is done to mimics the one that was done for MacOSX. WARNING: Most distributions do not seems to bother and only let root access to the device. Modify udev rules accordingly if you want regular user to be able to use the remote. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26795 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'configure') diff --git a/configure b/configure index bede9a9006..fbb02c7a1d 100755 --- a/configure +++ b/configure @@ -229,6 +229,7 @@ Optional features: --enable-lircc enable LIRCCD (LIRC client daemon) input [autodetect] --enable-joystick enable joystick support [disable] --enable-apple-remote enable Apple Remote input (Mac OS X only) [autodetect] + --enable-apple-ir enable Apple IR Remote input (Linux only) [autodetect] --disable-vm disable X video mode extensions [autodetect] --disable-xf86keysym disable support for multimedia keys [autodetect] --enable-radio enable radio interface [disable] @@ -630,6 +631,7 @@ _libnut=auto _lirc=auto _lircc=auto _apple_remote=auto +_apple_ir=auto _gui=no _gtk1=no _termcap=auto @@ -1073,6 +1075,8 @@ for ac_option do --disable-lircc) _lircc=no ;; --enable-apple-remote) _apple_remote=yes ;; --disable-apple-remote) _apple_remote=no ;; + --enable-apple-ir) _apple_ir=yes ;; + --disable-apple-ir) _apple_ir=no ;; --enable-gui) _gui=yes ;; --disable-gui) _gui=no ;; --enable-gtk1) _gtk1=yes ;; @@ -3604,6 +3608,27 @@ echores "$_apple_remote" fi #if darwin +if linux; then + +echocheck "Apple IR" +if test "$_apple_ir" = auto ; then + _apple_ir=no + cat > $TMPC < +int main(void) { + struct input_event ev; + return 0; +} +EOF + cc_check && tmp_run && _apple_ir=yes +fi +if test "$_apple_ir" = yes ; then + _def_apple_ir='#define HAVE_APPLE_IR 1' +else + _def_apple_ir='#undef HAVE_APPLE_IR' +fi +echores "$_apple_ir" +fi #if linux echocheck "pkg-config" _pkg_config=pkg-config @@ -7640,6 +7665,7 @@ LADSPA = $_ladspa JOYSTICK = $_joystick LIRC = $_lirc APPLE_REMOTE = $_apple_remote +APPLE_IR = $_apple_ir TV = $_tv TV_V4L = $_tv_v4l TV_V4L1 = $_tv_v4l1 @@ -8050,6 +8076,9 @@ $_def_lirc /* Apple Remote (remote control, see http://docs.info.apple.com/article.html?artnum=302504) support: */ $_def_apple_remote +/* Apple IR Remote (Linux remote control driver) */ +$_def_apple_ir + /* Support for maemo (http://www.maemo.org) */ $_def_maemo -- cgit v1.2.3 From ed2e3a2199f6ee39ab7c85923d9746a711b65f6c Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 15:49:31 +0000 Subject: 10l: Add missing parentheses in AltiVec test logic. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26807 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index fbb02c7a1d..b9ef99b936 100755 --- a/configure +++ b/configure @@ -2424,7 +2424,7 @@ int main(void) { return 0; } EOF cc_check -maltivec -mabi=altivec \ && _altivec_gcc_flags="-maltivec -mabi=altivec" \ - || cc_check -faltivec && _altivec_gcc_flags=-faltivec \ + || ( cc_check -faltivec && _altivec_gcc_flags=-faltivec ) \ || _altivec=no echores "$_altivec_gcc_flags" -- cgit v1.2.3 From 049d820592abd5ac25d0fa8167ee49df3c28f8a6 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 16:25:20 +0000 Subject: Introduce make variable common to the GTK and Windows GUI and use it in the appropriate places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26817 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index b9ef99b936..bf1ab7c778 100755 --- a/configure +++ b/configure @@ -7739,6 +7739,7 @@ TARGET_CPU=$iproc `echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'` # --- GUI stuff --- +GUI = $_gui GUI_GTK = $_gui_gtk GUI_WIN32 = $_gui_win32 -- cgit v1.2.3 From 32fc1074a6843511e14927599b268184964afca8 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 16:40:20 +0000 Subject: Split MAN_LANG Makefile variable into MAN_LANG and MAN_LANG_ALL with MAN_LANG only containing the translated languages. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26818 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index bf1ab7c778..c70bb17754 100755 --- a/configure +++ b/configure @@ -2593,12 +2593,13 @@ _mp_help="help/help_mp-${_language}.h" test -f $_mp_help || die "$_mp_help not found" for lang in $LANGUAGES ; do if test -f "DOCS/man/$lang/mplayer.1" ; then - MAN_LANG="$lang $MAN_LANG" + MAN_LANG_ALL="$lang $MAN_LANG_ALL" fi done +MAN_LANG="$(echo $MAN_LANG_ALL | sed s/en //)" _doc_lang=$_language test -d DOCS/xml/$_doc_lang || _doc_lang=en -echores "using $_language (man pages: $MAN_LANG)" +echores "using $_language (man pages: $MAN_LANG_ALL)" echocheck "enable sighandler" @@ -7567,6 +7568,7 @@ cat > config.mak << EOF LANG = C MAN_LANG = $MAN_LANG +MAN_LANG_ALL = $MAN_LANG_ALL TARGET_OS = $system_name DESTDIR = prefix = \$(DESTDIR)$_prefix @@ -8570,7 +8572,7 @@ Config files successfully generated by ./configure $_configuration ! Messages/GUI: $_language EOF -echo ${_echo_n} " Manual pages: $MAN_LANG ${_echo_c}" +echo ${_echo_n} " Manual pages: $MAN_LANG_ALL ${_echo_c}" test "$LANGUAGES" = en && echo ${_echo_n} " (no localization selected, use --language=all)${_echo_c}" echo -- cgit v1.2.3 From ea41342f766ddd717ad8cedaab7669583476ebe6 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 17:22:53 +0000 Subject: 10l: missing quotes in sed command git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26824 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index c70bb17754..6d3a1987fe 100755 --- a/configure +++ b/configure @@ -2596,7 +2596,7 @@ for lang in $LANGUAGES ; do MAN_LANG_ALL="$lang $MAN_LANG_ALL" fi done -MAN_LANG="$(echo $MAN_LANG_ALL | sed s/en //)" +MAN_LANG="$(echo $MAN_LANG_ALL | sed 's/en //')" _doc_lang=$_language test -d DOCS/xml/$_doc_lang || _doc_lang=en echores "using $_language (man pages: $MAN_LANG_ALL)" -- cgit v1.2.3 From 700a3f74c5312c92baba29cd5d1f5e759c824dbb Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 17:32:51 +0000 Subject: 10l: Fix MAN_LANG creation for real this time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26825 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 6d3a1987fe..54cdfff004 100755 --- a/configure +++ b/configure @@ -2596,7 +2596,7 @@ for lang in $LANGUAGES ; do MAN_LANG_ALL="$lang $MAN_LANG_ALL" fi done -MAN_LANG="$(echo $MAN_LANG_ALL | sed 's/en //')" +MAN_LANG="$(echo $MAN_LANG_ALL | sed 's/en//')" _doc_lang=$_language test -d DOCS/xml/$_doc_lang || _doc_lang=en echores "using $_language (man pages: $MAN_LANG_ALL)" -- cgit v1.2.3 From aaf66caefd847a10eda1a3e742a54bdc627fcc58 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 19:05:52 +0000 Subject: Only run AltiVec compiler tests on PowerPC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26830 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 54cdfff004..9961d40703 100755 --- a/configure +++ b/configure @@ -2415,7 +2415,7 @@ echores $_asmalign_pot #FIXME: This should happen before the check for CFLAGS.. -if test "$_altivec" = yes || test "$_runtime_cpudetection" = yes ; then +if ppc && ( test "$_altivec" = yes || test "$_runtime_cpudetection" = yes ) ; then # check if AltiVec is supported by the compiler, and how to enable it echocheck "GCC AltiVec flags" -- cgit v1.2.3 From 955495414e51fe1aff47e76d9fd18edcabd4e4d3 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 May 2008 23:16:30 +0000 Subject: Replace hack to disable iconv conversion of messages with something more sane. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26831 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 9961d40703..e8daf4c03d 100755 --- a/configure +++ b/configure @@ -7330,12 +7330,7 @@ else _def_charset="#undef MSG_CHARSET" fi -if test "$_charset" = "UTF-8" ; then - # hack to disable conversion in the Makefile - _charset="" -fi - -if test "$_charset" ; then +if test "$_charset" != "UTF-8" ; then echocheck "iconv program" iconv -f UTF-8 -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG" if test "$?" -ne 0 ; then -- cgit v1.2.3 From a2fda39c21217c6bfe964e765a9c5015af42a46b Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 19 May 2008 05:40:19 +0000 Subject: Do not run second AltiVec CFLAG check in a subshell; the variable that is set as a result is needed in the calling shell. noticed by Michael Kostylev git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26837 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index e8daf4c03d..16082cac3d 100755 --- a/configure +++ b/configure @@ -2424,7 +2424,7 @@ int main(void) { return 0; } EOF cc_check -maltivec -mabi=altivec \ && _altivec_gcc_flags="-maltivec -mabi=altivec" \ - || ( cc_check -faltivec && _altivec_gcc_flags=-faltivec ) \ + || { cc_check -faltivec && _altivec_gcc_flags=-faltivec ; } \ || _altivec=no echores "$_altivec_gcc_flags" -- cgit v1.2.3 From a560f8430154de311d3b7c0de39d90205ee8e479 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 19 May 2008 05:41:49 +0000 Subject: Output a better informative message if no AltiVec CFLAGS can be found. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26838 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 16082cac3d..d65f1bebd4 100755 --- a/configure +++ b/configure @@ -2425,7 +2425,7 @@ EOF cc_check -maltivec -mabi=altivec \ && _altivec_gcc_flags="-maltivec -mabi=altivec" \ || { cc_check -faltivec && _altivec_gcc_flags=-faltivec ; } \ - || _altivec=no + || { _altivec=no && _altivec_gcc_flags="none, AltiVec disabled" ; } echores "$_altivec_gcc_flags" # check if should be included -- cgit v1.2.3 From e3755edad5ad65ad302f4698042dd76aec97c1c3 Mon Sep 17 00:00:00 2001 From: ben Date: Tue, 20 May 2008 20:51:22 +0000 Subject: add potentially missing types git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26841 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index d65f1bebd4..5771169a57 100755 --- a/configure +++ b/configure @@ -3615,6 +3615,7 @@ echocheck "Apple IR" if test "$_apple_ir" = auto ; then _apple_ir=no cat > $TMPC < #include int main(void) { struct input_event ev; -- cgit v1.2.3 From 8ac2b7bbf5995968b045ab88c22cb2730b1c88e2 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 12:41:27 +0000 Subject: cosmetics: XviD --> Xvid git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26897 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 5771169a57..7f1b4e4cd2 100755 --- a/configure +++ b/configure @@ -286,8 +286,8 @@ Codecs: --disable-qtx disable QuickTime codecs support [enabled] --disable-xanim disable XAnim codecs support [enabled] --disable-real disable RealPlayer codecs support [enabled] - --disable-xvid disable XviD [autodetect] - --disable-xvid-lavc disable XviD in libavcodec [autodetect] + --disable-xvid disable Xvid [autodetect] + --disable-xvid-lavc disable Xvid in libavcodec [autodetect] --disable-x264 disable x264 [autodetect] --disable-x264-lavc disable x264 in libavcodec [autodetect] --disable-libnut disable libnut [autodetect] @@ -6533,7 +6533,7 @@ fi echores "$_libdv" -echocheck "XviD" +echocheck "Xvid" if test "$_xvid" = auto ; then _xvid=no cat > $TMPC << EOF @@ -6554,7 +6554,7 @@ else fi echores "$_xvid" -echocheck "XviD two pass plugin" +echocheck "Xvid two pass plugin" if test "$_xvid" = yes && test "$_xvid_lavc" = auto ; then cat > $TMPC << EOF #include @@ -7936,7 +7936,7 @@ $_def_hpux_scsi_h -cache */ $_def_stream_cache -/* Define if you are using XviD library */ +/* Define if you are using Xvid library */ $_def_xvid /* Define if you are using the X.264 library */ -- cgit v1.2.3 From 08ec85ba4be2915e6ae9918344b4465de4ad37f5 Mon Sep 17 00:00:00 2001 From: iive Date: Wed, 28 May 2008 23:04:41 +0000 Subject: Revert commit r26897. XviD is the correct spelling of the codec. You can see it written in the codec own documentation and header files. Prefered name capitalization confirmed in conversation with XviD developer (prunedtree). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26915 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 7f1b4e4cd2..5771169a57 100755 --- a/configure +++ b/configure @@ -286,8 +286,8 @@ Codecs: --disable-qtx disable QuickTime codecs support [enabled] --disable-xanim disable XAnim codecs support [enabled] --disable-real disable RealPlayer codecs support [enabled] - --disable-xvid disable Xvid [autodetect] - --disable-xvid-lavc disable Xvid in libavcodec [autodetect] + --disable-xvid disable XviD [autodetect] + --disable-xvid-lavc disable XviD in libavcodec [autodetect] --disable-x264 disable x264 [autodetect] --disable-x264-lavc disable x264 in libavcodec [autodetect] --disable-libnut disable libnut [autodetect] @@ -6533,7 +6533,7 @@ fi echores "$_libdv" -echocheck "Xvid" +echocheck "XviD" if test "$_xvid" = auto ; then _xvid=no cat > $TMPC << EOF @@ -6554,7 +6554,7 @@ else fi echores "$_xvid" -echocheck "Xvid two pass plugin" +echocheck "XviD two pass plugin" if test "$_xvid" = yes && test "$_xvid_lavc" = auto ; then cat > $TMPC << EOF #include @@ -7936,7 +7936,7 @@ $_def_hpux_scsi_h -cache */ $_def_stream_cache -/* Define if you are using Xvid library */ +/* Define if you are using XviD library */ $_def_xvid /* Define if you are using the X.264 library */ -- cgit v1.2.3 From b1bbd23b616a1288f58cff7d7997c61ab95a5bd2 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 30 May 2008 11:45:08 +0000 Subject: Check for AltiVec vector declaration syntax. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26926 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 5771169a57..0ed33e9859 100755 --- a/configure +++ b/configure @@ -2437,9 +2437,19 @@ EOF int main(void) { return 0; } EOF cc_check $_altivec_gcc_flags && _have_altivec_h=yes \ + && inc_altivec_h="#include " \ && _def_altivec_h='#define HAVE_ALTIVEC_H 1' echores "$_have_altivec_h" + # check if the compiler supports braces for vector declarations + cat > $TMPC << EOF +$inc_altivec_h +#define AVV(x...) {x} +int main (void) { (vector int) AVV(1); return 0; } +EOF + cc_check $_altivec_gcc_flags && + _def_altivec_vector_braces='#define HAVE_ALTIVEC_VECTOR_BRACES 1' + # Disable runtime cpudetection if we cannot generate AltiVec code or # AltiVec is disabled by the user. test "$_runtime_cpudetection" = yes && test "$_altivec" = no \ @@ -8488,6 +8498,7 @@ $_def_gethostbyname2 `ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE"` $_def_altivec_h // enables usage of altivec.h +$_def_altivec_vector_braces /* libvo options */ #define SCREEN_SIZE_X 1 -- cgit v1.2.3 From 6a131b0ddff5b81d13a7af04f13cdbe8946f0817 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 30 May 2008 18:03:36 +0000 Subject: Rework AltiVec CFLAGS detection. '-maltivec -mabi=altivec' should be used only when altivec.h is available and preferred over '-faltivec'. This should now finally work on all Mac OS X and gcc combinations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26930 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 0ed33e9859..5d413be1d6 100755 --- a/configure +++ b/configure @@ -2422,24 +2422,30 @@ if ppc && ( test "$_altivec" = yes || test "$_runtime_cpudetection" = yes ) ; th cat > $TMPC << EOF int main(void) { return 0; } EOF - cc_check -maltivec -mabi=altivec \ - && _altivec_gcc_flags="-maltivec -mabi=altivec" \ - || { cc_check -faltivec && _altivec_gcc_flags=-faltivec ; } \ - || { _altivec=no && _altivec_gcc_flags="none, AltiVec disabled" ; } - echores "$_altivec_gcc_flags" - + if $(cc_check -maltivec -mabi=altivec) ; then + _altivec_gcc_flags="-maltivec -mabi=altivec" # check if should be included - echocheck "altivec.h" _def_altivec_h='#undef HAVE_ALTIVEC_H' - _have_altivec_h=no cat > $TMPC << EOF #include int main(void) { return 0; } EOF - cc_check $_altivec_gcc_flags && _have_altivec_h=yes \ - && inc_altivec_h="#include " \ - && _def_altivec_h='#define HAVE_ALTIVEC_H 1' - echores "$_have_altivec_h" + if $(cc_check $_altivec_gcc_flags) ; then + _def_altivec_h='#define HAVE_ALTIVEC_H 1' + inc_altivec_h='#include ' + else + cat > $TMPC << EOF +int main(void) { return 0; } +EOF + if $(cc_check -faltivec) ; then + _altivec_gcc_flags="-faltivec" + else + _altivec=no + _altivec_gcc_flags="none, AltiVec disabled" + fi + fi + fi + echores "$_altivec_gcc_flags" # check if the compiler supports braces for vector declarations cat > $TMPC << EOF -- cgit v1.2.3 From 6e478b9ea618968554ec7e6b3eccdef63a04dce1 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 31 May 2008 16:38:02 +0000 Subject: Change spelling of XviD to Xvid as has already been done in the (rest of the) documentation. The name change was effected a few years ago already. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26940 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 5d413be1d6..378efe7375 100755 --- a/configure +++ b/configure @@ -286,8 +286,8 @@ Codecs: --disable-qtx disable QuickTime codecs support [enabled] --disable-xanim disable XAnim codecs support [enabled] --disable-real disable RealPlayer codecs support [enabled] - --disable-xvid disable XviD [autodetect] - --disable-xvid-lavc disable XviD in libavcodec [autodetect] + --disable-xvid disable Xvid [autodetect] + --disable-xvid-lavc disable Xvid in libavcodec [autodetect] --disable-x264 disable x264 [autodetect] --disable-x264-lavc disable x264 in libavcodec [autodetect] --disable-libnut disable libnut [autodetect] @@ -6549,7 +6549,7 @@ fi echores "$_libdv" -echocheck "XviD" +echocheck "Xvid" if test "$_xvid" = auto ; then _xvid=no cat > $TMPC << EOF @@ -6570,7 +6570,7 @@ else fi echores "$_xvid" -echocheck "XviD two pass plugin" +echocheck "Xvid two pass plugin" if test "$_xvid" = yes && test "$_xvid_lavc" = auto ; then cat > $TMPC << EOF #include @@ -7952,7 +7952,7 @@ $_def_hpux_scsi_h -cache */ $_def_stream_cache -/* Define if you are using XviD library */ +/* Define if you are using Xvid library */ $_def_xvid /* Define if you are using the X.264 library */ -- cgit v1.2.3 From 35071aae3f5f4df03d0459ae15c83da3248a9449 Mon Sep 17 00:00:00 2001 From: nicodvb Date: Sun, 1 Jun 2008 07:28:31 +0000 Subject: removed support for Ogle's dvdread git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26950 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 -- 1 file changed, 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 378efe7375..fb6bc0f710 100755 --- a/configure +++ b/configure @@ -5373,8 +5373,6 @@ elif test "$_dvdread" = auto ; then #include int main(void) { return 0; } EOF - cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ - -ldvdread $_ld_dl && _dvdread=yes && _res_comment="external" fi if test "$_dvdread" = no ; then _dvdreadconfig="dvdread-config" -- cgit v1.2.3 From 5241f8a1f1708e8158b7b27aa30b20fe667886a2 Mon Sep 17 00:00:00 2001 From: nicodvb Date: Sun, 1 Jun 2008 07:31:03 +0000 Subject: changed the code that checks the presence of the external dvdread to include the headers from libdvdread/ (as in current svn) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26951 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'configure') diff --git a/configure b/configure index fb6bc0f710..e41cb11a7d 100755 --- a/configure +++ b/configure @@ -5367,14 +5367,13 @@ elif test "$_dvdread" = auto ; then if test "$_dl" = yes; then cat > $TMPC << EOF #include -#include -#include -#include -#include +#include +#include +#include +#include int main(void) { return 0; } EOF fi - if test "$_dvdread" = no ; then _dvdreadconfig="dvdread-config" _dvdreadcflags=`$_dvdreadconfig --cflags` _dvdreadlibs=`$_dvdreadconfig --libs` @@ -5385,7 +5384,6 @@ EOF _ld_extra="$_ld_extra $_dvdreadlibs" _res_comment="external" fi - fi fi if test "$_dvdread_internal" = yes; then -- cgit v1.2.3 From 95a38dab339f0f34360c2f744363f50211593cd5 Mon Sep 17 00:00:00 2001 From: nicodvb Date: Sun, 1 Jun 2008 07:32:28 +0000 Subject: reindented the dvdread detection block git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26952 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'configure') diff --git a/configure b/configure index e41cb11a7d..41e803de3b 100755 --- a/configure +++ b/configure @@ -5374,16 +5374,16 @@ elif test "$_dvdread" = auto ; then int main(void) { return 0; } EOF fi - _dvdreadconfig="dvdread-config" - _dvdreadcflags=`$_dvdreadconfig --cflags` - _dvdreadlibs=`$_dvdreadconfig --libs` - if cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ - $_dvdreadcflags $_dvdreadlibs $_ld_dl ; then - _dvdread=yes - _inc_extra="$_inc_extra $_dvdreadcflags" - _ld_extra="$_ld_extra $_dvdreadlibs" - _res_comment="external" - fi + _dvdreadconfig="dvdread-config" + _dvdreadcflags=`$_dvdreadconfig --cflags` + _dvdreadlibs=`$_dvdreadconfig --libs` + if cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ + $_dvdreadcflags $_dvdreadlibs $_ld_dl ; then + _dvdread=yes + _inc_extra="$_inc_extra $_dvdreadcflags" + _ld_extra="$_ld_extra $_dvdreadlibs" + _res_comment="external" + fi fi if test "$_dvdread_internal" = yes; then -- cgit v1.2.3 From d73f2a4c07354006ad04c13329b588348282d716 Mon Sep 17 00:00:00 2001 From: nicodvb Date: Sun, 1 Jun 2008 07:44:36 +0000 Subject: disable dvdnav when using the internal dvdread git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26953 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 41e803de3b..b41a6054ef 100755 --- a/configure +++ b/configure @@ -7544,7 +7544,12 @@ cc_check -mno-omit-leaf-frame-pointer && CFLAG_NO_OMIT_LEAF_FRAME_POINTER="-mno- # to use its own copy of the library) echocheck "DVD support (libdvdnav)" if test "$_dvdnav" = auto ; then + if test "$_dvdread_internal" = yes ; then + _dvdnav=no + echores "disabled due to the usage of the internal copy of dvdread. Append --disable-dvdread-internal" + else $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no + fi fi if test "$_dvdnav" = auto ; then cat > $TMPC < Date: Sun, 1 Jun 2008 07:45:22 +0000 Subject: tiny reindentation git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26954 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index b41a6054ef..25330a0a8a 100755 --- a/configure +++ b/configure @@ -7548,7 +7548,7 @@ if test "$_dvdnav" = auto ; then _dvdnav=no echores "disabled due to the usage of the internal copy of dvdread. Append --disable-dvdread-internal" else - $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no + $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no fi fi if test "$_dvdnav" = auto ; then -- cgit v1.2.3 From 32ed4348407e9a72112b6f049f467e5a78a8f5a4 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 2 Jun 2008 11:08:04 +0000 Subject: Remove unnecessary FFmpeg hack from config.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26961 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 -- 1 file changed, 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 25330a0a8a..6739c9c25c 100755 --- a/configure +++ b/configure @@ -7590,8 +7590,6 @@ DATADIR = \$(DESTDIR)$_datadir MANDIR = \$(DESTDIR)$_mandir CONFDIR = \$(DESTDIR)$_confdir LIBDIR = \$(DESTDIR)$_libdir -# FFmpeg uses libdir instead of LIBDIR -libdir = \$(LIBDIR) AR = $_ar CC = $_cc CXX = $_cc -- cgit v1.2.3 From 6459b442baec6637cecf22892f0731f2f293b499 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 2 Jun 2008 12:09:01 +0000 Subject: Remove unused variable TARGET_CPU from config.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26962 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 - 1 file changed, 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 6739c9c25c..6d43c4a9e4 100755 --- a/configure +++ b/configure @@ -7748,7 +7748,6 @@ VIDIX_UNICHROME=$_vidix_drv_unichrome # --- Some stuff for autoconfigure ---- $_target_arch $_target_arch_x86 -TARGET_CPU=$iproc `echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'` # --- GUI stuff --- -- cgit v1.2.3 From 1f2cc31b4e630aff9bbd06e5efcb5c6d11e469b4 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 2 Jun 2008 12:24:28 +0000 Subject: cosmetics: Restructure config.mak logically and alphabetically. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26963 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 197 ++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 95 insertions(+), 102 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 6d43c4a9e4..3796ec2b6b 100755 --- a/configure +++ b/configure @@ -7583,6 +7583,7 @@ LANG = C MAN_LANG = $MAN_LANG MAN_LANG_ALL = $MAN_LANG_ALL TARGET_OS = $system_name + DESTDIR = prefix = \$(DESTDIR)$_prefix BINDIR = \$(DESTDIR)$_bindir @@ -7590,6 +7591,7 @@ DATADIR = \$(DESTDIR)$_datadir MANDIR = \$(DESTDIR)$_mandir CONFDIR = \$(DESTDIR)$_confdir LIBDIR = \$(DESTDIR)$_libdir + AR = $_ar CC = $_cc CXX = $_cc @@ -7597,6 +7599,8 @@ HOST_CC = $_host_cc RANLIB = $_ranlib WINDRES = $_windres INSTALL = $_install +INSTALLSTRIP = $_install_strip + EXTRA_INC = $_inc_extra EXTRAXX_INC = $_inc_extra $_inc_extraxx CFLAGS = $CFLAGS \$(EXTRA_INC) @@ -7604,49 +7608,38 @@ OPTFLAGS = $CFLAGS \$(EXTRA_INC) CFLAG_NO_OMIT_LEAF_FRAME_POINTER = $CFLAG_NO_OMIT_LEAF_FRAME_POINTER CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC) CFLAG_STACKREALIGN = $_stackrealign +LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags ASFLAGS = $ASFLAGS -INSTALLSTRIP = $_install_strip + +EXTRALIBS = $_extra_libs +EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm +EXTRALIBS_MPLAYER = $_libs_mplayer +EXTRALIBS_MENCODER = $_libs_mencoder + CHARSET = $_charset HELP_FILE = $_mp_help EXESUF = $_exesuf -MPLAYER_NETWORK = $_network -FTP = $_ftp -STREAMING_LIVE555 = $_live -LIBNEMESI = $_nemesi -NATIVE_RTSP = $_native_rtsp -VSTREAM = $_vstream -STREAM_CACHE = $_stream_cache -DVBIN = $_dvbin -VIDIX = $_vidix -VIDIX_INTERNAL = $_vidix_internal -VIDIX_EXTERNAL = $_vidix_external -VIDIX_PCIDB = $_vidix_pcidb_val -CONFIG_POSTPROC = yes -MP3LAME = $_mp3lame -LIBMENU = $_menu -LIBMENU_DVBIN = $_menu_dvbin +$_target_arch +$_target_arch_x86 +`echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'` -MP3LIB = $_mp3lib +GETCH = $_getch +TIMER = $_timer + +AO_SRCS = $_aosrc +VO_SRCS = $_vosrc + +MENCODER = $_mencoder +MPLAYER = $_mplayer + +#internal libraries LIBA52 = $_liba52 LIBMPEG2 = $_libmpeg2 +MP3LIB = $_mp3lib TREMOR_INTERNAL = $_tremor_internal TREMOR_LOW = $_tremor_low -FAAD = $_faad - -SPEEX = $_speex -MUSEPACK = $_musepack - -UNRAR_EXEC = $_unrar_exec -PNG = $_png -JPEG = $_jpeg -GIF = $_gif - -EXTRALIBS = $_extra_libs -EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm -EXTRALIBS_MPLAYER = $_libs_mplayer -EXTRALIBS_MENCODER = $_libs_mencoder HAVE_SYS_MMAN_H = $_mman HAVE_POSIX_SELECT = $_posix_select @@ -7660,77 +7653,84 @@ NEED_STRSEP = $_need_strsep NEED_SWAB = $_need_swab NEED_VSSCANF = $_need_vsscanf -GETCH = $_getch -TIMER = $_timer - -PE_EXECUTABLE = $_pe_executable - # audio output OSS = $_ossaudio -ALSA = $_alsa -ALSA5 = $_alsa5 ALSA9 = $_alsa9 ALSA1X = $_alsa1x -LADSPA = $_ladspa - -# input/demuxer/codecs -JOYSTICK = $_joystick -LIRC = $_lirc -APPLE_REMOTE = $_apple_remote +# features APPLE_IR = $_apple_ir -TV = $_tv -TV_V4L = $_tv_v4l -TV_V4L1 = $_tv_v4l1 -TV_V4L2 = $_tv_v4l2 -TV_DSHOW = $_tv_dshow -TV_BSDBT848 = $_tv_bsdbt848 -TV_TELETEXT = $_tv_teletext +APPLE_REMOTE = $_apple_remote AUDIO_INPUT = $_audio_input -PVR = $_pvr -VCD = $_vcd -DVDREAD = $_dvdread -DVDREAD_INTERNAL = $_dvdread_internal -LIBDVDCSS_INTERNAL = $_libdvdcss_internal -LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags -DVDNAV = $_dvdnav -WIN32DLL = $_win32dll -WIN32_EMULATION = $_win32_emulation -QTX_CODECS = $_qtx -QTX_CODECS_WIN32 = $_qtx_codecs_win32 -QTX_EMULATION = $_qtx_emulation -REAL_CODECS = $_real -XANIM_CODECS = $_xanim -ZORAN = $_zr -LIBLZO = $_liblzo -LIBDV = $_libdv -XVID4 = $_xvid -X264 = $_x264 -LIBNUT = $_libnut -LIBDCA = $_libdca -MPLAYER = $_mplayer -MENCODER = $_mencoder +BITMAP_FONT = $_bitmap_font CDDA = $_cdda CDDB = $_cddb -BITMAP_FONT = $_bitmap_font +COREAUDIO = $_coreaudio +COREVIDEO = $_corevideo +DVBIN = $_dvbin +DVDNAV = $_dvdnav +DVDREAD = $_dvdread +DVDREAD_INTERNAL = $_dvdread_internal +FAAC=$_faac +FAAD = $_faad +FAAD_INTERNAL = $_faad_internal FREETYPE = $_freetype +FTP = $_ftp +GIF = $_gif +GUI = $_gui +GUI_GTK = $_gui_gtk +GUI_WIN32 = $_gui_win32 +JOYSTICK = $_joystick +JPEG = $_jpeg +LADSPA = $_ladspa LIBASS = $_ass +LIBDCA = $_libdca +LIBDV = $_libdv +LIBDVDCSS_INTERNAL = $_libdvdcss_internal +LIBLZO = $_liblzo LIBMAD = $_mad -LIBVORBIS = $_vorbis -LIBTHEORA = $_theora -FAAD_INTERNAL = $_faad_internal +LIBMENU = $_menu +LIBMENU_DVBIN = $_menu_dvbin +LIBNEMESI = $_nemesi +LIBNUT = $_libnut LIBSMBCLIENT = $_smbsupport -XMMS_PLUGINS = $_xmms -MACOSX_FINDER_SUPPORT = $_macosx_finder_support +LIBTHEORA = $_theora +LIBVORBIS = $_vorbis +LIRC = $_lirc MACOSX_BUNDLE = $_macosx_bundle -COREAUDIO = $_coreaudio -COREVIDEO = $_corevideo +MACOSX_FINDER_SUPPORT = $_macosx_finder_support +MP3LAME = $_mp3lame +MPLAYER_NETWORK = $_network +MUSEPACK = $_musepack +NATIVE_RTSP = $_native_rtsp +PE_EXECUTABLE = $_pe_executable +PNG = $_png +PVR = $_pvr +QTX_CODECS = $_qtx +QTX_CODECS_WIN32 = $_qtx_codecs_win32 +QTX_EMULATION = $_qtx_emulation QUARTZ = $_quartz -TOOLAME=$_toolame -TWOLAME=$_twolame -FAAC=$_faac RADIO=$_radio RADIO_CAPTURE=$_radio_capture +REAL_CODECS = $_real +SPEEX = $_speex +STREAMING_LIVE555 = $_live +STREAM_CACHE = $_stream_cache +TOOLAME=$_toolame +TV = $_tv +TV_BSDBT848 = $_tv_bsdbt848 +TV_DSHOW = $_tv_dshow +TV_TELETEXT = $_tv_teletext +TV_V4L = $_tv_v4l +TV_V4L1 = $_tv_v4l1 +TV_V4L2 = $_tv_v4l2 +TWOLAME=$_twolame +UNRAR_EXEC = $_unrar_exec +VCD = $_vcd +VIDIX = $_vidix +VIDIX_EXTERNAL = $_vidix_external +VIDIX_INTERNAL = $_vidix_internal +VIDIX_PCIDB = $_vidix_pcidb_val VIDIX_CYBERBLADE=$_vidix_drv_cyberblade VIDIX_IVTV=$_vidix_drv_ivtv VIDIX_MACH64=$_vidix_drv_mach64 @@ -7744,22 +7744,14 @@ VIDIX_RAGE128=$_vidix_drv_rage128 VIDIX_S3=$_vidix_drv_s3 VIDIX_SIS=$_vidix_drv_sis VIDIX_UNICHROME=$_vidix_drv_unichrome - -# --- Some stuff for autoconfigure ---- -$_target_arch -$_target_arch_x86 -`echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'` - -# --- GUI stuff --- -GUI = $_gui -GUI_GTK = $_gui_gtk -GUI_WIN32 = $_gui_win32 - -# --- libvo stuff --- -VO_SRCS = $_vosrc - -# --- libao2 stuff --- -AO_SRCS = $_aosrc +VSTREAM = $_vstream +WIN32DLL = $_win32dll +WIN32_EMULATION = $_win32_emulation +X264 = $_x264 +XANIM_CODECS = $_xanim +XMMS_PLUGINS = $_xmms +XVID4 = $_xvid +ZORAN = $_zr # FFmpeg LIBAVUTIL = $_libavutil @@ -7794,6 +7786,7 @@ CONFIG_LIBVORBIS=$_libvorbis CONFIG_LIBX264=$_x264_lavc CONFIG_LIBXVID=$_xvid_lavc CONFIG_MLIB = $_mlib +CONFIG_POSTPROC = yes # Prevent building libavcodec/imgresample.c with conflicting symbols CONFIG_SWSCALE=yes CONFIG_ZLIB=$_zlib -- cgit v1.2.3 From a81621c35da28bfb86bd457f8f2c232d29b657e0 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 2 Jun 2008 12:26:57 +0000 Subject: Remove unused variable TARGET_OS from config.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26964 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 - 1 file changed, 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 3796ec2b6b..80122d9e0c 100755 --- a/configure +++ b/configure @@ -7582,7 +7582,6 @@ cat > config.mak << EOF LANG = C MAN_LANG = $MAN_LANG MAN_LANG_ALL = $MAN_LANG_ALL -TARGET_OS = $system_name DESTDIR = prefix = \$(DESTDIR)$_prefix -- cgit v1.2.3 From fb9b1ccced2825347b96495d0eb33b818a4b0105 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 2 Jun 2008 12:28:48 +0000 Subject: Remove unused variable LANG from config.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26965 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 - 1 file changed, 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 80122d9e0c..231edbf6af 100755 --- a/configure +++ b/configure @@ -7579,7 +7579,6 @@ echo "Creating config.mak" cat > config.mak << EOF # -------- Generated by configure ----------- -LANG = C MAN_LANG = $MAN_LANG MAN_LANG_ALL = $MAN_LANG_ALL -- cgit v1.2.3 From 0e5273520bf0a71df951dba40bbda70d9426a107 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 2 Jun 2008 12:55:24 +0000 Subject: 10l: Restore LANG variable in config.mak so that shell commands are not negatively affected by (broken) locale settings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26966 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 231edbf6af..767b2cc6e3 100755 --- a/configure +++ b/configure @@ -7579,6 +7579,9 @@ echo "Creating config.mak" cat > config.mak << EOF # -------- Generated by configure ----------- +# Ensure that locale settings do not interfere with shell commands. +LANG = C + MAN_LANG = $MAN_LANG MAN_LANG_ALL = $MAN_LANG_ALL -- cgit v1.2.3 From 764c8aee0f66d4c854aad1e6739c493b886a4fea Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 2 Jun 2008 16:32:38 +0000 Subject: Use LC_ALL instead of LANG in config.mak to prevent locale settings from messing with text processing tools. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26967 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 767b2cc6e3..a9b380a4c5 100755 --- a/configure +++ b/configure @@ -7580,7 +7580,7 @@ cat > config.mak << EOF # -------- Generated by configure ----------- # Ensure that locale settings do not interfere with shell commands. -LANG = C +LC_ALL = C MAN_LANG = $MAN_LANG MAN_LANG_ALL = $MAN_LANG_ALL -- cgit v1.2.3