From aee9749bca8e418752627bbfe8859029ea43d28e Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Mar 2010 16:13:32 +0000 Subject: Replace separate Win32, XAnim and Real codec directories by one global dir. Nowadays MPlayer does not use the codecs from other installed programs. A runtime setting will soon take over the rare case that binary codecs should be searched for in non-standard directories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30888 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 4e57ce3172..bd6e9ab833 100755 --- a/configure +++ b/configure @@ -218,9 +218,6 @@ Installation directories: [PREFIX/etc/mplayer] --libdir=DIR directory for object code libraries [PREFIX/lib] --codecsdir=DIR directory for binary codecs [LIBDIR/codecs] - --win32codecsdir=DIR directory for Windows DLLs [LIBDIR/codecs] - --xanimcodecsdir=DIR directory for XAnim codecs [LIBDIR/codecs] - --realcodecsdir=DIR directory for RealPlayer codecs [LIBDIR/codecs] Optional features: --disable-mencoder disable MEncoder (A/V encoder) compilation [enable] @@ -791,15 +788,6 @@ for ac_option do --codecsdir=*) _codecsdir=$(echo $ac_option | cut -d '=' -f 2) ;; - --win32codecsdir=*) - _win32codecsdir=$(echo $ac_option | cut -d '=' -f 2) - ;; - --xanimcodecsdir=*) - _xanimcodecsdir=$(echo $ac_option | cut -d '=' -f 2) - ;; - --realcodecsdir=*) - _realcodecsdir=$(echo $ac_option | cut -d '=' -f 2) - ;; --with-install=*) _install=$(echo $ac_option | cut -d '=' -f 2 ) @@ -7063,8 +7051,6 @@ if test "$_win32dll" = auto ; then fi if test "$_win32dll" = yes ; then def_win32dll='#define CONFIG_WIN32DLL 1' - test -z "$_win32codecsdir" && _win32codecsdir=$_codecsdir - _res_comment="using $_win32codecsdir" if ! win32 ; then def_win32_loader='#define WIN32_LOADER 1' _win32_emulation=yes @@ -7090,14 +7076,10 @@ if test "$_xanim" = auto ; then fi fi if test "$_xanim" = yes ; then - test -z "$_xanimcodecsdir" && _xanimcodecsdir=$_codecsdir def_xanim='#define CONFIG_XANIM 1' - def_xanim_path="#define XACODEC_PATH \"$_xanimcodecsdir\"" _codecmodules="xanim $_codecmodules" - _res_comment="using $_xanimcodecsdir" else def_xanim='#undef CONFIG_XANIM' - def_xanim_path='#undef XACODEC_PATH' _nocodecmodules="xanim $_nocodecmodules" fi echores "$_xanim" @@ -7113,14 +7095,10 @@ if test "$_real" = auto ; then fi fi if test "$_real" = yes ; then - test -z "$_realcodecsdir" && _realcodecsdir="$_codecsdir" def_real='#define CONFIG_REALCODECS 1' - def_real_path="#define REALCODEC_PATH \"$_realcodecsdir\"" _codecmodules="real $_codecmodules" - _res_comment="using $_realcodecsdir" else def_real='#undef CONFIG_REALCODECS' - def_real_path="#undef REALCODEC_PATH" _nocodecmodules="real $_nocodecmodules" fi echores "$_real" @@ -8989,13 +8967,11 @@ $def_libnut $def_qtx $def_qtx_win32 $def_real -$def_real_path $def_win32_loader $def_win32dll -#define WIN32_PATH "$_win32codecsdir" $def_xanim -$def_xanim_path $def_xmms +#define BINARY_CODECS_PATH "$_codecsdir" #define XMMS_INPUT_PLUGIN_DIR "$_xmmsplugindir" -- cgit v1.2.3 From 299f7ad933f93961027aae5d253a50b346f8bc26 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sun, 14 Mar 2010 22:50:15 +0000 Subject: Fix compilation after FFmpeg r22522. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30889 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index bd6e9ab833..ac6ef191f8 100755 --- a/configure +++ b/configure @@ -8702,6 +8702,7 @@ FULLNAME=\$(NAME)\$(BUILDSUF) # Some FFmpeg codecs depend on these. Enable them unconditionally for now. CONFIG_AANDCT=yes CONFIG_DCT=yes +CONFIG_DWT=yes CONFIG_FFT=yes CONFIG_FFT_MMX=$fft_mmx CONFIG_GOLOMB=yes -- cgit v1.2.3 From 70fafd780384c6ba348bf3a111347b52d1087d74 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Mar 2010 22:55:13 +0000 Subject: Use menu instead of GUI as example for an internal feature turned on by a flag. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30890 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index ac6ef191f8..7e7f8de472 100755 --- a/configure +++ b/configure @@ -9341,7 +9341,7 @@ skipping autodetection. This behavior is unlike what you may be used to from autoconf-based configure scripts that can decide to override you. This greater level of control comes at a price. You may have to provide the correct compiler and linker flags yourself. -If you used one of these options (except --enable-gui and similar ones that +If you used one of these options (except --enable-menu and similar ones that turn on internal features) and experience a compilation or linking failure, make sure you have passed the necessary compiler/linker flags to configure. -- cgit v1.2.3 From 0dd44a006efea7d3b7ac62e83a8ffe13f7930229 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Mar 2010 22:58:20 +0000 Subject: Add -Wstrict-prototypes to CFLAGS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30891 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index 7e7f8de472..06e35169be 100755 --- a/configure +++ b/configure @@ -2519,6 +2519,7 @@ if test "$cc_vendor" = "gnu" ; then cc_check -Wdisabled-optimization && CFLAGS="-Wdisabled-optimization $CFLAGS" cc_check -Wundef && CFLAGS="-Wundef $CFLAGS" cc_check -Wmissing-prototypes && CFLAGS="-Wmissing-prototypes $CFLAGS" + cc_check -Wstrict-prototypes && CFLAGS="-Wstrict-prototypes $CFLAGS" else CFLAGS="-D_ISOC99_SOURCE -D_BSD_SOURCE $CFLAGS" fi -- cgit v1.2.3 From 3aee1115a8d089be203eba0cb7bf60993fa16f4a Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Mar 2010 23:00:06 +0000 Subject: cosmetics: Simplify _codecsdir setting for MinGW and OS/2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30892 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 06e35169be..7d19b8e6e7 100755 --- a/configure +++ b/configure @@ -7038,8 +7038,7 @@ fi # Fall back on default directory. if test -z "$_codecsdir" ; then _codecsdir="$_libdir/codecs" - mingw32 && _codecsdir="codecs" - os2 && _codecsdir="codecs" + mingw32 || os2 && _codecsdir="codecs" fi -- cgit v1.2.3 From 7d51464c27296a27fdfa1c1ecfe5971d2a002f98 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Mar 2010 23:37:58 +0000 Subject: Remove unused MMX_FFT Makefile variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30893 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 3 --- 1 file changed, 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 7d19b8e6e7..956da0592b 100755 --- a/configure +++ b/configure @@ -2680,13 +2680,11 @@ fi echo "pabsw xmm0, xmm0" > $TMPS yasm_check || _yasm="" if test $_yasm ; then - test "$_mmx" = "yes" && fft_mmx="yes" def_yasm='#define HAVE_YASM 1' _have_yasm="yes" echores "$_yasm" else def_yasm='#define HAVE_YASM 0' - fft_mmx="no" _have_yasm="no" echores "no" fi @@ -8704,7 +8702,6 @@ CONFIG_AANDCT=yes CONFIG_DCT=yes CONFIG_DWT=yes CONFIG_FFT=yes -CONFIG_FFT_MMX=$fft_mmx CONFIG_GOLOMB=yes CONFIG_LPC=yes CONFIG_LSP=yes -- cgit v1.2.3 From ee2ac03ccc9a1e75aaf94143fb757a4a60ded956 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Mar 2010 23:39:02 +0000 Subject: variable renaming cosmetics: _have_yasm --> have_yasm git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30894 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 956da0592b..5663287e20 100755 --- a/configure +++ b/configure @@ -2681,11 +2681,11 @@ echo "pabsw xmm0, xmm0" > $TMPS yasm_check || _yasm="" if test $_yasm ; then def_yasm='#define HAVE_YASM 1' - _have_yasm="yes" + have_yasm="yes" echores "$_yasm" else def_yasm='#define HAVE_YASM 0' - _have_yasm="no" + have_yasm="no" echores "no" fi @@ -8737,7 +8737,7 @@ CONFIG_ZLIB=$_zlib HAVE_PTHREADS = $_pthreads HAVE_SHM = $_shm HAVE_W32THREADS = $_w32threads -HAVE_YASM = $_have_yasm +HAVE_YASM = $have_yasm $(echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/') $(echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/') -- cgit v1.2.3 From 2c2097601e579ee0a5af2f7b4f5ac0aed3c3e3ff Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 15 Mar 2010 06:39:21 +0000 Subject: Add CONFIG_DCT and CONFIG_DWT to config.h as well as to config.mak for FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30896 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 5663287e20..b34dbec8c1 100755 --- a/configure +++ b/configure @@ -9217,6 +9217,8 @@ $def_yasm /* 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_LPC 1 -- cgit v1.2.3 From 151e9a83036248d70fbf4b68dfd1c62535aa30b7 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Tue, 16 Mar 2010 10:25:54 +0000 Subject: Fix compilation after FFmpeg r22565. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30905 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configure') diff --git a/configure b/configure index b34dbec8c1..b7e4c39157 100755 --- a/configure +++ b/configure @@ -8703,6 +8703,7 @@ CONFIG_DCT=yes CONFIG_DWT=yes CONFIG_FFT=yes CONFIG_GOLOMB=yes +CONFIG_H264DSP=yes CONFIG_LPC=yes CONFIG_LSP=yes CONFIG_MDCT=yes @@ -9221,6 +9222,7 @@ $def_yasm #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 -- cgit v1.2.3