[arch-commits] Commit in forge/trunk (PKGBUILD glm.patch)

[Sven-Hendrik Haase]

    Date: Thursday, October 18, 2018 @ 00:04:09
  Author: svenstaro
Revision: 395784

upgpkg: forge 1:1.1.0-2

freeimage 3.18.0 rebuild

Added:
  forge/trunk/glm.patch
Modified:
  forge/trunk/PKGBUILD

-----------+
 PKGBUILD  |   14 +++++++++++---
 glm.patch |   22 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-17 23:59:16 UTC (rev 395783)
+++ PKGBUILD	2018-10-18 00:04:09 UTC (rev 395784)
@@ -5,15 +5,23 @@
 pkgver=1.1.0
 _afver=af3.6.0
 arch=('x86_64')
-pkgrel=1
+pkgrel=2
 epoch=1
 license=('BSD')
 makedepends=('cmake' 'doxygen' 'graphviz' 'git' 'python' 'glm' 'boost')
 depends=('glfw' 'freetype2' 'fontconfig' 'freeimage' 'glbinding')
-source=(https://github.com/arrayfire/forge/archive/${_afver}.tar.gz)
-sha512sums=('e26ac048b7f2708c0b4bc06a99fd7bec2be870e0c73bd4a8cfa733d6a96f61a7261b0baab71bcb1cdb1969f3d133f85f5bca57ff74e1d166776cfe642fdbd16b')
+source=(https://github.com/arrayfire/forge/archive/${_afver}.tar.gz
+        glm.patch)
+sha512sums=('e26ac048b7f2708c0b4bc06a99fd7bec2be870e0c73bd4a8cfa733d6a96f61a7261b0baab71bcb1cdb1969f3d133f85f5bca57ff74e1d166776cfe642fdbd16b'
+            '6b6de2967dd7e0426854262be569ce9a5379ea9448c584f72cbfa08d13be269960b6a01f0ba3e64c9a543644466b62ba3bac3199312b2b035c12a2e872ff002b')
 options=('!buildflags')
 
+prepare() {
+  cd forge-${_afver}
+
+  patch -Np1 -i "$srcdir"/glm.patch
+}
+
 build() {
   cd forge-${_afver}
 

Added: glm.patch
===================================================================
--- glm.patch	                        (rev 0)
+++ glm.patch	2018-10-18 00:04:09 UTC (rev 395784)
@@ -0,0 +1,22 @@
+commit befa265294fd9ff679dece7874c1de50fea97b25
+Author: pradeep <pradeep at arrayfire.com>
+Date:   Wed Jun 13 15:10:23 2018 +0530
+
+    Remove experimental glm/transform header
+    
+    Starting with glm-0.9.9, experimental headers can only
+    be included if GLM_ENABLE_EXPERIMENTAL is defined before
+    the inclusion of the header.
+
+diff --git a/src/backend/opengl/font_impl.cpp b/src/backend/opengl/font_impl.cpp
+index 05b20f3..d1ad889 100644
+--- a/src/backend/opengl/font_impl.cpp
++++ b/src/backend/opengl/font_impl.cpp
+@@ -20,7 +20,6 @@
+ 
+ #include <glm/glm.hpp>
+ #include <glm/gtc/matrix_transform.hpp>
+-#include <glm/gtx/transform.hpp>
+ 
+ #include <ft2build.h>
+ #include FT_FREETYPE_H