# HG changeset patch
# User nplourde
# Date 1114774867 0
# Node ID 21e7332ea44e783225b42dc493cdf103e9759f03
# Parent  7a56eccbfcc6b58481d769e961afc77165863627
macosx core video module

diff -r 7a56eccbfcc6 -r 21e7332ea44e configure
--- a/configure	Fri Apr 29 11:11:59 2005 +0000
+++ b/configure	Fri Apr 29 11:41:07 2005 +0000
@@ -3202,6 +3202,19 @@
 fi
 echores "$_macosx"
 
+echocheck "Mac OS X Core Video Support"
+if test "$_macosx" = yes ; then
+	if test "`sysctl -n kern.osrelease | cut -d "." -f 1`" = "8" ; then
+		echo "yes"
+		_vosrc="$_vosrc vo_macosx.m"
+		_vomodules="macosx $_vomodules"
+		_macosx_frameworks="$_macosx_frameworks -framework Cocoa -framework QuartzCore -framework OpenGL"
+	else
+		echo "no"
+		_novomodules="macosx $_novomodules"
+	fi
+fi
+
 echocheck "Mac OS X Finder Support"
 if test "$_macosx_finder_support" = auto ; then
   _macosx_finder_support=$_macosx
@@ -7538,7 +7551,7 @@
 #############################################################################
 
 echo "Creating libvo/config.mak"
-_voobj=`echo $_vosrc | sed -e 's/\.c/\.o/g'`
+_voobj=`echo $_vosrc | sed -e 's/\.c/\.o/g;s/\.m/\.o/g'`
 cat > libvo/config.mak << EOF
 include ../config.mak
 OPTIONAL_SRCS = $_vosrc
diff -r 7a56eccbfcc6 -r 21e7332ea44e libvo/Makefile
--- a/libvo/Makefile	Fri Apr 29 11:11:59 2005 +0000
+++ b/libvo/Makefile	Fri Apr 29 11:41:07 2005 +0000
@@ -4,7 +4,8 @@
 LIBNAME = libvo.a
 
 SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c
-OBJS=$(SRCS:.c=.o)
+OBJS_TEMP=$(basename $(SRCS))
+OBJS=$(OBJS_TEMP:%=%.o)
 
 ifeq ($(VIDIX),yes)
 SRCS += vosub_vidix.c
@@ -19,6 +20,9 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
+.m.o:
+	$(CC) -c $(CFLAGS) -o $@ $<
+
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
 	$(RANLIB) $(LIBNAME)
diff -r 7a56eccbfcc6 -r 21e7332ea44e libvo/video_out.c
--- a/libvo/video_out.c	Fri Apr 29 11:11:59 2005 +0000
+++ b/libvo/video_out.c	Fri Apr 29 11:41:07 2005 +0000
@@ -121,6 +121,7 @@
 extern vo_functions_t video_out_tga;
 #endif
 #ifdef MACOSX
+extern vo_functions_t video_out_macosx;
 extern vo_functions_t video_out_quartz;
 #endif
 #ifdef HAVE_PNM
@@ -139,6 +140,7 @@
         &video_out_directx,
 #endif
 #ifdef MACOSX
+	&video_out_macosx,
 	&video_out_quartz,
 #endif
 #ifdef HAVE_XMGA