Attachment #384020 for bug #518664

Lines 3281-3286 endif # DESKTOP Link Here

(-)a/RepositoryExternal.mk (+18 lines)
3281		3281
3282	ifeq ($(ENABLE_GLTF),TRUE)	3282	ifeq ($(ENABLE_GLTF),TRUE)
3283		3283
		3284	ifneq ($(SYSTEM_LIBGLTF),TRUE)
		3285
3284	define gb_LinkTarget__use_libgltf	3286	define gb_LinkTarget__use_libgltf
3285	$(call gb_LinkTarget_set_include,$(1),\	3287	$(call gb_LinkTarget_set_include,$(1),\
3286	-I$(call gb_UnpackedTarball_get_dir,libgltf)/inc \	3288	-I$(call gb_UnpackedTarball_get_dir,libgltf)/inc \
Lines 3306-3311 $(call gb_ExternalProject_use_external_project,$(1),libgltf) Link Here
3306		3308
3307	endef	3309	endef
3308		3310
		3311	else # SYSTEM_LIBGLTF
		3312
		3313	define gb_LinkTarget__use_libgltf
		3314	$(call gb_LinkTarget_set_include,$(1),\
		3315	$$(INCLUDE) \
		3316	$(LIBGLTF_CFLAGS) \
		3317	)
		3318	$(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS))
		3319	$(call gb_LinkTarget_add_defs,$(1),\
		3320	-DSYSTEM_LIBGLTF \
		3321	)
		3322
		3323	endef
		3324
		3325	endif # SYSTEN_LIBGLTF
		3326
3309	define gb_LinkTarget__use_opencollada_parser	3327	define gb_LinkTarget__use_opencollada_parser
3310	$(call gb_LinkTarget_set_include,$(1),\	3328	$(call gb_LinkTarget_set_include,$(1),\
3311	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \	3329	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \

Lines 14-20 Link Here

(-)a/avmedia/source/opengl/oglframegrabber.hxx (+4 lines)
14	#include <com/sun/star/lang/XServiceInfo.hpp>	14	#include <com/sun/star/lang/XServiceInfo.hpp>
15	#include <com/sun/star/media/XFrameGrabber.hpp>	15	#include <com/sun/star/media/XFrameGrabber.hpp>
16		16
		17	#ifdef SYSTEM_LIBGLTF
		18	#include <libgltf/libgltf.h>
		19	#else
17	#include <libgltf.h>	20	#include <libgltf.h>
		21	#endif
18		22
19	namespace avmedia { namespace ogl {	23	namespace avmedia { namespace ogl {
20		24

Lines 14-20 Link Here

(-)a/avmedia/source/opengl/oglplayer.hxx (+4 lines)
14	#include <cppuhelper/basemutex.hxx>	14	#include <cppuhelper/basemutex.hxx>
15	#include <com/sun/star/lang/XServiceInfo.hpp>	15	#include <com/sun/star/lang/XServiceInfo.hpp>
16	#include <com/sun/star/media/XPlayer.hpp>	16	#include <com/sun/star/media/XPlayer.hpp>
		17	#ifdef SYSTEM_LIBGLTF
		18	#include <libgltf/libgltf.h>
		19	#else
17	#include <libgltf.h>	20	#include <libgltf.h>
		21	#endif
18	#include <vcl/opengl/OpenGLContext.hxx>	22	#include <vcl/opengl/OpenGLContext.hxx>
19	#include <vcl/timer.hxx>	23	#include <vcl/timer.hxx>
20		24

Lines 17-23 Link Here

(-)a/avmedia/source/opengl/oglwindow.hxx (+4 lines)
17	#include <com/sun/star/media/XPlayerWindow.hpp>	17	#include <com/sun/star/media/XPlayerWindow.hpp>
18	#include <com/sun/star/media/ZoomLevel.hpp>	18	#include <com/sun/star/media/ZoomLevel.hpp>
19		19
		20	#ifdef SYSTEM_LIBGLTF
		21	#include <libgltf/libgltf.h>
		22	#else
20	#include <libgltf.h>	23	#include <libgltf.h>
		24	#endif
21	#include <vcl/opengl/OpenGLContext.hxx>	25	#include <vcl/opengl/OpenGLContext.hxx>
22	#include <vcl/syschild.hxx>	26	#include <vcl/syschild.hxx>
23		27

Lines 127-132 export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@ Link Here

(-)a/config_host.mk.in (+3 lines)
127	export ENABLE_ORCUS=@ENABLE_ORCUS@	127	export ENABLE_ORCUS=@ENABLE_ORCUS@
128	export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@	128	export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@
129	export ENABLE_GLTF=@ENABLE_GLTF@	129	export ENABLE_GLTF=@ENABLE_GLTF@
		130	export SYSTEM_LIBGLTF=@SYSTEM_LIBGLTF@
		131	export LIBGLTF_CFLAGS=@LIBGLTF_CFLAGS@
		132	export LIBGLTF_LIBS=@LIBGLTF_LIBS@
130	export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@	133	export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
131	export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@	134	export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
132	export ENABLE_GTK3=@ENABLE_GTK3@	135	export ENABLE_GTK3=@ENABLE_GTK3@

Lines 1552-1557 AC_ARG_WITH(system-jpeg, Link Here

(-)a/configure.ac (-2 / +14 lines)
1552	[Use jpeg already on system.]),,	1552	[Use jpeg already on system.]),,
1553	[with_system_jpeg=auto])	1553	[with_system_jpeg=auto])
1554		1554
		1555	AC_ARG_WITH(system-libgltf,
		1556	AS_HELP_STRING([--with-system-libgltf],
		1557	[Use libgltf already on system.]),,
		1558	[with_system_libgltf=auto])
		1559
1555	AC_ARG_WITH(system-clucene,	1560	AC_ARG_WITH(system-clucene,
1556	AS_HELP_STRING([--with-system-clucene],	1561	AS_HELP_STRING([--with-system-clucene],
1557	[Use clucene already on system.]),,	1562	[Use clucene already on system.]),,
Lines 10561-10567 if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != And Link Here
10561	ENABLE_GLTF=TRUE	10566	ENABLE_GLTF=TRUE
10562	AC_MSG_RESULT([yes])	10567	AC_MSG_RESULT([yes])
10563	AC_DEFINE(HAVE_FEATURE_GLTF,1)	10568	AC_DEFINE(HAVE_FEATURE_GLTF,1)
10564	BUILD_TYPE="$BUILD_TYPE LIBGLTF"	10569	if test "$with_system_libgltf" = "yes"; then
		10570	SYSTEM_LIBGLTF=TRUE
		10571	PKG_CHECK_MODULES( LIBGLTF, libgltf-0.0 )
		10572	else
		10573	BUILD_TYPE="$BUILD_TYPE LIBGLTF"
		10574	fi
10565	# otherwise build fails in collada2gltf external because of std::shared_ptr	10575	# otherwise build fails in collada2gltf external because of std::shared_ptr
10566	if test "$have_std_shared_ptr" = "yes"; then	10576	if test "$have_std_shared_ptr" = "yes"; then
10567	BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF"	10577	BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF"
Lines 10570-10575 else Link Here
10570	AC_MSG_RESULT([no])	10580	AC_MSG_RESULT([no])
10571	fi	10581	fi
10572	AC_SUBST(ENABLE_GLTF)	10582	AC_SUBST(ENABLE_GLTF)
		10583	AC_SUBST(SYSTEM_LIBGLTF)
		10584	AC_SUBST(LIBGLTF_CFLAGS)
		10585	AC_SUBST(LIBGLTF_LIBS)
10573		10586
10574	# pdf import?	10587	# pdf import?
10575	AC_MSG_CHECKING([whether to build the PDF import feature])	10588	AC_MSG_CHECKING([whether to build the PDF import feature])
10576	-

Return to bug 518664