related: tdf#103884 remove gltf/collada feature

Change-Id: Icd26ad96c0337844ef1463dabfbe791caa00dd2d Reviewed-on: https://gerrit.libreoffice.org/43972 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
LibreOffice · Oct 30, 2017 · 08a43cc · 08a43cc
1 parent 8d994f8
commit 08a43cc
Show file tree

Hide file tree

Showing 80 changed files with 1,117 additions and 5,212 deletions.
diff --git a/Makefile.fetch b/Makefile.fetch
@@ -114,7 +114,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,CLUCENE,CLUCENE_TARBALL) \
 		$(call fetch_Optional,LIBCMIS,LIBCMIS_TARBALL) \
 		$(call fetch_Optional,COINMP,COINMP_TARBALL) \
-		$(call fetch_Optional,COLLADA2GLTF,COLLADA2GLTF_TARBALL) \
 		$(call fetch_Optional,CPPUNIT,CPPUNIT_TARBALL) \
 		$(call fetch_Optional,CT2N,CT2N_TARBALL) \
 		$(call fetch_Optional,CURL,CURL_TARBALL) \
@@ -187,7 +186,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,NSS,NSS_TARBALL) \
 		$(call fetch_Optional_pack,NUMBERTEXT_EXTENSION_PACK) \
 		$(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \
-		$(call fetch_Optional,OPENCOLLADA,OPENCOLLADA_TARBALL) \
 		$(call fetch_Optional,OPENLDAP,OPENLDAP_TARBALL) \
 		$(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \
 		$(call fetch_Optional,ORCUS,ORCUS_TARBALL) \
@@ -220,8 +218,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \
 		$(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \
 	,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
-	$(if $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \
-	, $(call fetch_Download_item,https://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL)))
 	@mkdir -p $(dir $@) && touch $@
 	@mkdir -p $(dir $@)/Executable
 

diff --git a/Repository.mk b/Repository.mk
@@ -634,12 +634,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	) \
 ))
 
-ifeq ($(ENABLE_GLTF),TRUE)
-$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
-    avmediaogl \
-))
-endif
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \
 	regactivex \

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
@@ -3479,111 +3479,6 @@ endif
 
 endif
 
-ifeq ($(ENABLE_GLTF),TRUE)
-
-ifneq ($(SYSTEM_LIBGLTF),TRUE)
-
-define gb_LinkTarget__use_libgltf
-$(call gb_LinkTarget_set_include,$(1),\
-    -I$(call gb_UnpackedTarball_get_dir,libgltf)/inc \
-    $$(INCLUDE) \
-)
-
-ifeq ($(COM),MSC)
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libgltf)/build/win32/$(wnt_arch_subdir_optional)$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/libgltf.lib,Release/libgltf.lib) \
-)
-else
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libgltf)/src/.libs/libgltf-0.1$(gb_StaticLibrary_PLAINEXT) \
-)
-endif
-
-$(call gb_LinkTarget_use_external_project,$(1),libgltf)
-
-endef
-
-else # SYSTEM_LIBGLTF
-
-define gb_LinkTarget__use_libgltf
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(LIBGLTF_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS))
-
-endef
-
-endif # SYSTEM_LIBGLTF
-
-ifeq ($(ENABLE_COLLADA),TRUE)
-
-ifeq ($(SYSTEM_OPENCOLLADA),TRUE)
-
-define gb_LinkTarget__use_opencollada_parser
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(OPENCOLLADA_CFLAGS) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),$(OPENCOLLADA_LIBS))
-
-endef
-
-else # !SYSTEM_OPENCOLLADA
-
-define gb_LinkTarget__use_opencollada_parser
-$(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADAFramework/include \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADASaxFrameworkLoader/include \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/GeneratedSaxParser/include \
-	$$(INCLUDE) \
-)
-
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	opencollada_parser \
-)
-endef
-
-endif # SYSTEM_OPENCOLLADA
-
-ifeq ($(SYSTEM_COLLADA2GLTF),TRUE)
-
-define gb_LinkTarget__use_collada2gltf
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(COLLADA2GLTF_CFLAGS) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),$(COLLADA2GLTF_LIBS))
-
-endef
-
-else # !SYSTEM_COLLADA2GLTF
-
-define gb_LinkTarget__use_collada2gltf
-$(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf) \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/assetModifiers \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/GLTF \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/helpers \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/JSON \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/dependencies/json/include/rapidjson/ \
-	$$(INCLUDE) \
-)
-
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	collada2gltf \
-)
-endef
-
-endif # SYSTEM_COLLADA2GLTF
-
-endif # ENABLE_COLLADA
-
-endif # ENABLE_GLTF
-
 define gb_LinkTarget__use_dconf
 $(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS))
 $(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS))

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
@@ -60,29 +60,6 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
 	vcl \
 ))
 
-ifeq ($(ENABLE_GLTF),TRUE)
-$(eval $(call gb_Library_add_exception_objects,avmedia,\
-	avmedia/source/framework/modeltools \
-))
-endif
-
-ifeq ($(ENABLE_COLLADA),TRUE)
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,avmedia,\
-	-lrt \
-))
-endif
-
-$(eval $(call gb_Library_use_externals,avmedia,\
-	collada2gltf \
-	libxml2 \
-	opencollada_parser \
-	libpng \
-))
-
-endif
-
 $(eval $(call gb_Library_add_exception_objects,avmedia,\
 	avmedia/source/framework/mediacontrol \
 	avmedia/source/framework/MediaControlBase \

diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
@@ -58,11 +58,6 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 ))
 endif
 
-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/avmedia/source/framework/collada_headers.hxx b/avmedia/source/framework/collada_headers.hxx