[Libreoffice-commits] core.git: configure.ac download.lst external/libgltf vcl/source

[Markus Mohrhard]

 configure.ac                                |    2 +-
 download.lst                                |    2 +-
 external/libgltf/ExternalProject_libgltf.mk |    2 ++
 external/libgltf/UnpackedTarball_libgltf.mk |    1 -
 vcl/source/opengl/OpenGLContext.cxx         |    1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 887c088f20fe36b9b15484d0a5ec9416ba6cd310
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jul 18 19:11:14 2014 +0200

    make libgltf compile on OSX
    
    Change-Id: Ie39292137f931bfd557f66c485e104cf5d5089b8

diff --git a/configure.ac b/configure.ac
index d820cfd..45f77ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10600,7 +10600,7 @@ dnl Check whether to enable glTF support
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable glTF support])
 ENABLE_GLTF=
-if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != Android; then
+if test "x$enable_gltf" != "xno" -a $_os != iOS -a $_os != Android; then
     ENABLE_GLTF=TRUE
     AC_MSG_RESULT([yes])
     AC_DEFINE(HAVE_FEATURE_GLTF,1)
diff --git a/download.lst b/download.lst
index ee8cf9c..c4e1d7d 100644
--- a/download.lst
+++ b/download.lst
@@ -87,7 +87,7 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
 export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
 export LIBEOT_TARBALL := libeot-0.01.tar.bz2
 export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
-export LIBGLTF_TARBALL := 3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2
+export LIBGLTF_TARBALL := c1af7fbc6dde8fcbdca4ec22dd78c4c1-libgltf-0.0.0.tar.bz2
 export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index dfbe271..d68582f 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -58,6 +58,8 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& ./configure \
+			--disable-shared \
+			--enable-static \
 			--with-pic \
 			$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
 			--disable-werror \
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index a7565ea..176c1d1 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,libgltf,--binary))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
-	external/libgltf/pathces/fix_rendering_of_resized_model.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index bf63d09..ee916bb 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -475,6 +475,7 @@ bool OpenGLContext::ImplInit()
 #elif defined( MACOSX )
 
     CGLPixelFormatAttribute pixelFormatAttributes[] = {
+        kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute) kCGLOGLPVersion_3_2_Core,
         kCGLPFAColorSize, (CGLPixelFormatAttribute) 24,
         kCGLPFAAlphaSize, (CGLPixelFormatAttribute) 8,
         kCGLPFADoubleBuffer,