This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.
commit ce92d44107210948395baebf1fa188ca11febfe4
Author: Rene Engelhard <r...@debian.org>
Date: Fri Nov 7 00:10:27 2014 +0100
decouple collada from gltf; if enabled do it only for i386/amd64 for now
---
rules | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/rules b/rules
index 5547efd..6324ab1 100755
--- a/rules
+++ b/rules
@@ -326,6 +326,14 @@ SYSTEM_STUFF += libgltf
# and system-collada2gltf working
ifeq "$(ENABLE_GLTF)" "y"
ENABLE_COLLADA=n
+ # enable COLLADA (if any) only on i386/amd64 for now, rapidjson does seem
+ # to have alignment problems on other archs (e.g. arm*)
+# ifeq "$(DEB_HOST_ARCH)" "amd64"
+# ENABLE_COLLADA=y
+# endif
+# ifeq "$(DEB_HOST_ARCH)" "i386"
+# ENABLE_COLLADA=y
+# endif
ifeq "$(ENABLE_COLLADA)" "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"
@@ -503,8 +511,8 @@ ifeq "$(ENABLE_GLTF)" "y"
ENABLE_GLTF=n
endif
$(eval $(call gen_no_archs,OOO_GLTF_ARCHS))
- OOO_COLLADA_ARCHS=$(OOO_GLTF_ARCHS)
- OOO_NO_COLLADA_ARCHS=$(OOO_NO_GLTF_ARCHS)
+ OOO_COLLADA_ARCHS=amd64 i386
+ $(eval $(call gen_no_archs,OOO_COLLADA_ARCHS))
endif
IGNORE_MAKE_CHECK_FAILURES=-
@@ -684,8 +692,8 @@ else
CONFIGURE_FLAGS += --disable-collada
else
ifneq (,$(findstring opencollada,$(SYSTEM_STUFF)))
- BUILD_DEPS += , opencollada-dev$(OOO_NO_COLLADA_ARCHS)
- BUILD_DEPS += , libpcre3-dev$(OOO_NO_COLLADA_ARCHS)
+ BUILD_DEPS += , opencollada-dev [$(OOO_COLLADA_ARCHS)]
+ BUILD_DEPS += , libpcre3-dev [$(OOO_COLLADA_ARCHS)]
endif
endif
endif
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xof3j-0006og...@moszumanska.debian.org
