From 24e08eb5f2e54fce46a6ff504276aa8da4bf2fa2 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Wed, 11 Jan 2012 22:29:06 +0100 Subject: macosx_finder_args: use cocoa instead of carbon macosx_finder_args was using Carbon and wasn't usable any longer on modern versions of MacOSX. This is very useful to embed mplayer in a mac application bundle. When using application bundles, the operating system will call the main function with only one argument that identifies the process serial number (this is some additional process identifier in osx other than the pid). File open events are then dispatched to the application through events that must be handled accordingly. --- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 53a9ead726..520c37e30b 100755 --- a/configure +++ b/configure @@ -3579,7 +3579,7 @@ echocheck "Mac OS X Finder Support" def_macosx_finder='#undef CONFIG_MACOSX_FINDER' if test "$_macosx_finder" = yes ; then def_macosx_finder='#define CONFIG_MACOSX_FINDER 1' - extra_ldflags="$extra_ldflags -framework Carbon" + extra_ldflags="$extra_ldflags -framework Cocoa" fi echores "$_macosx_finder" @@ -3588,7 +3588,6 @@ def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE' test "$_macosx_bundle" = auto && _macosx_bundle=$_macosx_finder if test "$_macosx_bundle" = yes ; then def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1' - extra_ldflags="$extra_ldflags -framework Carbon" fi echores "$_macosx_bundle" -- cgit v1.2.3 From d0f0bf7fd2b021c17432de5108fd7fa3534a2a10 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 4 Mar 2012 20:12:57 +0100 Subject: vo_quartz: remove this video output This video output is not useful anymore. It is based on Carbon to draw the mplayer window and this has been deprecated by Apple in 10.5. The upcoming 10.8 OSX release should deprecate most of Carbon, so it doesn't make sense to keep vo_quartz in the codebase when there are modern and better alternatives (vo_gl and vo_corevideo). --- configure | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 520c37e30b..22ea2b185e 100755 --- a/configure +++ b/configure @@ -437,7 +437,6 @@ Video output: --disable-yuv4mpeg disable yuv4mpeg video output [enable] --disable-corevideo disable CoreVideo video output [autodetect] --disable-cocoa disable Cocoa OpenGL backend [autodetect] - --disable-quartz disable Quartz video output [autodetect] Audio output: --disable-alsa disable ALSA audio output [autodetect] @@ -699,7 +698,6 @@ _qtx=auto _coreaudio=auto _corevideo=auto _cocoa=auto -_quartz=auto quicktime=auto _macosx_finder=no _macosx_bundle=auto @@ -1135,8 +1133,6 @@ for ac_option do --disable-corevideo) _corevideo=no ;; --enable-cocoa) _cocoa=yes ;; --disable-cocoa) _cocoa=no ;; - --enable-quartz) _quartz=yes ;; - --disable-quartz) _quartz=no ;; --enable-macosx-finder) _macosx_finder=yes ;; --disable-macosx-finder) _macosx_finder=no ;; --enable-macosx-bundle) _macosx_bundle=yes ;; @@ -4213,25 +4209,9 @@ if test "$quicktime" = yes ; then def_quicktime='#define CONFIG_QUICKTIME 1' else def_quicktime='#undef CONFIG_QUICKTIME' - _quartz=no fi echores $quicktime -echocheck "Quartz" -if test "$_quartz" = auto ; then - _quartz=no - statement_check Carbon/Carbon.h 'CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false)' -framework Carbon && _quartz=yes -fi -if test "$_quartz" = yes ; then - libs_mplayer="$libs_mplayer -framework Carbon" - def_quartz='#define CONFIG_QUARTZ 1' - vomodules="quartz $vomodules" -else - def_quartz='#undef CONFIG_QUARTZ' - novomodules="quartz $novomodules" -fi -echores $_quartz - echocheck "CoreVideo" if test "$_corevideo" = auto ; then cat > $TMPC < Date: Fri, 16 Mar 2012 21:41:41 +0100 Subject: configure: disable X11 opengl backend if Cocoa is enabled The recommended way to get function pointers to the functions in the OpenGL library is through dlopen/dlsym/dlclose. This causes problems in the Cocoa OpenGL backend when -lGL (X11's OpenGL headers) is linked to the binary together with -framework OpenGL. The linked OpenGL symbols are always from -lGL, causing all the function pointers to point to null when getFunctions is called against a Cocoa OpenGL context. For this reason change the configure autodetection code to disable the vo_gl X11 backend when cocoa is active. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 22ea2b185e..4374d745b6 100755 --- a/configure +++ b/configure @@ -4548,7 +4548,7 @@ int main(int argc, char *argv[]) { EOF _gl=no for _ld_tmp in "" -lGL "-lGL -lXdamage" "-lGL $_ld_pthread" ; do - if cc_check $_ld_tmp $_ld_lm ; then + if test "$_cocoa" != yes && cc_check $_ld_tmp $_ld_lm ; then _gl=yes _gl_x11=yes libs_mplayer="$libs_mplayer $_ld_tmp $_ld_dl" -- cgit v1.2.3