[libreoffice] 03/03: we now use epoxy instead of glew

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 26076ad538642d91a1685e534e39c7fb078b6485
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Dec 13 20:09:04 2016 +0100

    we now use epoxy instead of glew
---
 control              |  4 ++--
 rules                | 20 ++++++++------------
 shlibs.override.glew |  1 -
 tests/control        |  2 +-
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/control b/control
index fc1a040..5982cc9 100644
--- a/control
+++ b/control
@@ -61,6 +61,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libe-book-dev,
                libebook1.2-dev,
                libeot-dev,
+               libepoxy-dev (>= 1.3.1),
                libetonyek-dev,
                libexpat1-dev,
                libexttextcat-dev (>= 3.4.1),
@@ -68,10 +69,9 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libfreehand-dev (>= 0.1),
                libfreetype6-dev (>= 2.2.0),
                libgirepository1.0-dev (>= 1.32),
-               libglew-dev,
                libglib2.0-dev (>= 2.15.0),
                libglm-dev (>= 0.9.6.3),
-               libgltf-dev (>= 0.0.2-4),
+               libgltf-dev (>= 0.1.0),
                libgraphite2-dev (>= 0.9.3),
                libgstreamer-plugins-base1.0-dev,
                libgstreamer1.0-dev,
diff --git a/rules b/rules
index e3e5c3b..7c5c276 100755
--- a/rules
+++ b/rules
@@ -326,14 +326,10 @@ SUITESPARSE_MIN_VERSION= (>= 1:3.4.0)
 PARALLEL_BUILD=y
 ENABLE_LDAP=y
 USE_OPENLDAP=y
-SYSTEM_STUFF += glew
+SYSTEM_STUFF += epoxy
 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
+LIBGLTF_MINVER=0.1.0
 # I think we should only enable it when we have BOTH system-opencollasa
 # and system-collada2gltf working
 ifeq "$(ENABLE_GLTF)" "y"
@@ -673,7 +669,7 @@ endif
 # Debian Stretch
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "stretch-backports"
   BUGS=mailto:debian-backports at lists.debian.org
-  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus,$(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf,$(SYSTEM_STUFF))
   STRETCH_BACKPORT=y
 endif
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@ -1259,6 +1255,9 @@ ifeq "$(BUILD_GTK3)" "y"
   ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
   $(error GTK3 build fails without system-cairo!!)
   endif
+  ifeq (,$(filter epoxy, $(SYSTEM_STUFF)))
+       BUILD_DEPS += , libegl1-mesa-dev
+  endif
 	GNOME_GTK_RECOMMENDS += libreoffice-gtk3
   ifeq "$(ENABLE_INTROSPECTION)" "y"
 	BUILD_DEPS += , gobject-introspection (>= 1.32.0), libgirepository1.0-dev (>= 1.32)
@@ -1421,8 +1420,8 @@ ifneq (,$(filter redland, $(SYSTEM_STUFF)))
 	SHLIBS_OVERRIDE += -Xunordf
 endif
 
-ifneq (,$(filter glew, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libglew-dev
+ifneq (,$(filter epoxy, $(SYSTEM_STUFF)))
+	BUILD_DEPS += , libepoxy-dev (>= 1.3.1)
 endif
 ifneq (,$(filter glm, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libglm-dev (>= 0.9.6.3)
@@ -3186,9 +3185,6 @@ endif
 ifeq (,$(filter libstaroffice, $(SYSTEM_STUFF)))
 	cat debian/shlibs.override.libstaroffice >> debian/shlibs.local
 endif
-ifeq (,$(filter glew, $(SYSTEM_STUFF)))
-	cat debian/shlibs.override.glew >> debian/shlibs.local
-endif
 ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
 	cat debian/shlibs.override.orcus >> debian/shlibs.local
 endif
diff --git a/shlibs.override.glew b/shlibs.override.glew
deleted file mode 100644
index ab81b27..0000000
--- a/shlibs.override.glew
+++ /dev/null
@@ -1 +0,0 @@
-libGLEW		1.10
diff --git a/tests/control b/tests/control
index a61cdad..92aa4a7 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
 Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2 [...]
 
 Tests: pyuno-import
 Depends: python3-uno

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git