From 98076e5e5fb78118534e399f7fefc68b6b53f151 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Tue, 23 Feb 2016 16:47:23 +0300
Subject: Notes: Missing libglw3 build dependencies.

To be fixed asap.---
 gn/packages/arrayfire.scm | 88 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 gn/packages/arrayfire.scm

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
new file mode 100644
index 0000000..62eceb7
--- /dev/null
+++ b/gn/packages/arrayfire.scm
@@ -0,0 +1,88 @@
+(define-module (gnu packages arrayfire)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix cmake-build-system)
+  #:use-module (guix licenses)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages linux))
+
+(define-public arrayfire
+  (package
+    (name "arrayfire")
+    (version "v3.3.alpha")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/arrayfire/arrayfire/archive/" version 
+                                  ".tar.gz"))
+              (sha256
+               (base32
+                "0rla0mi5wby8bkpzrj063y6js3d4dlfl3qwfvm8m8skfc21dz52p"))))
+    (build-system cmake-build-system)
+    (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
+    (native-inputs
+      `(("autoconf" ,autoconf)
+        ("automake" ,automake)
+        ("cmake" ,cmake)
+        ("doxygen" ,doxygen)
+        ("gawk" ,gawk)
+        ("gettext" ,gnu-gettext)
+        ("icedtea7" ,icedtea7) 
+        ("libtool" ,libtool)
+        ("pkg-config" ,pkg-config)
+        ("swig" ,swig)
+        ("which" ,which)
+        ("yasm" ,yasm)))
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("boost" ,boost)
+       ("bzip2" ,bzip2)
+       ("curl" ,curl)
+       ("dbus" ,dbus)
+       ("enca" ,enca)
+       ("eudev" ,eudev)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("fribidi" ,fribidi)
+       ("glew" ,glew)
+       ("gnutls" ,gnutls)
+       ("gperf" ,gperf)
+       ("libcap" ,libcap)
+       ("libcdio" ,libcdio)
+       ("libgcrypt" ,libgcrypt)
+       ("libjpeg" ,libjpeg)
+       ("libltdl" ,libltdl)
+       ("libssh" ,libssh)
+       ("libtiff" ,libtiff)
+       ("libxml2" ,libxml2)
+       ("libxmu" ,libxmu)
+       ("libxrandr" ,libxrandr)
+       ("libxrender" ,libxrender)
+       ("libxslt" ,libxslt)
+       ("libxt" ,libxt)
+       ("libyajl" ,libyajl)
+       ("lzo" ,lzo)
+       ("mesa-utils" ,mesa-utils)
+       ("mysql" ,mysql)
+       ("openssl" ,openssl)
+       ("pcre" ,pcre)
+       ("python" ,python-2)
+       ("tinyxml" ,tinyxml)
+       ("unzip" ,unzip)
+       ("zip" ,zip)
+       ("zlib" ,zlib)))
+    (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com")
+    (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.")
+    (home-page "http://arrayfire.com/")
+    (license gpl3+)))
-- 
cgit v1.2.3


From de91415e4712df24902ff80b550d85fbb6c59381 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Tue, 23 Feb 2016 17:06:06 +0300
Subject: Added GFWL as a build dependency

*BOOM*---
 gn/packages/arrayfire.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 60 insertions(+), 3 deletions(-)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 62eceb7..9896baf 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -45,8 +45,7 @@
         ("which" ,which)
         ("yasm" ,yasm)))
     (inputs
-     `(("alsa-lib" ,alsa-lib)
-       ("boost" ,boost)
+     `(("boost" ,boost)
        ("bzip2" ,bzip2)
        ("curl" ,curl)
        ("dbus" ,dbus)
@@ -59,7 +58,6 @@
        ("gnutls" ,gnutls)
        ("gperf" ,gperf)
        ("libcap" ,libcap)
-       ("libcdio" ,libcdio)
        ("libgcrypt" ,libgcrypt)
        ("libjpeg" ,libjpeg)
        ("libltdl" ,libltdl)
@@ -86,3 +84,62 @@
     (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.")
     (home-page "http://arrayfire.com/")
     (license gpl3+)))
+
+(define-public glfw
+  (package
+    (name "glfw")
+    (version "3.0.4")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://github.com/glfw/glfw/archive/"
+                                 version ".zip"))
+             (file-name (string-append name "-" version ".zip"))
+             (sha256
+              (base32
+               "0njplyalwwqh7xr7xc7klc6x06mq0ak8w2pxh85w8n4hxkmqqnf5"))))
+    (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
+    (native-inputs
+      `(("autoconf" ,autoconf)
+        ("automake" ,automake)
+        ("cmake" ,cmake)
+        ("libtool" ,libtool)
+        ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("bzip2" ,bzip2)
+       ("curl" ,curl)
+       ("dbus" ,dbus)
+       ("enca" ,enca)
+       ("eudev" ,eudev)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("fribidi" ,fribidi)
+       ("glew" ,glew)
+       ("gnutls" ,gnutls)
+       ("gperf" ,gperf)
+       ("libcap" ,libcap)
+       ("libgcrypt" ,libgcrypt)
+       ("libjpeg" ,libjpeg)
+       ("libltdl" ,libltdl)
+       ("libssh" ,libssh)
+       ("libtiff" ,libtiff)
+       ("libxml2" ,libxml2)
+       ("libxmu" ,libxmu)
+       ("libxrandr" ,libxrandr)
+       ("libxrender" ,libxrender)
+       ("libxslt" ,libxslt)
+       ("libxt" ,libxt)
+       ("lzo" ,lzo)
+       ("mesa-utils" ,mesa-utils)
+       ("mysql" ,mysql)
+       ("openssl" ,openssl)
+       ("python" ,python-2)
+       ("tinyxml" ,tinyxml)
+       ("unzip" ,unzip)
+       ("zip" ,zip)
+       ("zlib" ,zlib)))
+    (home-page "http://www.glfw.org/")
+    (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
+    (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events. It is easy to integrate into existing applications and does not lay claim to the main loop.
+GLFW is written in C and has native support for Windows, OS X and many Unix-like systems using the X Window System, such as Linux and FreeBSD.
+GLFW is licensed under the zlib/libpng license.")
+    (license license:gpl2+)))
-- 
cgit v1.2.3


From 92905620b39f86181e6d684cc43df7758a6ffeb7 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Tue, 23 Feb 2016 17:08:01 +0300
Subject: Added Licensing information.

Licensing, do you speak it?---
 gn/packages/arrayfire.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 9896baf..75de462 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -1,3 +1,21 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
 (define-module (gnu packages arrayfire)
   #:use-module (guix packages)
   #:use-module (guix download)
-- 
cgit v1.2.3


From 6a2a970193719fd3064da1fc6c3cd68547d28f17 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Tue, 23 Feb 2016 17:11:21 +0300
Subject: Fix the hash of glfw, based on sha256sum

Bad hash, no build, mate.---
 gn/packages/arrayfire.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 75de462..128d79b 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -114,7 +114,7 @@
              (file-name (string-append name "-" version ".zip"))
              (sha256
               (base32
-               "0njplyalwwqh7xr7xc7klc6x06mq0ak8w2pxh85w8n4hxkmqqnf5"))))
+               "1g0jm80cakk60477zz9z1mpsznxaadsfm318yiigf6kackrkqfqg"))))
     (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
     (native-inputs
       `(("autoconf" ,autoconf)
-- 
cgit v1.2.3


From 003dc6dfd82f61bfadf595058dfd6f1213b6ca4a Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Tue, 23 Feb 2016 17:15:25 +0300
Subject: Add glfw as an input to arrayfire's build.

See the inputs section entry at ("glfw" ,glfw)---
 gn/packages/arrayfire.scm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 128d79b..6f326c9 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -65,6 +65,7 @@
     (inputs
      `(("boost" ,boost)
        ("bzip2" ,bzip2)
+       ("glfw" ,glfw)
        ("curl" ,curl)
        ("dbus" ,dbus)
        ("enca" ,enca)
-- 
cgit v1.2.3


From b70b4572ebf97d83296b8bfd11263f07b1f385a3 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Tue, 23 Feb 2016 17:37:00 +0300
Subject: Add fftw-openmpi as build dependencies.

Needed to build a running binary.---
 gn/packages/arrayfire.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 6f326c9..4f4e004 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -32,6 +32,9 @@
   #:use-module (gnu packages video)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages textutils)
+  #:use-module (gnu packages fftw)
+  #:use-module (gnu packages fftw-openmpi)
+  #:use-module (gnu packages fftwf)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages linux))
@@ -98,6 +101,12 @@
        ("tinyxml" ,tinyxml)
        ("unzip" ,unzip)
        ("zip" ,zip)
+       ("freeimage" ,freeimage)
+       ("fftw" ,fftw)
+       ("fftwf" ,fftwf)
+       ("fftw-openmpi" ,fftw-openmpi)
+       ("atlas" ,atlas)
+       ("gfortran", gfortran)
        ("zlib" ,zlib)))
     (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com")
     (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.")
-- 
cgit v1.2.3


From a83c940bddf3be8dd041c00b989785e9ffe8891b Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Tue, 23 Feb 2016 17:47:59 +0300
Subject: Added essential headers.

I commit to master directly.

Needed: OpenCL headers. 
Challenge accepted.---
 gn/packages/arrayfire.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 4f4e004..b517917 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -36,7 +36,9 @@
   #:use-module (gnu packages fftw-openmpi)
   #:use-module (gnu packages fftwf)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages glew)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages mesa)
   #:use-module (gnu packages linux))
 
 (define-public arrayfire
@@ -107,6 +109,14 @@
        ("fftw-openmpi" ,fftw-openmpi)
        ("atlas" ,atlas)
        ("gfortran", gfortran)
+       ("glew" ,glew)
+       ("glu" ,glu)
+       ("libx11" ,libx11)
+       ("libxi" ,libxi)
+       ("libxrandr" ,libxrandr)
+       ("libxxf86vm" ,libxxf86vm)
+       ("inputproto" ,inputproto)
+       ("glproto" ,glproto)
        ("zlib" ,zlib)))
     (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com")
     (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.")
-- 
cgit v1.2.3


From 5fa516d92634ac957d276330b5795416cffdc566 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Tue, 23 Feb 2016 17:52:53 +0300
Subject: Khronos OpenCL headers still needed.

The burn is strong on this one.---
 gn/packages/arrayfire.scm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index b517917..1d3401d 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -39,6 +39,7 @@
   #:use-module (gnu packages glew)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages mesa)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages linux))
 
 (define-public arrayfire
-- 
cgit v1.2.3


From 859709f054229f45eba23d1e3c58e6b3037c2172 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Thu, 25 Feb 2016 19:58:41 +0300
Subject: Applied Pjotr's patch.

Applied Pjotr's patch.---
 gn/packages/arrayfire.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 1d3401d..5869a88 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -16,12 +16,13 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu packages arrayfire)
+(define-module (gn packages arrayfire)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module (guix cmake-build-system)
+  #:use-module (guix build-system cmake)
   #:use-module (guix licenses)
+  #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages gawk)
@@ -32,9 +33,9 @@
   #:use-module (gnu packages video)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages textutils)
-  #:use-module (gnu packages fftw)
-  #:use-module (gnu packages fftw-openmpi)
-  #:use-module (gnu packages fftwf)
+  ;; #:use-module (gnu packages fftw)
+  ;; #:use-module (gnu packages fftw-openmpi) - in algebra
+  ;; #:use-module (gnu packages fftwf)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glew)
   #:use-module (gnu packages pkg-config)
-- 
cgit v1.2.3


From c4a22933adfe218e991715a1c1e25d2104c48900 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Sun, 28 Feb 2016 21:37:32 +0300
Subject: Lisp specific fixes.

---
 gn/packages/arrayfire.scm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 5869a88..e529971 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -17,7 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gn packages arrayfire)
-  #:use-module (guix packages)
+  #:use-module ((guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
@@ -33,15 +33,12 @@
   #:use-module (gnu packages video)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages textutils)
-  ;; #:use-module (gnu packages fftw)
-  ;; #:use-module (gnu packages fftw-openmpi) - in algebra
-  ;; #:use-module (gnu packages fftwf)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glew)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages mesa)
   #:use-module (gnu packages web)
-  #:use-module (gnu packages linux))
+  #:use-module (gnu packages linux)))
 
 (define-public arrayfire
   (package
@@ -51,11 +48,13 @@
               (method url-fetch)
               (uri (string-append "https://github.com/arrayfire/arrayfire/archive/" version 
                                   ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
                 "0rla0mi5wby8bkpzrj063y6js3d4dlfl3qwfvm8m8skfc21dz52p"))))
     (build-system cmake-build-system)
-    (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
+    (arguments 
+     `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
     (native-inputs
       `(("autoconf" ,autoconf)
         ("automake" ,automake)
@@ -179,7 +178,6 @@
        ("zlib" ,zlib)))
     (home-page "http://www.glfw.org/")
     (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
-    (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events. It is easy to integrate into existing applications and does not lay claim to the main loop.
-GLFW is written in C and has native support for Windows, OS X and many Unix-like systems using the X Window System, such as Linux and FreeBSD.
-GLFW is licensed under the zlib/libpng license.")
+    (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (license license:gpl2+)))
+
-- 
cgit v1.2.3


From 0e91d686b2262bf19b15aa64477daad08ae94926 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Sun, 28 Feb 2016 22:42:45 +0300
Subject: Lisp fixes

---
 gn/packages/arrayfire.scm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index e529971..c82ed5c 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -17,7 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gn packages arrayfire)
-  #:use-module ((guix packages)
+  #:use-module ((guix packages))
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
@@ -31,14 +31,15 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages image)
   #:use-module (gnu packages video)
-  #:use-module (gnu packages tls)
+  ;;#:use-module (gnu packages tls)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages gl)
-  #:use-module (gnu packages glew)
+  ;;#:use-module (gnu packages glew)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages mesa)
+  ;;#:use-module (gnu packages mesa)
   #:use-module (gnu packages web)
-  #:use-module (gnu packages linux)))
+  #:use-module (gnu packages ldc)
+  #:use-module (gnu packages linux))
 
 (define-public arrayfire
   (package
@@ -52,11 +53,7 @@
               (sha256
                (base32
                 "0rla0mi5wby8bkpzrj063y6js3d4dlfl3qwfvm8m8skfc21dz52p"))))
-    (build-system cmake-build-system)
-    (arguments 
-     `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
-    (native-inputs
-      `(("autoconf" ,autoconf)
+    (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
         ("cmake" ,cmake)
         ("doxygen" ,doxygen)
@@ -68,8 +65,7 @@
         ("swig" ,swig)
         ("which" ,which)
         ("yasm" ,yasm)))
-    (inputs
-     `(("boost" ,boost)
+    (inputs `(("boost" ,boost)
        ("bzip2" ,bzip2)
        ("glfw" ,glfw)
        ("curl" ,curl)
@@ -118,7 +114,12 @@
        ("libxxf86vm" ,libxxf86vm)
        ("inputproto" ,inputproto)
        ("glproto" ,glproto)
+       ("cmake" ,cmake)
        ("zlib" ,zlib)))
+    (build-system cmake-build-system)
+    (arguments 
+     `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
+     
     (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com")
     (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.")
     (home-page "http://arrayfire.com/")
@@ -176,6 +177,7 @@
        ("unzip" ,unzip)
        ("zip" ,zip)
        ("zlib" ,zlib)))
+       
     (home-page "http://www.glfw.org/")
     (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
-- 
cgit v1.2.3


From 5336d44d8727f938aaf913861de4835c0793eac9 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Sun, 28 Feb 2016 23:19:54 +0300
Subject: Update arrayfire.scm

---
 gn/packages/arrayfire.scm | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index c82ed5c..e09fff8 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -17,11 +17,11 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gn packages arrayfire)
-  #:use-module ((guix packages))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
-  #:use-module (guix licenses)
+  #:use-module (guix packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages curl)
@@ -118,12 +118,11 @@
        ("zlib" ,zlib)))
     (build-system cmake-build-system)
     (arguments 
-     `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
-     
+     `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))     
     (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com")
     (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.")
     (home-page "http://arrayfire.com/")
-    (license gpl3+)))
+    (license gpl2+)))
 
 (define-public glfw
   (package
@@ -138,14 +137,12 @@
               (base32
                "1g0jm80cakk60477zz9z1mpsznxaadsfm318yiigf6kackrkqfqg"))))
     (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
-    (native-inputs
-      `(("autoconf" ,autoconf)
+    (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
         ("cmake" ,cmake)
         ("libtool" ,libtool)
         ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("bzip2" ,bzip2)
+    (inputs `(("bzip2" ,bzip2)
        ("curl" ,curl)
        ("dbus" ,dbus)
        ("enca" ,enca)
@@ -176,10 +173,9 @@
        ("tinyxml" ,tinyxml)
        ("unzip" ,unzip)
        ("zip" ,zip)
-       ("zlib" ,zlib)))
-       
+       ("zlib" ,zlib)))       
     (home-page "http://www.glfw.org/")
     (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
-    (license license:gpl2+)))
+    (license gpl2)))
 
-- 
cgit v1.2.3


From 2814c72f084f175bbc7cfc401ea59662f1595596 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Mon, 29 Feb 2016 01:48:00 +0300
Subject: Pending work: Fix Licensing stuff.

The build should run, though you'll run into bigger problems with licensing.---
 gn/packages/arrayfire.scm | 66 ++++++++---------------------------------------
 1 file changed, 11 insertions(+), 55 deletions(-)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index e09fff8..3244680 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -17,7 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gn packages arrayfire)
-  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((guix licenses))
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
@@ -38,7 +38,11 @@
   #:use-module (gnu packages pkg-config)
   ;;#:use-module (gnu packages mesa)
   #:use-module (gnu packages web)
+  #:use-module (gnu packages databases)
+  ;;#:use-module (gnu packages lapack)
   #:use-module (gnu packages ldc)
+  ;;#:use-module (gnu packages gfortran)
+  #:use-module (gnu packages python)  
   #:use-module (gnu packages linux))
 
 (define-public arrayfire
@@ -56,64 +60,32 @@
     (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
         ("cmake" ,cmake)
-        ("doxygen" ,doxygen)
         ("gawk" ,gawk)
-        ("gettext" ,gnu-gettext)
-        ("icedtea7" ,icedtea7) 
         ("libtool" ,libtool)
-        ("pkg-config" ,pkg-config)
-        ("swig" ,swig)
-        ("which" ,which)
-        ("yasm" ,yasm)))
+        ("pkg-config" ,pkg-config)))
     (inputs `(("boost" ,boost)
-       ("bzip2" ,bzip2)
        ("glfw" ,glfw)
        ("curl" ,curl)
        ("dbus" ,dbus)
        ("enca" ,enca)
        ("eudev" ,eudev)
-       ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
-       ("fribidi" ,fribidi)
        ("glew" ,glew)
-       ("gnutls" ,gnutls)
-       ("gperf" ,gperf)
        ("libcap" ,libcap)
-       ("libgcrypt" ,libgcrypt)
        ("libjpeg" ,libjpeg)
        ("libltdl" ,libltdl)
-       ("libssh" ,libssh)
        ("libtiff" ,libtiff)
-       ("libxml2" ,libxml2)
-       ("libxmu" ,libxmu)
-       ("libxrandr" ,libxrandr)
-       ("libxrender" ,libxrender)
-       ("libxslt" ,libxslt)
-       ("libxt" ,libxt)
        ("libyajl" ,libyajl)
-       ("lzo" ,lzo)
        ("mesa-utils" ,mesa-utils)
        ("mysql" ,mysql)
        ("openssl" ,openssl)
-       ("pcre" ,pcre)
        ("python" ,python-2)
-       ("tinyxml" ,tinyxml)
-       ("unzip" ,unzip)
-       ("zip" ,zip)
        ("freeimage" ,freeimage)
        ("fftw" ,fftw)
        ("fftwf" ,fftwf)
        ("fftw-openmpi" ,fftw-openmpi)
-       ("atlas" ,atlas)
-       ("gfortran", gfortran)
        ("glew" ,glew)
        ("glu" ,glu)
-       ("libx11" ,libx11)
-       ("libxi" ,libxi)
-       ("libxrandr" ,libxrandr)
-       ("libxxf86vm" ,libxxf86vm)
-       ("inputproto" ,inputproto)
-       ("glproto" ,glproto)
        ("cmake" ,cmake)
        ("zlib" ,zlib)))
     (build-system cmake-build-system)
@@ -122,7 +94,7 @@
     (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com")
     (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.")
     (home-page "http://arrayfire.com/")
-    (license gpl2+)))
+    (license gpl3+)))
 
 (define-public glfw
   (package
@@ -136,46 +108,30 @@
              (sha256
               (base32
                "1g0jm80cakk60477zz9z1mpsznxaadsfm318yiigf6kackrkqfqg"))))
+    (build-system cmake-build-system)
     (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
     (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
         ("cmake" ,cmake)
         ("libtool" ,libtool)
         ("pkg-config" ,pkg-config)))
-    (inputs `(("bzip2" ,bzip2)
-       ("curl" ,curl)
+    (inputs `(("curl" ,curl)
        ("dbus" ,dbus)
        ("enca" ,enca)
-       ("eudev" ,eudev)
-       ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
-       ("fribidi" ,fribidi)
+       ("eudev" ,eudev)
        ("glew" ,glew)
-       ("gnutls" ,gnutls)
-       ("gperf" ,gperf)
        ("libcap" ,libcap)
-       ("libgcrypt" ,libgcrypt)
        ("libjpeg" ,libjpeg)
        ("libltdl" ,libltdl)
-       ("libssh" ,libssh)
        ("libtiff" ,libtiff)
-       ("libxml2" ,libxml2)
-       ("libxmu" ,libxmu)
-       ("libxrandr" ,libxrandr)
-       ("libxrender" ,libxrender)
-       ("libxslt" ,libxslt)
-       ("libxt" ,libxt)
-       ("lzo" ,lzo)
        ("mesa-utils" ,mesa-utils)
        ("mysql" ,mysql)
        ("openssl" ,openssl)
        ("python" ,python-2)
-       ("tinyxml" ,tinyxml)
-       ("unzip" ,unzip)
-       ("zip" ,zip)
        ("zlib" ,zlib)))       
     (home-page "http://www.glfw.org/")
     (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
-    (license gpl2)))
+    (license gpl3+)))
 
-- 
cgit v1.2.3


From 2b4c04d952bec10c54ee06bcf6692e0f1da47e0b Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Mon, 29 Feb 2016 14:42:35 +0300
Subject: Fixed licensing stuff.

Package can now build. Tracking build dependencies.---
 gn/packages/arrayfire.scm | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 3244680..060339f 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -69,7 +69,6 @@
        ("dbus" ,dbus)
        ("enca" ,enca)
        ("eudev" ,eudev)
-       ("freetype" ,freetype)
        ("glew" ,glew)
        ("libcap" ,libcap)
        ("libjpeg" ,libjpeg)
@@ -78,7 +77,6 @@
        ("libyajl" ,libyajl)
        ("mesa-utils" ,mesa-utils)
        ("mysql" ,mysql)
-       ("openssl" ,openssl)
        ("python" ,python-2)
        ("freeimage" ,freeimage)
        ("fftw" ,fftw)
@@ -86,15 +84,14 @@
        ("fftw-openmpi" ,fftw-openmpi)
        ("glew" ,glew)
        ("glu" ,glu)
-       ("cmake" ,cmake)
-       ("zlib" ,zlib)))
+       ("cmake" ,cmake)))
     (build-system cmake-build-system)
     (arguments 
      `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))     
     (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com")
     (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.")
     (home-page "http://arrayfire.com/")
-    (license gpl3+)))
+    (license (list gpl2 gpl2+ gpl3 gpl3+))))
 
 (define-public glfw
   (package
@@ -118,7 +115,6 @@
     (inputs `(("curl" ,curl)
        ("dbus" ,dbus)
        ("enca" ,enca)
-       ("freetype" ,freetype)
        ("eudev" ,eudev)
        ("glew" ,glew)
        ("libcap" ,libcap)
@@ -127,11 +123,9 @@
        ("libtiff" ,libtiff)
        ("mesa-utils" ,mesa-utils)
        ("mysql" ,mysql)
-       ("openssl" ,openssl)
-       ("python" ,python-2)
-       ("zlib" ,zlib)))       
+       ("python" ,python-2)))       
     (home-page "http://www.glfw.org/")
     (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
-    (license gpl3+)))
+    (license (list gpl2))))
 
-- 
cgit v1.2.3


From 96ed86cf39e2e973e46edce2c1cb7edce1a2c997 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Mon, 29 Feb 2016 17:08:47 +0300
Subject: Show stopper: Cmake variables for glew search paths

A bug in Arrayfire.

Submitted bug to Arrayfire, waiting for feedback.

An interim patch is in the works and is being tested.---
 gn/packages/arrayfire.scm | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 060339f..1a1c9a0 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -31,32 +31,31 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages image)
   #:use-module (gnu packages video)
-  ;;#:use-module (gnu packages tls)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages gl)
-  ;;#:use-module (gnu packages glew)
   #:use-module (gnu packages pkg-config)
-  ;;#:use-module (gnu packages mesa)
+  #:use-module (gnu packages maths)
   #:use-module (gnu packages web)
   #:use-module (gnu packages databases)
-  ;;#:use-module (gnu packages lapack)
   #:use-module (gnu packages ldc)
-  ;;#:use-module (gnu packages gfortran)
-  #:use-module (gnu packages python)  
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages version-control)  
   #:use-module (gnu packages linux))
 
 (define-public arrayfire
   (package
     (name "arrayfire")
-    (version "v3.3.alpha")
+    (version "3.3.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://github.com/arrayfire/arrayfire/archive/" version 
-                                  ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (uri (string-append "http://arrayfire.com/arrayfire_source/arrayfire-full-" version 
+                                  ".tar.bz2"))
+              (file-name (string-append name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0rla0mi5wby8bkpzrj063y6js3d4dlfl3qwfvm8m8skfc21dz52p"))))
+                "07pbw6vzny3z86y890c0rx7rk31ddchxrrdslk661iq512xppr0g"))))
     (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
         ("cmake" ,cmake)
@@ -70,6 +69,7 @@
        ("enca" ,enca)
        ("eudev" ,eudev)
        ("glew" ,glew)
+       ("lapack" ,lapack)
        ("libcap" ,libcap)
        ("libjpeg" ,libjpeg)
        ("libltdl" ,libltdl)
@@ -84,10 +84,13 @@
        ("fftw-openmpi" ,fftw-openmpi)
        ("glew" ,glew)
        ("glu" ,glu)
+       ("openblas" ,openblas)
+       ("git" ,git)
+       ("gcc" ,gcc)
        ("cmake" ,cmake)))
     (build-system cmake-build-system)
     (arguments 
-     `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))     
+     `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON") #:tests? #f))     
     (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com")
     (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.")
     (home-page "http://arrayfire.com/")
@@ -96,17 +99,16 @@
 (define-public glfw
   (package
     (name "glfw")
-    (version "3.0.4")
+    (version "3.1.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/glfw/glfw/archive/"
-                                 version ".zip"))
-             (file-name (string-append name "-" version ".zip"))
+                                 version ".tar.gz"))
              (sha256
               (base32
-               "1g0jm80cakk60477zz9z1mpsznxaadsfm318yiigf6kackrkqfqg"))))
+               "08pixv8hd5xsccf7l8cqcijjqaq4k4da8qbp77wggal2fq445ika"))))
     (build-system cmake-build-system)
-    (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
+    (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") #:tests? #f))
     (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
         ("cmake" ,cmake)
@@ -122,6 +124,11 @@
        ("libltdl" ,libltdl)
        ("libtiff" ,libtiff)
        ("mesa-utils" ,mesa-utils)
+       ("randrproto" ,randrproto)
+       ("libxrandr" ,libxrandr)
+       ("xineramaproto" ,xineramaproto)
+       ("libxinerama" ,libxinerama)
+       ("libxcursor" ,libxcursor)
        ("mysql" ,mysql)
        ("python" ,python-2)))       
     (home-page "http://www.glfw.org/")
-- 
cgit v1.2.3


From 660b3f26943f22a4d816314738ed0b9c8d595299 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Mon, 29 Feb 2016 17:25:45 +0300
Subject: Removed obsolete reference to gcc

Not needed as an input, deprecated.---
 gn/packages/arrayfire.scm | 2 --
 1 file changed, 2 deletions(-)

(limited to 'gn/packages/arrayfire.scm')

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 1a1c9a0..23ff0af 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -38,7 +38,6 @@
   #:use-module (gnu packages web)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages ldc)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages python)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages version-control)  
@@ -86,7 +85,6 @@
        ("glu" ,glu)
        ("openblas" ,openblas)
        ("git" ,git)
-       ("gcc" ,gcc)
        ("cmake" ,cmake)))
     (build-system cmake-build-system)
     (arguments 
-- 
cgit v1.2.3