[libreoffice] 01/01: update change-from-glew-to-epoxy.diff (and build-deps)

[Rene Engelhard]

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

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

commit c245216244dd13d7aa62759f93185012f4129d08
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 30 15:12:27 2016 +0100

    update change-from-glew-to-epoxy.diff (and build-deps)
---
 changelog                              |  8 +++++
 patches/change-from-glew-to-epoxy.diff | 66 ++++++++++++++++++++++++++++++++++
 rules                                  |  5 ++-
 3 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 51f9b05..ec337ab 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:5.3.0~rc2~git20161229-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
+
+  * debian/patches/change-from-glew-to-epoxy.diff: update
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 29 Dec 2016 15:21:41 +0100
+
 libreoffice (1:5.3.0~rc1-2) experimental; urgency=medium
 
   * debian/rules:
diff --git a/patches/change-from-glew-to-epoxy.diff b/patches/change-from-glew-to-epoxy.diff
index 7166c69..50d93f7 100644
--- a/patches/change-from-glew-to-epoxy.diff
+++ b/patches/change-from-glew-to-epoxy.diff
@@ -2265,3 +2265,69 @@ index 14e4af0..c45c44a 100644
 -- 
 cgit v0.10.2
 
+From cb1880369989b54bcb5225d726f53c31279fd2e7 Mon Sep 17 00:00:00 2001
+From: Markus Mohrhard <markus.mohrhard at googlemail.com>
+Date: Mon, 26 Dec 2016 19:07:57 +0100
+Subject: fix the egl check again in the internal epoxy case
+
+Change-Id: Ie580b13579fdb71bd8898ae59b915b3842ef8aab
+Reviewed-on: https://gerrit.libreoffice.org/32434
+Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
+Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
+
+diff --git a/configure.ac b/configure.ac
+index 8cf2b25..2b23cf9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1633,7 +1633,8 @@ AC_ARG_WITH(system-cairo,
+ AC_ARG_WITH(system-epoxy,
+     AS_HELP_STRING([--with-system-epoxy],
+         [Use epoxy libraries already on system.  Happens automatically for
+-         --enable-gtk3.]))
++         --enable-gtk3.]),,
++       [with_system_epoxy="$with_system_libs"])
+ 
+ AC_ARG_WITH(myspell-dicts,
+     AS_HELP_STRING([--with-myspell-dicts],
+@@ -10083,6 +10084,11 @@ if ! "$TOUCH" -h warn 2>/dev/null > /dev/null; then
+ fi
+ 
+ dnl ===================================================================
++dnl Check for system epoxy
++dnl ===================================================================
++libo_CHECK_SYSTEM_MODULE([epoxy], [EPOXY], [epoxy >= 1.2], ["-I${WORKDIR}/UnpackedTarball/epoxy/include"])
++
++dnl ===================================================================
+ dnl Set vcl option: coordinate device in double or sal_Int32
+ dnl ===================================================================
+ 
+@@ -10124,6 +10130,11 @@ if test "x$enable_gtk3" = "xyes"; then
+     GTK3_CFLAGS=$(printf '%s' "$GTK3_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+     FilterLibs "${GTK3_LIBS}"
+     GTK3_LIBS="${filteredlibs}"
++
++    dnl We require egl only for the gtk3 plugin. Otherwise we use glx.
++    if test "$with_system_epoxy" != "yes"; then
++        AC_CHECK_LIB(EGL, eglMakeCurrent, [:], AC_MSG_ERROR([libEGL required.]))
++    fi
+ fi
+ AC_SUBST(GTK3_LIBS)
+ AC_SUBST(GTK3_CFLAGS)
+@@ -11714,14 +11725,6 @@ AC_SUBST(CAIRO_CFLAGS)
+ AC_SUBST(CAIRO_LIBS)
+ 
+ dnl ===================================================================
+-dnl Check for system epoxy
+-dnl ===================================================================
+-libo_CHECK_SYSTEM_MODULE([epoxy], [EPOXY], [epoxy >= 1.2], ["-I${WORKDIR}/UnpackedTarball/epoxy/include"])
+-if test "$with_system_epoxy" = "no"; then
+-    AC_CHECK_LIB(EGL, eglMakeCurrent, [:], AC_MSG_ERROR([libEGL required.]))
+-fi
+-
+-dnl ===================================================================
+ dnl Test whether to use avahi
+ dnl ===================================================================
+ if test "$_os" = "WINNT"; then
+-- 
+cgit v0.10.2
+
diff --git a/rules b/rules
index 10aeb97..aa6da38 100755
--- a/rules
+++ b/rules
@@ -1269,6 +1269,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)
@@ -1434,7 +1437,7 @@ endif
 ifneq (,$(filter epoxy, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libepoxy-dev (>= 1.2)
 else
-       BUILD_DEPS += , libegl1-mesa-dev
+	BUILD_DEPS += , libegl1-mesa-dev
 endif
 ifneq (,$(filter glm, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libglm-dev (>= 0.9.6.3)

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