From 8eab1ca95c0ba0184ac86d2efbd193cc31cf3269 Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 31 Aug 2009 09:00:37 +0000 Subject: Also check linker flags to make sure that liveMedia libraries are there, too, not just the headers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29598 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index bc354ad582..3edff0825c 100755 --- a/configure +++ b/configure @@ -6853,7 +6853,8 @@ EOF _live=yes && break done if test "$_live" != yes ; then - if cxx_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock; then + ld_tmp="-lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++" + if cxx_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock $ld_tmp; then _live_dist=yes fi fi @@ -6866,7 +6867,7 @@ elif test "$_live_dist" = yes && test "$_network" = yes; then _res_comment="using distribution version" _live="yes" def_live='#define CONFIG_LIVE555 1' - extra_ldflags="$extra_ldflags -lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++" + extra_ldflags="$extra_ldflags $ld_tmp" extra_cxxflags="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment \ -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock" _inputmodules="live555 $_inputmodules" -- cgit v1.2.3 From 6720a0d0cdd9575685f02396cdfc677e4336540d Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 1 Sep 2009 08:30:15 +0000 Subject: The libamrnb *en*coder, not the *de*coder should be added to the list of encoders to enable in libavcodec. patch by Wang William, william0wang gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29605 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 3edff0825c..956c3f6703 100755 --- a/configure +++ b/configure @@ -7082,7 +7082,7 @@ if test "$_libopencore_amrnb" = yes ; then extra_ldflags="$extra_ldflags -lopencore-amrnb" def_libopencore_amrnb='#define CONFIG_LIBOPENCORE_AMRNB 1' _libavdecoders="$_libavdecoders LIBOPENCORE_AMRNB_DECODER" - _libavencoders="$_libavencoders LIBOPENCORE_AMRNB_DECODER" + _libavencoders="$_libavencoders LIBOPENCORE_AMRNB_ENCODER" _codecmodules="libopencore_amrnb $_codecmodules" else def_libopencore_amrnb='#define CONFIG_LIBOPENCORE_AMRNB 0' -- cgit v1.2.3 From 4338a8d7f4b65a185a7fb5d136b0882510310f72 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 4 Sep 2009 07:57:06 +0000 Subject: Move OpenGL test below CoreVideo. This ensures -lGL will come after -framework OpenGL which resolves vo_corevideo crashes due to namespace conflicts (e.g. glEnable, glBegin, ...). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29639 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 108 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 55 insertions(+), 53 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 956c3f6703..64fddee93c 100755 --- a/configure +++ b/configure @@ -4431,59 +4431,6 @@ fi echores "$_3dfx" -echocheck "OpenGL" -#Note: this test is run even with --enable-gl since we autodetect linker flags -if (test "$_x11" = yes || win32) && test "$_gl" != no ; then - cat > $TMPC << EOF -#ifdef GL_WIN32 -#include -#include -#else -#include -#include -#include -#endif -int main(void) { -#ifdef GL_WIN32 - HDC dc; - wglCreateContext(dc); -#else - glXCreateContext(NULL, NULL, NULL, True); -#endif - glFinish(); - return 0; -} -EOF - _gl=no - if cc_check -lGL $_ld_lm ; then - _gl=yes - libs_mplayer="$libs_mplayer -lGL $_ld_dl" - elif cc_check -lGL $_ld_lm $_ld_pthread ; then - _gl=yes - libs_mplayer="$libs_mplayer -lGL $_ld_pthread $_ld_dl" - elif cc_check -DGL_WIN32 -lopengl32 ; then - _gl=yes - _gl_win32=yes - libs_mplayer="$libs_mplayer -lopengl32 -lgdi32" - fi -else - _gl=no -fi -if test "$_gl" = yes ; then - def_gl='#define CONFIG_GL 1' - if test "$_gl_win32" = yes ; then - def_gl_win32='#define GL_WIN32 1' - _res_comment="win32 version" - fi - _vomodules="opengl $_vomodules" -else - def_gl='#undef CONFIG_GL' - def_gl_win32='#undef GL_WIN32' - _novomodules="opengl $_novomodules" -fi -echores "$_gl" - - echocheck "VIDIX" def_vidix='#undef CONFIG_VIDIX' def_vidix_drv_cyberblade='#undef CONFIG_VIDIX_DRV_CYBERBLADE' @@ -4867,6 +4814,61 @@ echores "$_corevideo" fi #if darwin +# make sure this stays below CoreVideo to avoid issues due to namespace +# conflicts between -lGL and -framework OpenGL +echocheck "OpenGL" +#Note: this test is run even with --enable-gl since we autodetect linker flags +if (test "$_x11" = yes || win32) && test "$_gl" != no ; then + cat > $TMPC << EOF +#ifdef GL_WIN32 +#include +#include +#else +#include +#include +#include +#endif +int main(void) { +#ifdef GL_WIN32 + HDC dc; + wglCreateContext(dc); +#else + glXCreateContext(NULL, NULL, NULL, True); +#endif + glFinish(); + return 0; +} +EOF + _gl=no + if cc_check -lGL $_ld_lm ; then + _gl=yes + libs_mplayer="$libs_mplayer -lGL $_ld_dl" + elif cc_check -lGL $_ld_lm $_ld_pthread ; then + _gl=yes + libs_mplayer="$libs_mplayer -lGL $_ld_pthread $_ld_dl" + elif cc_check -DGL_WIN32 -lopengl32 ; then + _gl=yes + _gl_win32=yes + libs_mplayer="$libs_mplayer -lopengl32 -lgdi32" + fi +else + _gl=no +fi +if test "$_gl" = yes ; then + def_gl='#define CONFIG_GL 1' + if test "$_gl_win32" = yes ; then + def_gl_win32='#define GL_WIN32 1' + _res_comment="win32 version" + fi + _vomodules="opengl $_vomodules" +else + def_gl='#undef CONFIG_GL' + def_gl_win32='#undef GL_WIN32' + _novomodules="opengl $_novomodules" +fi +echores "$_gl" + + echocheck "PNG support" if test "$_png" = auto ; then _png=no -- cgit v1.2.3 From 0f4dfe16f879305591052ab89d5dec1a0bb8edd6 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 4 Sep 2009 09:35:58 +0000 Subject: Split QuickTime check off from quartz check and use the result to enable/disable the QTX codec support. This is necessary since 64 bit compiles on OS X 10.5 at least do not support QuickTime. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29641 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 64fddee93c..9f91647c1b 100755 --- a/configure +++ b/configure @@ -722,6 +722,7 @@ _maemo=auto _coreaudio=auto _corevideo=auto _quartz=auto +quicktime=auto _macosx_finder=no _macosx_bundle=auto _sortsub=yes @@ -4764,23 +4765,43 @@ fi if darwin; then -echocheck "Quartz" -if test "$_quartz" = auto ; then +echocheck "QuickTime" +if test "$quicktime" = auto ; then cat > $TMPC < #include int main(void) { + ImageDescription *desc; EnterMovies(); ExitMovies(); + return 0; +} +EOF + quicktime=no + cc_check -framework QuickTime && quicktime=yes +fi +if test "$quicktime" = yes ; then + libs_mplayer="$libs_mplayer -framework QuickTime" + def_quicktime='#define CONFIG_QUICKTIME 1' +else + def_quicktime='#undef CONFIG_QUICKTIME' + _quartz=no +fi +echores $quicktime + +echocheck "Quartz" +if test "$_quartz" = auto ; then + cat > $TMPC < +int main(void) { CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false); return 0; } EOF _quartz=no - cc_check -framework Carbon -framework QuickTime && _quartz=yes + cc_check -framework Carbon && _quartz=yes fi if test "$_quartz" = yes ; then - libs_mplayer="$libs_mplayer -framework Carbon -framework QuickTime" + libs_mplayer="$libs_mplayer -framework Carbon" def_quartz='#define CONFIG_QUARTZ 1' _vomodules="quartz $_vomodules" else @@ -6792,12 +6813,10 @@ echores "$_real" echocheck "QuickTime codecs" _qtx_emulation=no def_qtx_win32='#undef CONFIG_QTX_CODECS_WIN32' -def_quicktime='#undef CONFIG_QUICKTIME' if test "$_qtx" = auto ; then - test "$_win32dll" = yes || darwin && _qtx=yes + test "$_win32dll" = yes || quicktime && _qtx=yes fi if test "$_qtx" = yes ; then - darwin && extra_ldflags="$extra_ldflags -framework QuickTime" && def_quicktime='#define CONFIG_QUICKTIME 1' def_qtx='#define CONFIG_QTX_CODECS 1' win32 && _qtx_codecs_win32=yes && def_qtx_win32='#define CONFIG_QTX_CODECS_WIN32 1' _codecmodules="qtx $_codecmodules" -- cgit v1.2.3 From dcfd043ea8d0c46929aad78596314d837c290d39 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 4 Sep 2009 12:24:45 +0000 Subject: 10l, -framework QuickTime must be added to extra_ldflags, not libs_mplayer since QuickTime is used also in mencoder (in the audio and video decoders and possibly from demux_mov, even though the latter one should only use the includes and not require linking). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29644 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 9f91647c1b..96c9b86108 100755 --- a/configure +++ b/configure @@ -4780,7 +4780,7 @@ EOF cc_check -framework QuickTime && quicktime=yes fi if test "$quicktime" = yes ; then - libs_mplayer="$libs_mplayer -framework QuickTime" + extra_ldflags="$extra_ldflags -framework QuickTime" def_quicktime='#define CONFIG_QUICKTIME 1' else def_quicktime='#undef CONFIG_QUICKTIME' -- cgit v1.2.3