[MPlayer-cvslog] r38256 - in trunk: configure libvo/osx_objc_common.m

[reimar]

Author: reimar
Date: Fri Feb 19 10:13:37 2021
New Revision: 38256

Log:
configure: Fix compilation for (32-bit) PowerPC Macs.

Modified:
   trunk/configure
   trunk/libvo/osx_objc_common.m

Modified: trunk/configure
==============================================================================
--- trunk/configure	Fri Feb 19 07:07:54 2021	(r38255)
+++ trunk/configure	Fri Feb 19 10:13:37 2021	(r38256)
@@ -4064,6 +4064,12 @@ if test "$stdatomic_h" = no ; then
     CFLAGS="-Icompat/atomics/win32 $CFLAGS"
   else
     CFLAGS="-Icompat/atomics/gcc $CFLAGS"
+    if ! statement_check ffmpeg/compat/atomics/gcc/stdatomic.h "atomic_int_least64_t a; atomic_fetch_add_explicit(&a, 5, memory_order_relaxed)" ; then
+        # These are the only ones needing 64-bit atomics.
+        # They are not worth adding a dependency or even worse switching to a
+        # badly inefficient pthreads-based atomics implementation
+        libavmuxers=$(filter_out_component muxer 'FIFO FIFO_TEST')
+    fi
   fi
 fi
 
@@ -5398,7 +5404,8 @@ if test "$quicktime" = auto ; then
   statement_check QuickTime/QuickTime.h 'ImageDescription *desc; EnterMovies(); ExitMovies()' -framework QuickTime && quicktime=yes
 fi
 if test "$quicktime" = yes ; then
-  extra_ldflags="$extra_ldflags -framework QuickTime"
+  # Carbon framework needed for symbols like SoundConverterOpen and DisposeGWorld
+  extra_ldflags="$extra_ldflags -framework QuickTime -framework Carbon"
   def_quicktime='#define CONFIG_QUICKTIME 1'
 else
   def_quicktime='#undef CONFIG_QUICKTIME'

Modified: trunk/libvo/osx_objc_common.m
==============================================================================
--- trunk/libvo/osx_objc_common.m	Fri Feb 19 07:07:54 2021	(r38255)
+++ trunk/libvo/osx_objc_common.m	Fri Feb 19 10:13:37 2021	(r38256)
@@ -142,8 +142,10 @@ void vo_osx_swap_buffers(void)
 	NSScreen *screen_handle = [self fullscreen_screen];
 	NSRect screen_frame = [screen_handle frame];
 	NSSize size = screen_frame.size;
+#ifndef __POWER__
 	if ([self respondsToSelector:@selector(convertSizeToBacking:)])
 		size = [self convertSizeToBacking:size];
+#endif
 	vo_screenwidth = size.width;
 	vo_screenheight = size.height;
 	xinerama_x = screen_frame.origin.x;
@@ -249,8 +251,10 @@ void vo_osx_swap_buffers(void)
 	[super reshape];
 	NSRect frame = [self frame];
 	NSSize size = frame.size;
+#ifndef __POWER__
 	if ([self respondsToSelector:@selector(convertSizeToBacking:)])
 		size = [self convertSizeToBacking:size];
+#endif
 	vo_dwidth  = size.width;
 	vo_dheight = size.height;
 	event_flags |= VO_EVENT_RESIZE;
@@ -407,8 +411,10 @@ void vo_osx_swap_buffers(void)
 		[self update_screen_info];
 
 		NSSize size = { vo_screenwidth, vo_screenheight };
+#ifndef __POWER__
 		if ([self respondsToSelector:@selector(convertSizeFromBacking:)])
 			size = [self convertSizeFromBacking:size];
+#endif
 		[window setFrame:NSMakeRect(xinerama_x, xinerama_y, size.width, size.height) display:YES animate:animate]; //zoom-in window with nice useless sfx
 		old_view_frame = [self bounds];