[libreoffice] 03/06: bump libgltf/*collada* build-deps to their gcc5 rebuilds
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 99c6571798a66f12560b1547d81c5f16ac32164d
Author: Rene Engelhard <rene@debian.org>
Date: Sun Aug 2 17:19:09 2015 +0200
bump libgltf/*collada* build-deps to their gcc5 rebuilds
---
changelog | 1 +
control | 18 +++++++++---------
rules | 21 ++++++++++++++++++---
3 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/changelog b/changelog
index 9b9bc2d..5bebdd0 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,7 @@ libreoffice (1:5.0.0~rc5-2) UNRELEASED; urgency=medium
gcc 5 rebuilds
- fix SYSTEM_GCC_CHECK for gcc 5; remove obsolete >= 4.7 check for Qt to get
correct build-dep
+ - bump libglf/*collada* build-deps to their gcc5 rebuilds
* debian/patches/series: disable liborcus-0.9.1,diff
* debian/control.in: suggest breeze-icon-theme in -style-breeze (like the other
diff --git a/control b/control
index 1fc0652..8dc5a0f 100644
--- a/control
+++ b/control
@@ -23,9 +23,9 @@ Build-Depends: ant (>= 1.7.0),
fontconfig,
fonts-crosextra-carlito,
fonts-liberation,
- g++-4.9 [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
+ g++-5 [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
g++-mingw-w64-i686 [i386 amd64],
- gcc-4.9 [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
+ gcc-5 [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
gcj-jdk [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
gcj-native-helper [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
gdb,
@@ -48,7 +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],
+ libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386],
libcppunit-dev (>= 1.12),
libcups2-dev,
libcurl4-gnutls-dev,
@@ -68,7 +68,7 @@ Build-Depends: ant (>= 1.7.0),
libglew-dev,
libglib2.0-dev (>= 2.15.0),
libglm-dev (>= 0.9.6.3),
- libgltf-dev (>= 0.0.1) [!armel !mips !mipsel],
+ libgltf-dev (>= 0.0.2-4) [!armel !mips !mipsel],
libglu1-mesa-dev,
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
@@ -133,7 +133,7 @@ Build-Depends: ant (>= 1.7.0),
make (>= 3.81-8.2),
maven-repo-helper,
npapi-sdk-dev,
- opencollada-dev [amd64 i386],
+ opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386],
pkg-config,
python3,
python3-dev (>= 3.3),
@@ -192,7 +192,7 @@ XS-Python3-Version: 3.4
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.0
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -4393,7 +4393,7 @@ Depends: ant (>= 1.7.0),
libcdr-dev (>= 0.1),
libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.5.0),
- libcollada2gltfconvert-dev,
+ libcollada2gltfconvert-dev (>= 20140924-2),
libcommons-codec-java,
libcommons-httpclient-java,
libcommons-lang-java,
@@ -4416,7 +4416,7 @@ Depends: ant (>= 1.7.0),
libglew-dev,
libglib2.0-dev (>= 2.15.0),
libglm-dev (>= 0.9.6.3),
- libgltf-dev (>= 0.0.1),
+ libgltf-dev (>= 0.0.2-4),
libglu1-mesa-dev,
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
@@ -4482,7 +4482,7 @@ Depends: ant (>= 1.7.0),
make (>= 3.81-8.2),
maven-repo-helper,
npapi-sdk-dev,
- opencollada-dev,
+ opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2),
openjdk-7-jdk,
pkg-config,
python3,
diff --git a/rules b/rules
index bc6f577..35361b7 100755
--- a/rules
+++ b/rules
@@ -317,6 +317,11 @@ USE_OPENLDAP=y
SYSTEM_STUFF += glew
ENABLE_GLTF=y
SYSTEM_STUFF += libgltf
+ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
+LIBGLTF_MINVER=0.0.2-4
+else
+LIBGLTF_MINVER=0.0.1
+endif
# I think we should only enable it when we have BOTH system-opencollasa
# and system-collada2gltf working
ifeq "$(ENABLE_GLTF)" "y"
@@ -337,6 +342,16 @@ ifeq "$(ENABLE_GLTF)" "y"
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
+ ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
+ OPENCOLLADA_MINVER=(>= 0.1.0~20140703.ddf8f47+dfsg1-2)
+ else
+ OPENCOLLADA_MINVER=
+ endif
+ ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
+ COLLADA2GLTF_MINVER=(>= 20140924-2)
+ else
+ COLLADA2GLTF_MINVER=
+ endif
endif
SYSTEM_STUFF += openssl
ifeq "$(ENABLE_JAVA)" "y"
@@ -675,17 +690,17 @@ ifneq "$(ENABLE_GLTF)" "y"
CONFIGURE_FLAGS += --disable-gltf
else
ifneq (,$(findstring libgltf,$(SYSTEM_STUFF)))
- BUILD_DEPS += , libgltf-dev (>= 0.0.1)$(OOO_NO_GLTF_ARCHS)
+ BUILD_DEPS += , libgltf-dev (>= $(LIBGLTF_MINVER))$(OOO_NO_GLTF_ARCHS)
endif
ifneq "$(ENABLE_COLLADA)" "y"
CONFIGURE_FLAGS += --disable-collada
else
ifneq (,$(findstring opencollada,$(SYSTEM_STUFF)))
- BUILD_DEPS += , opencollada-dev [$(OOO_COLLADA_ARCHS)]
+ BUILD_DEPS += , opencollada-dev $(OPENCOLLADA_MINVER) [$(OOO_COLLADA_ARCHS)]
BUILD_DEPS += , libpcre3-dev [$(OOO_COLLADA_ARCHS)]
endif
ifneq (,$(findstring collada2gltf,$(SYSTEM_STUFF)))
- BUILD_DEPS += , libcollada2gltfconvert-dev [$(OOO_COLLADA_ARCHS)]
+ BUILD_DEPS += , libcollada2gltfconvert-dev $(COLLADA2GLTF_MINVER)[$(OOO_COLLADA_ARCHS)]
BUILD_DEPS += , rapidjson-dev [$(OOO_COLLADA_ARCHS)]
BUILD_DEPS += , libo3dgc-dev (>= 0~20131011-2) [$(OOO_COLLADA_ARCHS)]
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: