From ec39a5a3336f1aea6aa0755286c202c3814fe72b Mon Sep 17 00:00:00 2001 From: Marcus Calhoun-Lopez Date: Wed, 28 Dec 2016 10:09:36 -0700 Subject: [PATCH] qt5-qtmultimedia: build on Mac OS X 10.7 see https://trac.macports.org/ticket/52922 --- aqua/qt5/Portfile | 8 ++++++++ aqua/qt5/files/patch-firstObject.diff | 15 +++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 aqua/qt5/files/patch-firstObject.diff diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile index 4197b8917f2d9..c79d35fc62d85 100644 --- a/aqua/qt5/Portfile +++ b/aqua/qt5/Portfile @@ -1121,6 +1121,14 @@ foreach {module module_info} [array get modules] { # https://codereview.qt-project.org/#/c/172619/ patchfiles-append patch-qtconn-for-10.12.diff } + + # special case + if { ${module} eq "qtmultimedia" } { + if { [vercmp ${os.version} 12] < 0} { + # see https://trac.macports.org/ticket/52922 + patchfiles-append patch-firstObject.diff + } + } } } diff --git a/aqua/qt5/files/patch-firstObject.diff b/aqua/qt5/files/patch-firstObject.diff new file mode 100644 index 0000000000000..7b42bb9a56a06 --- /dev/null +++ b/aqua/qt5/files/patch-firstObject.diff @@ -0,0 +1,15 @@ +--- src/plugins/avfoundation/camera/avfcamerautility.mm.orig 2016-09-12 03:58:51.000000000 -0700 ++++ src/plugins/avfoundation/camera/avfcamerautility.mm 2016-12-28 09:44:52.000000000 -0700 +@@ -42,6 +42,12 @@ + #include + #include + ++// see https://trac.macports.org/ticket/52922 ++// from the 10.9 SDK ++@interface NSArray (MacPortsCompatibilityFirstObject) ++- (id)firstObject NS_AVAILABLE(10_6, 4_0); ++@end ++ + QT_BEGIN_NAMESPACE + + AVFPSRange qt_connection_framerates(AVCaptureConnection *videoConnection)