summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD3
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 55bdfc12c5b..2f64e5654aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Nov 19 23:01:06 UTC 2017
+# Tue Jan 2 22:22:24 UTC 2018
pkgbase = ros-kinetic-opencv3
pkgdesc = ROS - OpenCV 3.x.
pkgver = 3.3.1
- pkgrel = 2
+ pkgrel = 3
url = http://opencv.org
arch = any
license = BSD
@@ -31,6 +31,7 @@ pkgbase = ros-kinetic-opencv3
depends = libpng
depends = ffmpeg
depends = libharu
+ conflicts = lapacke
source = ros-kinetic-opencv3-3.3.1-0.tar.gz::https://github.com/ros-gbp/opencv3-release/archive/release/kinetic/opencv3/3.3.1-0.tar.gz
sha256sums = 103f28d76c6451d2371a09fb693f0c466da6dfaf374a4fa92f7dac2ad5a7f4ab
diff --git a/PKGBUILD b/PKGBUILD
index 4043b4ca3a0..990bbae1bf6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-kinetic-opencv3'
pkgver='3.3.1'
_pkgver_patch=0
arch=('any')
-pkgrel=2
+pkgrel=3
license=('BSD')
ros_makedepends=()
@@ -37,6 +37,7 @@ depends=(${ros_depends[@]}
libpng
ffmpeg
libharu)
+conflicts=(lapacke)
# Git version (e.g. for debugging)
# _tag=release/kinetic/opencv3/${pkgver}-${_pkgver_patch}