[libreoffice] 02/02: ENABLE_COLLADA=y on i386/amd64
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 55fd281e2ca0e971bda0102249440afb68a43d3c
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jul 28 08:17:24 2015 +0200
ENABLE_COLLADA=y on i386/amd64
---
changelog | 6 +++++-
control | 10 ++++++++++
rules | 14 +++++++-------
3 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/changelog b/changelog
index c11a8b6..85ba475 100644
--- a/changelog
+++ b/changelog
@@ -2,7 +2,11 @@ libreoffice (1:4.4.5-1) unstable; urgency=medium
* New upstream release
- -- Rene Engelhard <rene@debian.org> Fri, 24 Jul 2015 00:41:35 +0200
+ * debian/rules:
+ - ENABLE_COLLADA=y (for i386/amd64) now that the libs finally are in
+ Debian
+
+ -- Rene Engelhard <rene@debian.org> Tue, 28 Jul 2015 08:16:45 +0200
libreoffice (1:4.4.4-1) unstable; urgency=medium
diff --git a/control b/control
index c74e048..a2ec38e 100644
--- a/control
+++ b/control
@@ -48,6 +48,7 @@ Build-Depends: ant (>= 1.7.0),
libcdr-dev (>= 0.1),
libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.5.0),
+ libcollada2gltfconvert-dev [amd64 i386],
libcppunit-dev (>= 1.12),
libcups2-dev,
libcurl4-gnutls-dev,
@@ -93,9 +94,11 @@ Build-Depends: ant (>= 1.7.0),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
+ libo3dgc-dev (>= 0~20131011-2) [amd64 i386],
libodfgen-dev (>= 0.1),
liborcus-dev (>= 0.9.0),
libpagemaker-dev,
+ libpcre3-dev [amd64 i386],
libpng12-dev,
libpoppler-cpp-dev,
libpoppler-dev (>= 0.8.0),
@@ -130,9 +133,11 @@ Build-Depends: ant (>= 1.7.0),
make (>= 3.81-8.2),
maven-repo-helper,
npapi-sdk-dev,
+ opencollada-dev [amd64 i386],
pkg-config,
python3,
python3-dev (>= 3.3),
+ rapidjson-dev [amd64 i386],
ucpp,
unixodbc-dev (>= 2.2.11),
unzip,
@@ -4373,6 +4378,7 @@ Depends: ant (>= 1.7.0),
libcdr-dev (>= 0.1),
libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.5.0),
+ libcollada2gltfconvert-dev,
libcommons-codec-java,
libcommons-httpclient-java,
libcommons-lang-java,
@@ -4421,9 +4427,11 @@ Depends: ant (>= 1.7.0),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
+ libo3dgc-dev (>= 0~20131011-2),
libodfgen-dev (>= 0.1),
liborcus-dev (>= 0.9.0),
libpagemaker-dev,
+ libpcre3-dev,
libpng12-dev,
libpoppler-cpp-dev,
libpoppler-dev (>= 0.8.0),
@@ -4459,10 +4467,12 @@ Depends: ant (>= 1.7.0),
make (>= 3.81-8.2),
maven-repo-helper,
npapi-sdk-dev,
+ opencollada-dev,
openjdk-7-jdk,
pkg-config,
python3,
python3-dev (>= 3.3),
+ rapidjson-dev,
ucpp,
unixodbc-dev (>= 2.2.11),
unzip,
diff --git a/rules b/rules
index ab2619f..785ea6c 100755
--- a/rules
+++ b/rules
@@ -321,15 +321,15 @@ SYSTEM_STUFF += libgltf
# I think we should only enable it when we have BOTH system-opencollasa
# and system-collada2gltf working
ifeq "$(ENABLE_GLTF)" "y"
- ENABLE_COLLADA=n
+ ENABLE_COLLADA=y
# 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 "$(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"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: