From d61424ca807a41335e490cd9dd8f12a4bb788382 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 19 Jan 2022 19:19:45 -0600 Subject: [PATCH] opencv4: -devel and libopencv-devel conflict --- srcpkgs/opencv4/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template index 69fec13d8f..595d8b2e22 100644 --- a/srcpkgs/opencv4/template +++ b/srcpkgs/opencv4/template @@ -1,7 +1,7 @@ # Template file for 'opencv4' pkgname=opencv4 version=4.5.3 -revision=1 +revision=2 wrksrc=opencv-${version} build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON @@ -62,6 +62,7 @@ libopencv4_package() { libopencv4-devel_package() { short_desc+=" - development files" depends="libopencv4>=${version}_${revision}" + conflicts="libopencv-devel>=0" pkg_install() { vmove usr/include vmove usr/lib/cmake