Andreas Tille pushed to branch master at Debian Med / opencfu
Commits:
f9811c73 by Andreas Tille at 2020-11-06T15:03:32+01:00
Detect opencv4.pc
- - - - -
113a4759 by Andreas Tille at 2020-11-06T15:09:07+01:00
Upload to unstable
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/opencv4.pc.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-opencfu (3.9.0-4) UNRELEASED; urgency=medium
+opencfu (3.9.0-4) unstable; urgency=medium
[ Andreas Tille ]
* Standards-Version: 4.5.0 (routine-update)
@@ -7,12 +7,13 @@ opencfu (3.9.0-4) UNRELEASED; urgency=medium
* Trim trailing whitespace.
* Set upstream metadata fields: Repository.
* Point watch file to Github
+ * Detect opencv4.pc
[ Alex Dewar ]
* Fix build on OpenCV v4+
Closes: #922589
- -- Andreas Tille <[email protected]> Fri, 24 Jan 2020 15:30:06 +0100
+ -- Andreas Tille <[email protected]> Fri, 06 Nov 2020 15:04:06 +0100
opencfu (3.9.0-3) unstable; urgency=medium
=====================================
debian/patches/opencv4.pc.patch
=====================================
@@ -0,0 +1,17 @@
+Author: Andreas Tille <[email protected]>
+Last-Update: Fri, 06 Nov 2020 12:59:42 +0100
+Description: Detect opencv4.pc
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,8 +26,8 @@ AC_OPENMP
+
+ AC_SUBST(OPENMP_CFLAGS)
+
+-# We check for opencv 3.0.0. if absent, stop!!
+-PKG_CHECK_MODULES([OPENCV],[opencv >= 3.0.0],[],[AC_MSG_ERROR(OpenCV not
found. Have you installed the library (devel version)). OpenCFU cannot be built
without OpenCV!])
++# We check for opencv 4.0.0. if absent, stop!!
++PKG_CHECK_MODULES([OPENCV],[opencv4 >= 4.0.0],[],[AC_MSG_ERROR(OpenCV not
found. Have you installed the library (devel version)). OpenCFU cannot be built
without OpenCV!])
+
+ ### We add opencv to global AM flags.
+
=====================================
debian/patches/series
=====================================
@@ -16,3 +16,4 @@
0016-Compiler-compatibility-fix.patch
0017_opencv4.patch
61a32bbb3e196e8a9be9ac6110ca0bdef88a9bdf.patch
+opencv4.pc.patch
View it on GitLab:
https://salsa.debian.org/med-team/opencfu/-/compare/101cd826880812fae769c841f8310c0a2aab2e8d...113a4759c24c9e4bdba614edd4a88e2aabe8cd55
--
View it on GitLab:
https://salsa.debian.org/med-team/opencfu/-/compare/101cd826880812fae769c841f8310c0a2aab2e8d...113a4759c24c9e4bdba614edd4a88e2aabe8cd55
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
