Revision: 115420 https://trac.macports.org/changeset/115420 Author: jeremyhu@macports.org Date: 2014-01-01 12:39:55 -0800 (Wed, 01 Jan 2014) Log Message: ----------- gstreamer1-gst-plugins-good: Leopard build fix by disablibg osxvideosink Modified Paths: -------------- trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile Added Paths: ----------- trunk/dports/gnome/gstreamer1-gst-plugins-good/files/leopard-no-osxvideo.patch Removed Paths: ------------- trunk/dports/gnome/gstreamer1-gst-plugins-good/files/osxvideosink-deployment-target.patch Modified: trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile =================================================================== --- trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile 2014-01-01 19:46:46 UTC (rev 115419) +++ trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile 2014-01-01 20:39:55 UTC (rev 115420) @@ -54,7 +54,8 @@ port:gobject-introspection \ port:pulseaudio -patchfiles osxvideosink-deployment-target.patch +patchfiles po.patch \ + leopard-no-osxvideo.patch post-patch { # gst/goom is the only thing using this, and its mmx code is buggy (as of 0.10.31) Added: trunk/dports/gnome/gstreamer1-gst-plugins-good/files/leopard-no-osxvideo.patch =================================================================== --- trunk/dports/gnome/gstreamer1-gst-plugins-good/files/leopard-no-osxvideo.patch (rev 0) +++ trunk/dports/gnome/gstreamer1-gst-plugins-good/files/leopard-no-osxvideo.patch 2014-01-01 20:39:55 UTC (rev 115420) @@ -0,0 +1,43 @@ +commit 4169ccd8df414cefe3611dfead9c7ef82fa49fe1 +Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Wed Jan 1 12:23:50 2014 -0800 + + configure: Disable osxvideo on Leopard and earlier + + This also moves the "other platforms" check in OS X video to before the + variable is read + + Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> + +diff --git a/configure.ac b/configure.ac +index 3cb5109..b29f634 100644 +--- configure.ac ++++ configure.ac +@@ -486,17 +486,17 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_OSX_VIDEO, true) + HAVE_OSX_VIDEO="no" + AG_GST_CHECK_FEATURE(OSX_VIDEO, [OSX video], osxvideosink, [ + AC_CHECK_HEADER(OpenGL/gl.h, HAVE_OSX_VIDEO="yes", HAVE_OSX_VIDEO="no") +-]) +-dnl in case header OpenGL/gl.h is found on other platforms +-case "$host" in +- *-*darwin*) +- dnl do nothing +- ;; +- *) +- HAVE_OSX_VIDEO="no" +- ;; +-esac + ++ dnl in case header OpenGL/gl.h is found on other platforms (or older, unsupported OS X) ++ case "$host" in ++ *-*darwin1*) ++ dnl do nothing on Snow Leopard or newer ++ ;; ++ *) ++ HAVE_OSX_VIDEO="no" ++ ;; ++ esac ++]) + + dnl *** Video 4 Linux 2 *** + dnl for information about the header/define, see sys/v4l2/gstv4l2element.h Deleted: trunk/dports/gnome/gstreamer1-gst-plugins-good/files/osxvideosink-deployment-target.patch =================================================================== --- trunk/dports/gnome/gstreamer1-gst-plugins-good/files/osxvideosink-deployment-target.patch 2014-01-01 19:46:46 UTC (rev 115419) +++ trunk/dports/gnome/gstreamer1-gst-plugins-good/files/osxvideosink-deployment-target.patch 2014-01-01 20:39:55 UTC (rev 115420) @@ -1,20 +0,0 @@ ---- sys/osxvideo/osxvideosink.h.orig 2013-12-30 12:02:55.000000000 -0800 -+++ sys/osxvideo/osxvideosink.h 2013-12-30 12:03:16.000000000 -0800 -@@ -42,7 +42,7 @@ GST_DEBUG_CATEGORY_EXTERN (gst_debug_osx - - /* The hack doesn't work on leopard, the _CFMainPThread symbol - * is doesn't exist in the CoreFoundation library */ --#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5 -+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - #ifdef RUN_NS_APP_THREAD - #undef RUN_NS_APP_THREAD - #endif -@@ -122,7 +122,7 @@ GType gst_osx_video_sink_get_type(void); - @end - - --#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5 -+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - @interface GstWindowDelegate : NSObject - #else - @interface GstWindowDelegate : NSObject <NSWindowDelegate>