[Libreoffice-commits] core.git: 3 commits - avmedia/source configure.ac external/freetype RepositoryExternal.mk

[Jan Holesovsky]

 RepositoryExternal.mk                         |    1 +
 avmedia/source/framework/modeltools.cxx       |    2 +-
 configure.ac                                  |    5 ++++-
 external/freetype/ExternalPackage_freetype.mk |   20 --------------------
 external/freetype/Module_freetype.mk          |    1 -
 5 files changed, 6 insertions(+), 23 deletions(-)

New commits:
commit 870ce1188ef7bfb6e57eed2894a20b2ea30b2225
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Apr 22 00:58:10 2014 +0200

    gltf: Trying to re-create the temp path fails on Windows.
    
    Change-Id: I30a5e1f5d09458beeb06479337b83f8479d861b5

diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index 10da986..506a36c 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -100,7 +100,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed:
     }
 
     // Reload json with modified path to external resources
-    rContent = ::ucbhelper::Content("file://" + OUString::createFromAscii(sUrl.c_str()),
+    rContent = ::ucbhelper::Content(sTempFileURL,
         uno::Reference<ucb::XCommandEnvironment>(),
         comphelper::getProcessComponentContext());
 
commit fe5dbe3847838aae3dff246451969eba4c3decda
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Apr 22 00:41:57 2014 +0200

    libgltf: Make it link with freetype on Windows.
    
    Change-Id: I57dcde58bb017ab087908154bc4a1af6d5d152b9

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e0a7fef..a8b9516 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1267,6 +1267,7 @@ endef
 
 define gb_LinkTarget__use_freetype
 $(call gb_LinkTarget_use_external,$(1),freetype_headers)
+$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
 
 endef
 
diff --git a/configure.ac b/configure.ac
index bc5cfd7..bfc00bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10378,6 +10378,9 @@ if test $_os != iOS -a $_os != Android -a $_os != Darwin -a "x$enable_gltf" != "
     BUILD_TYPE="$BUILD_TYPE LIBGLTF"
     if test "$test_freetype" = "no"; then
         BUILD_TYPE="$BUILD_TYPE FREETYPE"
+        if test "$COM" = "MSC"; then
+            FREETYPE_LIBS="${WORKDIR}/UnpackedTarball/freetype/objs/win32/vc2010/freetype248.lib"
+        fi
     fi
 else
     AC_MSG_RESULT([no])
diff --git a/external/freetype/ExternalPackage_freetype.mk b/external/freetype/ExternalPackage_freetype.mk
deleted file mode 100644
index 5e2f381..0000000
--- a/external/freetype/ExternalPackage_freetype.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,freetype,freetype))
-
-$(eval $(call gb_ExternalPackage_use_external_project,freetype,freetype))
-
-ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_files,freetype,$(call gb_UnpackedTarball_get_dir,freetype/instdir), \
-	objs/win32/vc2010/freetype248.lib \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk
index cb9bbc9..f6e316d 100644
--- a/external/freetype/Module_freetype.mk
+++ b/external/freetype/Module_freetype.mk
@@ -14,7 +14,6 @@ ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF)))
 $(eval $(call gb_Module_add_targets,freetype,\
 	ExternalProject_freetype \
 	UnpackedTarball_freetype \
-	ExternalPackage_freetype \
 ))
 
 endif
commit 0f72d53c05b823b8baaa29c452d09243e52afb5a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Apr 21 19:00:59 2014 +0200

    Enable libgltf on windows as well
    
    Change-Id: Id878bacc86facba34f77bde2fbbfd78b0a426c39

diff --git a/configure.ac b/configure.ac
index 209975c..bc5cfd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10372,7 +10372,7 @@ dnl ===================================================================
 
 ENABLE_GLTF=
 AC_MSG_CHECKING([whether to enable glTF support])
-if test $_os != iOS -a $_os != Android -a $_os != WINNT -a $_os != Darwin -a "x$enable_gltf" != "xno"; then
+if test $_os != iOS -a $_os != Android -a $_os != Darwin -a "x$enable_gltf" != "xno"; then
     ENABLE_GLTF=TRUE
     AC_MSG_RESULT([yes])
     BUILD_TYPE="$BUILD_TYPE LIBGLTF"