diff --git a/extdep/qt.cmake b/extdep/qt.cmake index 863810d1c..42f4331ab 100644 --- a/extdep/qt.cmake +++ b/extdep/qt.cmake @@ -1,5 +1,12 @@ if(APPLE) - +ExternalProject_add(qt + URL http://qtmirror.ics.com/pub/qtproject/official_releases/qt/5.3/5.3.2/single/qt-everywhere-opensource-src-5.3.2.tar.gz + BINARY_DIR qt-prefix/src/qt + PATCH_COMMAND patch -d qtmultimedia/src/plugins/avfoundation/mediaplayer < ${CMAKE_CURRENT_SOURCE_DIR}/qt_osx.patch + CONFIGURE_COMMAND ./configure -prefix ${ETH_DEPENDENCY_INSTALL_DIR} -system-zlib -qt-libpng -qt-libjpeg -confirm-license -opensource -nomake tests -release -nomake examples -no-xcb -arch x86_64 + BUILD_COMMAND make + INSTALL_COMMAND make install + ) elseif(WIN32) ExternalProject_Add(qt DEPENDS icu jom @@ -19,12 +26,6 @@ ExternalProject_Add_Step(qt configure_paths DEPENDERS configure ) -#ExternalProject_Add_Step(qt configure_visual -# COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools.bat -# DEPENDEES patch -# DEPENDERS configure -# ) - else() endif() diff --git a/extdep/qt_osx.patch b/extdep/qt_osx.patch new file mode 100644 index 000000000..7900f6094 --- /dev/null +++ b/extdep/qt_osx.patch @@ -0,0 +1,11 @@ +--- avfmediaplayersession.mm 2014-09-11 12:48:26.000000000 +0200 ++++ avfmediaplayersessionPatch.mm 2014-12-01 12:53:14.000000000 +0100 +@@ -295,7 +295,7 @@ + //AVPlayerItem "status" property value observer. + if (context == AVFMediaPlayerSessionObserverStatusObservationContext) + { +- AVPlayerStatus status = [[change objectForKey:NSKeyValueChangeNewKey] integerValue]; ++ AVPlayerStatus status = (AVPlayerStatus)[[change objectForKey:NSKeyValueChangeNewKey] integerValue]; + switch (status) + { + //Indicates that the status of the player is not yet known because