Date: Thursday, May 2, 2019 @ 13:40:50 Author: kgizdov Revision: 457747
drop unneeded patch, update deps and CMake flags Modified: arrayfire/trunk/PKGBUILD Deleted: arrayfire/trunk/2365.patch ------------+ 2365.patch | 148 ----------------------------------------------------------- PKGBUILD | 11 ++-- 2 files changed, 6 insertions(+), 153 deletions(-) Deleted: 2365.patch =================================================================== --- 2365.patch 2019-05-02 11:22:43 UTC (rev 457746) +++ 2365.patch 2019-05-02 13:40:50 UTC (rev 457747) @@ -1,148 +0,0 @@ -From b25b998ea3637948914095b57c3246f8b26c6506 Mon Sep 17 00:00:00 2001 -From: pradeep <[email protected]> -Date: Mon, 3 Dec 2018 20:21:35 +0530 -Subject: [PATCH] Changes to use glbinding 3.0.2 and Forge 1.0.3 - -- Forge 1.0.3 uses glbinding 3.0.2 -- ArrayFire's glbinding has also been bumped up to 3.0.2 ---- - CMakeModules/build_forge.cmake | 2 +- - src/backend/common/CMakeLists.txt | 3 +- - src/backend/common/graphics_common.cpp | 43 +++++++++----------------- - src/backend/common/graphics_common.hpp | 4 --- - src/backend/opencl/platform.cpp | 1 - - 5 files changed, 17 insertions(+), 36 deletions(-) - -diff --git a/CMakeModules/build_forge.cmake b/CMakeModules/build_forge.cmake -index 7ae5a165f..97ffcec5f 100644 ---- a/CMakeModules/build_forge.cmake -+++ b/CMakeModules/build_forge.cmake -@@ -7,7 +7,7 @@ - - include(ExternalProject) - --set(FORGE_VERSION v1.0.2) -+set(FORGE_VERSION v1.0.3) - set(prefix "${ArrayFire_BINARY_DIR}/third_party/forge") - set(PX ${CMAKE_SHARED_LIBRARY_PREFIX}) - set(SX ${CMAKE_SHARED_LIBRARY_SUFFIX}) -diff --git a/src/backend/common/CMakeLists.txt b/src/backend/common/CMakeLists.txt -index 4aa0b4949..6f608d05f 100644 ---- a/src/backend/common/CMakeLists.txt -+++ b/src/backend/common/CMakeLists.txt -@@ -105,7 +105,8 @@ if(AF_WITH_GRAPHICS) - # glbindings cmake file - target_link_libraries(afcommon_interface - INTERFACE -- $<TARGET_PROPERTY:glbinding::glbinding,IMPORTED_LOCATION_RELEASE>) -+ $<TARGET_PROPERTY:glbinding::glbinding,IMPORTED_LOCATION_RELEASE> -+ ) - else() - target_link_libraries(afcommon_interface INTERFACE glbinding::glbinding) - endif() -diff --git a/src/backend/common/graphics_common.cpp b/src/backend/common/graphics_common.cpp -index 3cbc83b7a..a574bc962 100644 ---- a/src/backend/common/graphics_common.cpp -+++ b/src/backend/common/graphics_common.cpp -@@ -10,7 +10,6 @@ - #if defined(WITH_GRAPHICS) - - #include <common/graphics_common.hpp> --#include <glbinding/Meta.h> - #include <common/err_common.hpp> - #include <backend.hpp> - #include <platform.hpp> -@@ -51,30 +50,28 @@ INSTANTIATE_GET_FG_TYPE(unsigned char , forge::u8); - INSTANTIATE_GET_FG_TYPE(unsigned short , forge::u16); - INSTANTIATE_GET_FG_TYPE(short , forge::s16); - --gl::GLenum glErrorSkip(const char *msg, const char* file, int line) --{ --#ifndef NDEBUG -- gl::GLenum x = gl::glGetError(); -- if (x != GL_NO_ERROR) { -- char buf[1024]; -- sprintf(buf, "GL Error Skipped at: %s:%d Message: %s Error Code: %d \"%s\"\n", file, line, msg, (int)x, glbinding::Meta::getString(x).c_str()); -- AF_ERROR(buf, AF_ERR_INTERNAL); -- } -- return x; --#else -- return (gl::GLenum)0; --#endif --} -- - gl::GLenum glErrorCheck(const char *msg, const char* file, int line) - { -+ auto getErrorString = [](gl::GLenum value) { -+ switch(value) { -+ case GLenum::GL_INVALID_ENUM: return "GL_INVALID_ENUM"; -+ case GLenum::GL_INVALID_VALUE: return "GL_INVALID_VALUE"; -+ case GLenum::GL_INVALID_OPERATION: return "GL_INVALID_OPERATION"; -+ case GLenum::GL_INVALID_FRAMEBUFFER_OPERATION: return "GL_INVALID_FRAMEBUFFER_OPERATION"; -+ case GLenum::GL_OUT_OF_MEMORY: return "GL_OUT_OF_MEMORY"; -+ case GLenum::GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW"; -+ case GLenum::GL_STACK_OVERFLOW: return "GL_STACK_OVERFLOW"; -+ default: return "GL_NO_ERROR"; -+ } -+ }; - // Skipped in release mode - #ifndef NDEBUG - gl::GLenum x = gl::glGetError(); - - if (x != GL_NO_ERROR) { - char buf[1024]; -- sprintf(buf, "GL Error at: %s:%d Message: %s Error Code: %d \"%s\"\n", file, line, msg, (int)x, glbinding::Meta::getString(x).c_str()); -+ sprintf(buf, "GL Error at: %s:%d Message: %s Error Code: %d \"%s\"\n", -+ file, line, msg, (int)x, getErrorString(x).c_str()); - AF_ERROR(buf, AF_ERR_INTERNAL); - } - return x; -@@ -83,18 +80,6 @@ gl::GLenum glErrorCheck(const char *msg, const char* file, int line) - #endif - } - --gl::GLenum glForceErrorCheck(const char *msg, const char* file, int line) --{ -- gl::GLenum x = gl::glGetError(); -- -- if (x != GL_NO_ERROR) { -- char buf[1024]; -- sprintf(buf, "GL Error at: %s:%d Message: %s Error Code: %d \"%s\"\n", file, line, msg, (int)x, glbinding::Meta::getString(x).c_str()); -- AF_ERROR(buf, AF_ERR_INTERNAL); -- } -- return x; --} -- - size_t getTypeSize(gl::GLenum type) - { - switch(type) { -diff --git a/src/backend/common/graphics_common.hpp b/src/backend/common/graphics_common.hpp -index e895f5c90..e9e1ec43c 100644 ---- a/src/backend/common/graphics_common.hpp -+++ b/src/backend/common/graphics_common.hpp -@@ -27,13 +27,9 @@ forge::dtype getGLType(); - - // Print for OpenGL errors - // Returns 1 if an OpenGL error occurred, 0 otherwise. --gl::GLenum glErrorSkip(const char *msg, const char* file, int line); - gl::GLenum glErrorCheck(const char *msg, const char* file, int line); --gl::GLenum glForceErrorCheck(const char *msg, const char* file, int line); - - #define CheckGL(msg) glErrorCheck (msg, __AF_FILENAME__, __LINE__) --#define ForceCheckGL(msg) glForceErrorCheck(msg, __AF_FILENAME__, __LINE__) --#define CheckGLSkip(msg) glErrorSkip (msg, __AF_FILENAME__, __LINE__) - - forge::MarkerType getFGMarker(const af_marker_type af_marker); - -diff --git a/src/backend/opencl/platform.cpp b/src/backend/opencl/platform.cpp -index 226d5967c..b29145443 100644 ---- a/src/backend/opencl/platform.cpp -+++ b/src/backend/opencl/platform.cpp -@@ -29,7 +29,6 @@ - #include <err_opencl.hpp> - #include <blas.hpp> - #include <common/host_memory.hpp> --#include <common/InteropManager.hpp> - #include <platform.hpp> - #include <common/util.hpp> - #include <version.hpp> Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-05-02 11:22:43 UTC (rev 457746) +++ PKGBUILD 2019-05-02 13:40:50 UTC (rev 457747) @@ -4,9 +4,9 @@ url='https://arrayfire.com' pkgver=3.6.3 arch=('x86_64') -pkgrel=1 +pkgrel=2 license=('BSD') -depends=('cblas' 'fftw' 'boost-libs' 'lapacke' 'forge' 'freeimage' 'glfw' 'glew' 'glbinding') +depends=('cblas' 'fftw' 'boost-libs' 'lapacke' 'forge' 'freeimage' 'glfw' 'glew') makedepends=('cmake' 'graphviz' 'doxygen' 'opencl-headers' 'boost' 'python' 'ocl-icd' 'cuda' 'git') optdepends=('cuda: Required for using CUDA backend' 'nvidia-utils: Required for using CUDA backend' @@ -30,14 +30,15 @@ cd build cmake .. \ + -DCMAKE_POLICY_DEFAULT_CMP0063=NEW \ + -DCMAKE_POLICY_DEFAULT_CMP0077=NEW \ + -DGOOGLETEST_VERSION=1.9.0 \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DAF_USE_SYSTEM_FORGE=ON \ -DAF_WITH_IMAGEIO=ON \ - -DAF_WITH_GRAPHICS=ON \ -DAF_BUILD_CPU=ON \ -DAF_BUILD_OPENCL=ON \ - -DAF_BUILD_NONFREE=ON \ + -DAF_WITH_NONFREE=ON \ -DAF_BUILD_EXAMPLES=ON \ -DAF_BUILD_DOCS=ON \ -DCUDA_architecture_build_targets="3.0;3.2;3.5;3.7;5.0;5.2;5.3;6.0;6.1;6.2;7.0;7.2;7.5" \
