From b36f1266d30749dcbf0bcb61aa6ad33db1e93da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 15 Mar 2018 08:10:20 +0100
Subject: [PATCH] libgltf: fix build for glm >= 0.9.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...E_EXPERIMENTAL-to-make-use-of-mandat.patch | 31 +++++++++++++++++++
 recipes-filter/libgltf/libgltf_0.0.2.bb       |  9 +++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 recipes-filter/libgltf/files/0001-Define-GLM_ENABLE_EXPERIMENTAL-to-make-use-of-mandat.patch

diff --git a/recipes-filter/libgltf/files/0001-Define-GLM_ENABLE_EXPERIMENTAL-to-make-use-of-mandat.patch b/recipes-filter/libgltf/files/0001-Define-GLM_ENABLE_EXPERIMENTAL-to-make-use-of-mandat.patch
new file mode 100644
index 0000000..d8adefc
--- /dev/null
+++ b/recipes-filter/libgltf/files/0001-Define-GLM_ENABLE_EXPERIMENTAL-to-make-use-of-mandat.patch
@@ -0,0 +1,31 @@
+From 6012d11ddeca960938f0c6f65692e2e42c874039 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Wed, 14 Mar 2018 23:30:45 +0100
+Subject: [PATCH] Define GLM_ENABLE_EXPERIMENTAL to make use of mandatory
+ glm/gtx headers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index e9d5020..f2daa42 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,6 +62,7 @@ AC_SUBST([EPOXY_LIBS])
+ # =========
+ # Find glm
+ # =========
++AC_DEFINE([GLM_ENABLE_EXPERIMENTAL], [1], [Later versions of glm need this for gtx headers])
+ AC_LANG_PUSH([C++])
+ save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $GLM_CFLAGS"
+-- 
+2.14.3
+
diff --git a/recipes-filter/libgltf/libgltf_0.0.2.bb b/recipes-filter/libgltf/libgltf_0.0.2.bb
index 7f99f4c..10a8ff2 100644
--- a/recipes-filter/libgltf/libgltf_0.0.2.bb
+++ b/recipes-filter/libgltf/libgltf_0.0.2.bb
@@ -4,10 +4,17 @@ LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=9741c346eef56131163e13b9db1241b3 \
 "
-SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.bz2"
+# Note there is a later version (0.1.0 currently) available but libreoffice
+# asks for 0.0 explicitly
+SRC_URI = " \
+    http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
+    file://0001-Define-GLM_ENABLE_EXPERIMENTAL-to-make-use-of-mandat.patch \
+"
 SRC_URI[md5sum] = "d63a9f47ab048f5009d90693d6aa6424"
 SRC_URI[sha256sum] = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b"
 
 inherit autotools pkgconfig
 
 DEPENDS = "glew glm boost"
+
+CXXFLAGS += "-DGLM_ENABLE_EXPERIMENTAL"