diff options
author | fuan_k | 2018-12-19 20:57:04 +0100 |
---|---|---|
committer | fuan_k | 2018-12-19 20:57:04 +0100 |
commit | 178c202b8c19e296f48d96e20296018110f5b9be (patch) | |
tree | 2b510c1f7941daef299c54ed3a306c92613bd34c | |
parent | dc29364aa1af631cc80ef48d3f662e400399669e (diff) | |
download | aur-178c202b8c19e296f48d96e20296018110f5b9be.tar.gz |
Upgrade to opencv4 broke dependencies
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 21 |
2 files changed, 15 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = diffimg pkgdesc = Simple image comparison tool pkgver = 2.2.0 - pkgrel = 1 + pkgrel = 2 url = http://sourceforge.net/projects/diffimg/ install = diffimg.install arch = i686 @@ -5,9 +5,9 @@ pkgname=diffimg _pkgname=Diffimg -_newpkgname=Diffimg-xbee # possible future name? +_newpkgname=Diffimg-xbee # possible future name due to conflict pkgver=2.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simple image comparison tool" arch=('i686' 'x86_64') license=('GPL2') @@ -36,6 +36,15 @@ prepare(){ sed -i -e 's;\"\/usr\/include\/qwt\";\"\/usr\/include\/qwt\-qt4\";g' CMakeLists.txt sed -i -e '178s;qwt;qwt\-qt4;g' CMakeLists.txt sed -i -e '180s;qwt;qwt\-qt4;g' CMakeLists.txt + + #Hack to fix upgrade to opencv4 breaking legacy components + sed -i -e "/ADD_LIBRARY(PerceptualDiff/a find_package(OpenCV COMPONENTS opencv_imgproc REQUIRED CONFIG)\ninclude_directories(\${OpenCV_INCLUDE_DIRS})" ../3rdparty/perceptualdiff/CMakeLists.txt + sed -i -e "/#include <opencv2\/imgproc\/imgproc.hpp/i #include <opencv2\/imgproc\/imgproc_c.h>" ../3rdparty/perceptualdiff/OpenCVImageLoader.cpp + sed -i -e "/#include <opencv2\/imgproc\/imgproc.hpp/i #include <opencv2\/imgproc\/imgproc_c.h>" ../src/MiscFunctions.cpp + sed -i -e "/#include <opencv2\/imgproc\/imgproc.hpp/i #include <opencv2\/imgproc\/imgproc_c.h>" ../src/metrics/PerLuminanceMetric.cpp + sed -i -e "/#include <opencv2\/imgproc\/imgproc.hpp/i #include <opencv2\/imgcodecs\/legacy\/constants_c.h>\n#include <opencv2\/imgproc\/imgproc_c.h>" ../src/metrics/BaseMetric.cpp + + } build() { @@ -48,16 +57,15 @@ build() { } package() { - cd ${_pkgname}-${pkgver}-src - install -Dm644 ../${pkgname}.desktop "${pkgdir}"/usr/share/applications/${_pkgname}.desktop + cd ${_pkgname}-${pkgver}-src/build + install -Dm644 ../../${pkgname}.desktop "${pkgdir}"/usr/share/applications/${_pkgname}.desktop - cd ./build #make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install #make INSTALL_ROOT="${pkgdir}" install make DESTDIR="${pkgdir}" prefix="${pkgdir}" install - # remove cmake's generated file + # remove cmake's generated file we don't need rm "${pkgdir}/usr/share/applications/${pkgname}.desktop" # fix name conflicts with graphviz/diffimg @@ -72,4 +80,3 @@ package() { mv "${pkgdir}/usr/share/pixmaps/diffimg.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}/${_pkgname}.png" } - |