[libreoffice] 03/03: fix collada2gltf conditional
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 0f8f169712a3f66d581dd82bc7be2b6e3c9069c1
Author: Rene Engelhard <rene@debian.org>
Date: Sat May 2 15:54:45 2015 +0200
fix collada2gltf conditional
Conflicts:
changelog
---
changelog | 2 +-
rules | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index 07b6084..a05dadd 100644
--- a/changelog
+++ b/changelog
@@ -3,7 +3,7 @@ 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
+ - add conditional for system-collada2gltf
-- Rene Engelhard <rene@debian.org> Thu, 14 May 2015 22:36:50 +0200
diff --git a/rules b/rules
index b4da22f..575bf95 100755
--- a/rules
+++ b/rules
@@ -334,10 +334,9 @@ 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=""
+ COLLADA2GLTF_CFLAGS="-I/usr/include/collada2gltf -I/usr/include/collada2gltf/JSON -I/usr/include/collada2gltf/GLTF -I/usr/include/collada2gltf/helpers -I/usr/include/collada2gltf/assetModifiers -I/usr/include/rapidjson"
+ COLLADA2GLTF_LIBS="-lcollada2gltfConvert -lo3dgc_common_lib -lo3dgc_dec_lib -lo3dgc_enc_lib"
endif
endif
SYSTEM_STUFF += openssl
@@ -683,8 +682,11 @@ 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
+ ifneq (,$(findstring collada2gltf,$(SYSTEM_STUFF)))
+ BUILD_DEPS += , libcollada2gltfconvert-dev [$(OOO_COLLADA_ARCHS)]
+ BUILD_DEPS += , rapidjson-dev [$(OOO_COLLADA_ARCHS)]
+ BUILD_DEPS += , libo3dgc-dev (>= 0~20131011-2) [$(OOO_COLLADA_ARCHS)]
endif
endif
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: