Fixed a problem with python version detection. Added dependency to opencl-driver

3 files changed, 18 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11626338b606..acb3c8ca97f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = caffe-opencl-git
 	pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (Experimental, OpenCL)
 	pkgver = 1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://caffe.berkeleyvision.org/
 	arch = i686
 	arch = x86_64
@@ -34,6 +34,7 @@ pkgbase = caffe-opencl-git
 	depends = python-yaml
 	depends = python-pillow
 	depends = python-six
+	depends = opencl-driver
 	depends = openblas-lapack
 	depends = python-leveldb
 	depends = python-scikit-image
@@ -55,7 +56,7 @@ pkgbase = caffe-opencl-git
 	source = python_CMakeLists.patch
 	source = src_caffe_CMakeLists.patch
 	sha256sums = SKIP
-	sha256sums = 3c850eb21950c09822a66c97c953599834d48a58665b3c812677c3370575d86e
+	sha256sums = 7ddb59109d7df3889641eaa4769e6b9e82f96f623b200ecfd8ade7ecfe04f95f
 	sha256sums = d2974a35b695cfa176da7c26c860d18941de5b85870c42cb104034fec400599c
 	sha256sums = d1012a6248f10303b56aba04c5dead93988f5ab2e9488dc885f79be4d14b936c
 
diff --git a/PKGBUILD b/PKGBUILD
index 043ed2e62afa..b065618fa45d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=caffe-opencl-git
 _srcname=caffe
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A deep learning framework made with expression, speed, and modularity in mind (Experimental, OpenCL)"
 arch=('i686' 'x86_64')
 url="http://caffe.berkeleyvision.org/"
@@ -14,7 +14,7 @@ depends=(
         'lmdb' 'python' 'boost' 'cython' 'python-numpy' 'python-scipy'
         'python-matplotlib' 'ipython' 'python-h5py' 'python-networkx' 'python-nose'
         'python-pandas' 'python-dateutil' 'python-protobuf' 'python-gflags'
-        'python-yaml' 'python-pillow' 'python-six'
+        'python-yaml' 'python-pillow' 'python-six' 'opencl-driver'
     # AUR:
         'openblas-lapack' 'python-leveldb' 'python-scikit-image' 'python-pydotplus' 'viennacl'
     # NOTE:
@@ -30,7 +30,7 @@ source=("${_srcname}"::"git+https://github.com/BVLC/${_srcname}#branch=opencl"
         'python_CMakeLists.patch'
 	'src_caffe_CMakeLists.patch')
 sha256sums=('SKIP'
-            '3c850eb21950c09822a66c97c953599834d48a58665b3c812677c3370575d86e'
+            '7ddb59109d7df3889641eaa4769e6b9e82f96f623b200ecfd8ade7ecfe04f95f'
             'd2974a35b695cfa176da7c26c860d18941de5b85870c42cb104034fec400599c'
             'd1012a6248f10303b56aba04c5dead93988f5ab2e9488dc885f79be4d14b936c')
 
diff --git a/dependencies.patch b/dependencies.patch
index b91b40f59834..b37affd0ac62 100644
--- a/dependencies.patch
+++ b/dependencies.patch
@@ -1,6 +1,15 @@
---- cmake/Dependencies.cmake	2018-04-03 23:24:25.971815289 +0200
-+++ cmake/Dependencies.cmake.new	2018-04-03 23:24:05.947918330 +0200
-@@ -283,6 +283,11 @@
+--- Dependencies.cmake	2018-08-11 16:43:41.986780859 +0200
++++ Dependencies.cmake.new	2018-08-11 16:48:27.581959509 +0200
+@@ -345,7 +345,7 @@
+     # Find the matching boost python implementation
+     set(version ${PYTHONLIBS_VERSION_STRING})
+ 
+-    STRING( REGEX REPLACE "[^0-9]" "" boost_py_version ${version} )
++    STRING( REGEX MATCH "[0-9]" boost_py_version ${version} )
+     find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
+     set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
+ 
+@@ -356,6 +356,11 @@
        find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
        set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})