diff options
| author | Drew Noel | 2016-05-03 16:44:21 -0400 |
|---|---|---|
| committer | Drew Noel | 2016-05-03 16:44:21 -0400 |
| commit | d095be999e39d83dc425aa4a8e44d0cc8565a388 (patch) | |
| tree | fd1d78218b28595d81f32749682ee8dcc5692aa9 | |
| parent | ae5eff0f805d8920be574ed26241cce622b7a967 (diff) | |
| download | aur-d095be999e39d83dc425aa4a8e44d0cc8565a388.tar.gz | |
Fix OpenCV library bug and move to standard pkgver
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | Makefile.config | 2 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
3 files changed, 9 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = caffe-git pkgdesc = A fast framework for deep learning built in C++ for speed with a Python 2 interface - pkgver = r3482.813c3c9 - pkgrel = 2 + pkgver = rc3.r120.gb86b0ae + pkgrel = 1 url = https://github.com/BVLC/caffe arch = x86_64 license = custom @@ -50,7 +50,7 @@ pkgbase = caffe-git source = Makefile.config sha256sums = SKIP sha256sums = c12ddbd524c1b5871cb42a8775cf17a3ef86ae8a859837a6c6c4e2c19deca3d5 - sha256sums = d2bd26feb69894bbe2a807e71703472f66d431947d4b760cd25f3243edf30557 + sha256sums = ac0195943510f1dfed85991958455cba6a36058e93f74ad4da0befb6fae84bd5 pkgname = caffe-git diff --git a/Makefile.config b/Makefile.config index 724518332996..2d1a0713f463 100644 --- a/Makefile.config +++ b/Makefile.config @@ -77,3 +77,5 @@ TEST_GPUID := 0 # enable pretty build (comment to see full commands) Q ?= @ +# Indicate that OpenCV 3 is being used +OPENCV_VERSION := 3 @@ -1,8 +1,8 @@ # Maintainer: jyantis <yantis@yantis.net> pkgname=caffe-git -pkgver=r3482.813c3c9 -pkgrel=2 +pkgver=rc3.r120.gb86b0ae +pkgrel=1 pkgdesc='A fast framework for deep learning built in C++ for speed with a Python 2 interface' arch=(x86_64) url='https://github.com/BVLC/caffe' @@ -47,14 +47,12 @@ provides=('caffe' 'pycaffe' 'python2-pycaffe' ) conflicts=('caffe' 'pycaffe' 'python2-pycaffe' 'pycaffe-git' 'python2-pycaffe-git') sha256sums=('SKIP' 'c12ddbd524c1b5871cb42a8775cf17a3ef86ae8a859837a6c6c4e2c19deca3d5' - 'd2bd26feb69894bbe2a807e71703472f66d431947d4b760cd25f3243edf30557') + 'ac0195943510f1dfed85991958455cba6a36058e93f74ad4da0befb6fae84bd5') pkgver() { cd caffe set -o pipefail - _gitversion=$( git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g' || - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" ) - printf "%s" $_gitversion + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } build() { |