diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | sys/Makefile.am | 15 |
3 files changed, 48 insertions, 5 deletions
@@ -1,3 +1,17 @@ +2004-06-22 Zaheer Abbas Merali <zaheerabbas at merali.org> + + * configure.ac: + Add objective-c support if running in Darwin/Mac OS X + * sys/Makefile.am: + * sys/osxvideo: + * sys/osxvideo/Makefile.am: + * sys/osxvideo/osxvideosink.h: + * sys/osxvideo/osxvideosink.m: + * sys/osxvideo/cocoawindow.h: + * sys/osxvideo/cocoawindow.m: + Add osxvideosink, a cocoa-based osx video sink + + 2004-06-19 Jan Schmidt <thaytan@mad.scientist.com> * ext/dvdnav/gst-dvd: Grab the gconf key from the right spot diff --git a/configure.ac b/configure.ac index e5bab84e..8560dec2 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,17 @@ AC_PROG_CC AM_PROG_CC_STDC AM_PROG_AS AS="${CC}" - +dnl objective-c for OSX (should check if os is darwin) +case "$host" in + *-*darwin*) + AM_CONDITIONAL([am__fastdepOBJC], false) + OBJC="${CC}" + AC_SUBST(OBJC) + OBJCFLAGS="${CFLAGS}" + AC_SUBST(OBJCFLAGS) + _AM_DEPENDENCIES(OBJC) + ;; +esac dnl the gettext stuff needed AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT([external]) @@ -476,6 +486,17 @@ GST_CHECK_FEATURE(OSX_AUDIO, [OSX audio], osxaudiosrc osxaudiosink, [ AC_CHECK_HEADER(CoreAudio/CoreAudio.h, HAVE_OSX_AUDIO="yes", HAVE_OSX_AUDIO="no") ]) +dnl *** OS X video *** +translit(dnm, m, l) AM_CONDITIONAL(USE_OSX_VIDEO, true) +HAVE_OSX_VIDEO="no" +case "$host" in + *-*darwin*) + GST_CHECK_FEATURE(OSX_VIDEO, [OSX video], osxvideosink, [ + AC_CHECK_HEADER(OpenGL/gl.h, HAVE_OSX_VIDEO="yes", HAVE_OSX_VIDEO="no") + ]) + ;; +esac + dnl *** QuickCam *** translit(dnm, m, l) AM_CONDITIONAL(USE_QCAM, true) GST_CHECK_FEATURE(QCAM, [QuickCam], qcamsrc, [ @@ -1856,6 +1877,7 @@ sys/dxr3/Makefile sys/glsink/Makefile sys/oss/Makefile sys/osxaudio/Makefile +sys/osxvideo/Makefile sys/qcam/Makefile sys/sunaudio/Makefile sys/v4l/Makefile diff --git a/sys/Makefile.am b/sys/Makefile.am index b2631c5e..9f53cdb3 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -16,6 +16,12 @@ else OSX_AUDIO_DIR= endif +if USE_OSX_VIDEO +OSX_VIDEO_DIR=osxvideo +else +OSX_VIDEO_DIR= +endif + if USE_QCAM QCAM_DIR=qcam else @@ -64,9 +70,10 @@ else CDROM_DIR= endif -SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(QCAM_DIR) $(SUNAUDIO_DIR) \ - $(V4L_DIR) $(V4L2_DIR) $(VCD_DIR) $(CDROM_DIR) $(XI_DIR) $(XV_DIR) +SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(QCAM_DIR) \ + $(SUNAUDIO_DIR) $(V4L_DIR) $(V4L2_DIR) $(VCD_DIR) $(CDROM_DIR) \ + $(XI_DIR) $(XV_DIR) -DIST_SUBDIRS=dxr3 oss osxaudio qcam sunaudio v4l v4l2 vcd ximage xvimage \ - glsink cdrom +DIST_SUBDIRS=dxr3 oss osxaudio osxvideo qcam sunaudio v4l v4l2 vcd ximage \ + xvimage glsink cdrom |