[Libreoffice-commits] core.git: 2 commits - avmedia/Module_avmedia.mk postprocess/Rdb_services.mk vcl/osx

[Tor Lillqvist]

 avmedia/Module_avmedia.mk   |    2 ++
 postprocess/Rdb_services.mk |    4 +++-
 vcl/osx/PictToBmpFlt.cxx    |    1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a4e81b7c313e5cb0e0f23a8605502b4b0b7f599e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Aug 4 23:29:12 2016 +0300

    No QuickTime in the 10.12 SDK
    
    Finally. It has been documented as deprecated for years, after all.
    
    Change-Id: Ia7f81639b2e0b313e0a8931f49c3902c5856339d

diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index fb9497d..a037b4d 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -37,11 +37,13 @@ endif
 
 ifeq ($(OS),MACOSX)
 ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
+ifneq ($(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)),)
 $(eval $(call gb_Module_add_targets,avmedia,\
 	Library_avmediaQuickTime \
 ))
 endif
 endif
+endif
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,avmedia,\
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 775022a..f56e55b 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -127,7 +127,9 @@ $(eval $(call gb_Rdb_add_components,services,\
 	$(if $(filter MACOSX,$(OS)), \
 		$(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
 		$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
-			$(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
+			$(if $(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)), \
+				$(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
+			) \
 		) \
 		lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \
 		fpicker/source/aqua/fps_aqua \
commit aabfbdbd8b096d4dfc31cb75aa6a119a19d705ef
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Aug 4 23:24:12 2016 +0300

    Drop unneeded include
    
    There is no <QuickTime/QuickTime.h> in the 10.12 SDK anyway.
    
    Change-Id: I0d937d4b036d118fcb503543a516e55f859a3718

diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx
index af8740b..153c036 100644
--- a/vcl/osx/PictToBmpFlt.cxx
+++ b/vcl/osx/PictToBmpFlt.cxx
@@ -19,7 +19,6 @@
 
 #include <premac.h>
 #include <Carbon/Carbon.h>
-#include <QuickTime/QuickTime.h>
 #include <postmac.h>
 
 #include <string.h>