[libreoffice] 02/03: initial system-collada2gltf stuff!
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 77c7dfb65de875cb2b47ec92c0a016477f462f16
Author: Rene Engelhard <rene@debian.org>
Date: Fri May 1 15:58:06 2015 +0200
initial system-collada2gltf stuff!
Conflicts:
changelog
---
changelog | 2 ++
rules | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/changelog b/changelog
index 2d01c73..07b6084 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:4.4.3-2) UNRELEASED; urgency=medium
* debian/patches/system-collada2gltf.diff: add system-collada2gltf support
from upstream master
+ * debian/rules:
+ - add initial incomplete conditional for system-collada2gltf
-- Rene Engelhard <rene@debian.org> Thu, 14 May 2015 22:36:50 +0200
diff --git a/rules b/rules
index cd7babb..b4da22f 100755
--- a/rules
+++ b/rules
@@ -334,6 +334,10 @@ ifeq "$(ENABLE_GLTF)" "y"
SYSTEM_STUFF += opencollada
OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser -I/usr/include/opencollada"
OPENCOLLADA_LIBS="-L/usr/lib/opencollada -lUTF -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser -lMathMLSolver -lpcre"
+ # FIXME
+ SYSTEM_STUFF += collada2gltf
+ COLLADA2GLTF_CFLAGS=""
+ COLLADA2GLTF_LIBS=""
endif
endif
SYSTEM_STUFF += openssl
@@ -679,6 +683,8 @@ else
ifneq (,$(findstring opencollada,$(SYSTEM_STUFF)))
BUILD_DEPS += , opencollada-dev [$(OOO_COLLADA_ARCHS)]
BUILD_DEPS += , libpcre3-dev [$(OOO_COLLADA_ARCHS)]
+ # FIXME
+ BUILD_DEPS += , libcollada2gltf-dev [$(OOO_COLLADA_ARCHS)]
endif
endif
endif
@@ -1837,6 +1843,7 @@ $(STAMP_DIR)/build-arch:
MARIADBCONFIG=$(MARIADBCONFIG) \
FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
+ COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) \
--without-doxygen --without-javadoc --disable-ext-wiki-publisher \
--disable-report-builder --disable-scripting-javascript \
@@ -1877,6 +1884,7 @@ $(STAMP_DIR)/build-indep:
MARIADBCONFIG=$(MARIADBCONFIG) \
FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
+ COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) --with-help $(CONFIGURE_FLAGS_LANG)
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: