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

[Sven-Hendrik Haase]

    Date: Wednesday, December 5, 2018 @ 06:06:11
  Author: svenstaro
Revision: 411244

upgpkg: forge 2:1.0.3-1

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

-----------+
 PKGBUILD  |   17 ++++-------------
 glm.patch |   22 ----------------------
 2 files changed, 4 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-05 05:53:54 UTC (rev 411243)
+++ PKGBUILD	2018-12-05 06:06:11 UTC (rev 411244)
@@ -3,7 +3,6 @@
 pkgdesc="High Performance Visualizations"
 url='https://github.com/arrayfire/forge'
 pkgver=1.0.3
-_afver=af3.6.0
 arch=('x86_64')
 pkgrel=1
 epoch=2
@@ -10,20 +9,12 @@
 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
-        glm.patch)
-sha512sums=('e26ac048b7f2708c0b4bc06a99fd7bec2be870e0c73bd4a8cfa733d6a96f61a7261b0baab71bcb1cdb1969f3d133f85f5bca57ff74e1d166776cfe642fdbd16b'
-            '6b6de2967dd7e0426854262be569ce9a5379ea9448c584f72cbfa08d13be269960b6a01f0ba3e64c9a543644466b62ba3bac3199312b2b035c12a2e872ff002b')
+source=(https://github.com/arrayfire/forge/archive/v${pkgver}.tar.gz)
+sha512sums=('43f3797e09f1758f2ab79e57f460e7bbdefa2bf408ebd439fa68543054fc1cd636bd66fbbbc9c44370a13b1e3c89262362de8b413f3f2260f86a6b163db17c93')
 options=('!buildflags')
 
-prepare() {
-  cd forge-${_afver}
-
-  patch -Np1 -i "$srcdir"/glm.patch
-}
-
 build() {
-  cd forge-${_afver}
+  cd forge-${pkgver}
 
   rm -rf build
   mkdir build && cd build
@@ -37,7 +28,7 @@
 }
 
 package() {
-  cd forge-${_afver}
+  cd forge-${pkgver}
 
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 

Deleted: glm.patch
===================================================================
--- glm.patch	2018-12-05 05:53:54 UTC (rev 411243)
+++ glm.patch	2018-12-05 06:06:11 UTC (rev 411244)
@@ -1,22 +0,0 @@
-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