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

[Tor Lillqvist]

 avmedia/Module_avmedia.mk                |    3 ++-
 postprocess/Rdb_services.mk              |    4 +++-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 08df97bbe68efbe31d40cb3fd40fe24103a078f5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Mar 28 10:50:33 2016 +0300

    WaE: 'userSpaceScaleFactor' is deprecated: first deprecated in OS X 10.7 ...
    
    ... Use -convertRectToBacking: or -backingScaleFactor instead
    
    Change-Id: Ided81790349304172ab911f93475cdc40a676a7b

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 28d75f6..46a4386 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1855,7 +1855,7 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpsOnly, "textbox-wps-only.docx")
 #ifdef MACOSX
     // FIXME: The assert below fails wildly on a Retina display
     NSScreen* nsScreen = [ NSScreen mainScreen ];
-    CGFloat scaleFactor = [ nsScreen userSpaceScaleFactor ]; // for instance on the 5K Retina iMac,
+    CGFloat scaleFactor = [ nsScreen backingScaleFactor ];   // for instance on the 5K Retina iMac,
                                                              // [NSScreen mainScreen].frame.size is 2560x1440,
                                                              // while real display size is 5120x2880
     if ( nsScreen.frame.size.width * scaleFactor > 4000 )
commit e9c911074849c3729a8f5023b9db209801a8c4af
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Mar 27 12:10:46 2016 +0300

    avmediaogl now seems to require ENABLE_GLTF for some reason
    
    Change-Id: Id5b65b944ed06598238f5ab139c52d4de5ca1f84

diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index ff5ba90..db5fcae 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -56,10 +56,11 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 endif
 
 ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_GLTF),TRUE)
 $(eval $(call gb_Module_add_targets,avmedia,\
 	Library_avmediaogl \
 ))
 endif
-
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 8f3405b..c411fc1 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -230,7 +230,9 @@ $(eval $(call gb_Rdb_add_components,services,\
 		wizards/com/sun/star/wizards/table/table \
 	) \
     $(if $(ENABLE_OPENGL), \
-		$(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \
+        $(if $(ENABLE_GLTF), \
+			$(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \
+		) \
 	) \
 ))