[libreoffice] 02/03: enable gltf and coinmp
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 49c97c76a02496fa3ebc3255cd59e30373fb2589
Author: Rene Engelhard <rene@debian.org>
Date: Sat Aug 9 17:59:07 2014 +0200
enable gltf and coinmp
---
control | 4 ++++
rules | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/control b/control
index 313bd79..857af8c 100644
--- a/control
+++ b/control
@@ -11,6 +11,7 @@ Build-Depends: ant (>= 1.7.0),
binutils (>= 2.23) [mips mipsel],
bison,
bzip2,
+ coinor-libcoinmp-dev,
cpp-4.7,
debhelper (>= 7.2.3~),
default-jdk,
@@ -66,6 +67,7 @@ Build-Depends: ant (>= 1.7.0),
libglew-dev,
libglib2.0-dev (>= 2.15.0),
libglm-dev,
+ libgltf-dev,
libglu1-mesa-dev [!armel !mips !mipsel],
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
@@ -4418,6 +4420,7 @@ Depends: ant (>= 1.7.0),
bc,
bison,
bzip2,
+ coinor-libcoinmp-dev,
cpp-4.7,
debhelper (>= 7.2.3~),
default-jdk,
@@ -4472,6 +4475,7 @@ Depends: ant (>= 1.7.0),
libglew-dev,
libglib2.0-dev (>= 2.15.0),
libglm-dev,
+ libgltf-dev,
libglu1-mesa-dev,
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
diff --git a/rules b/rules
index f0c2213..bb9a1d3 100755
--- a/rules
+++ b/rules
@@ -229,7 +229,7 @@ endif
SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
-ENABLE_COINMP=n
+ENABLE_COINMP=y
SYSTEM_STUFF += coinmp
USE_DBUS=y
ifeq "$(USE_DBUS)" "y"
@@ -329,7 +329,7 @@ ENABLE_OPENGL=y
SYSTEM_STUFF += glew
# this is also not affected by --enable/-disable-opengl but at least has an
# own --enable/--disable...
-ENABLE_GLTF=n
+ENABLE_GLTF=y
SYSTEM_STUFF += libgltf
ifeq "$(ENABLE_GTLTF)" "y"
ENABLE_COLLADA=n
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: