summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Anderson2018-10-16 15:50:13 +0100
committerAndrew Anderson2018-10-16 15:50:13 +0100
commit9563b0058c82aa15cd74132b5a5b2ec861abbc5d (patch)
treedadd22d04a8e316200ded172b1d65bfa7ccc3d99
parent39519907e922e151da28db1fd1620c2f89288196 (diff)
downloadaur-9563b0058c82aa15cd74132b5a5b2ec861abbc5d.tar.gz
Specify commit
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
2 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c73867b3fb34..1101596ab350 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = caffe-opencl-slim-git
pkgdesc = A slimmed-down build of Caffe based on caffe-opencl-git
pkgver = 1.0
- pkgrel = 10
+ pkgrel = 11
url = http://caffe.berkeleyvision.org/
arch = x86_64
license = BSD
@@ -41,7 +41,7 @@ pkgbase = caffe-opencl-slim-git
conflicts = caffe2-cpu
conflicts = caffe2-cpu-git
conflicts = caffe-opencl-git
- source = caffe::git+https://github.com/andrew-wja/caffe#branch=opencl#commit=99bd99795dcdf0b1d3086a8d67ab1782a8a08383
+ source = caffe::git+https://github.com/andrew-wja/caffe
source = dependencies.patch
sha256sums = SKIP
sha256sums = 7ddb59109d7df3889641eaa4769e6b9e82f96f623b200ecfd8ade7ecfe04f95f
diff --git a/PKGBUILD b/PKGBUILD
index e5980d4aa422..c20e08d0c29c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=caffe-opencl-slim-git
_srcname=caffe
pkgver=1.0
-pkgrel=10
+pkgrel=11
pkgdesc="A slimmed-down build of Caffe based on caffe-opencl-git"
arch=('x86_64')
url="http://caffe.berkeleyvision.org/"
@@ -19,7 +19,7 @@ makedepends=('cmake')
provides=('caffe')
conflicts=('caffe' 'caffe-git' 'caffe-cpu-git' 'caffe-dr-git' 'caffe-mnc-dr-git' 'caffe-cpu'
'caffe2' 'caffe2-git' 'caffe2-cpu' 'caffe2-cpu-git' 'caffe-opencl-git')
-source=("${_srcname}"::"git+https://github.com/andrew-wja/${_srcname}#branch=opencl#commit=99bd99795dcdf0b1d3086a8d67ab1782a8a08383"
+source=("${_srcname}"::"git+https://github.com/andrew-wja/${_srcname}"
'dependencies.patch')
sha256sums=('SKIP'
'7ddb59109d7df3889641eaa4769e6b9e82f96f623b200ecfd8ade7ecfe04f95f')
@@ -27,6 +27,9 @@ sha256sums=('SKIP'
prepare() {
cd "${_srcname}"
+ git branch opencl
+ git checkout 99bd99795dcdf0b1d3086a8d67ab1782a8a08383
+
# This patch makes cmake find libboost_python3 (it normally only looks for libboost_python_py3 etc.)
patch cmake/Dependencies.cmake < ../dependencies.patch