From 78159b78f7196acfa1ec3786f8bd261318f6d74e Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 9 Sep 2018 21:47:25 +0000
Subject: [PATCH] user/frei0r-plugins: fix build with OpenCV 3.4.3
---
user/frei0r-plugins/APKBUILD | 7 ++++--
.../facebl0r-opencv-3.4.3.patch | 22 +++++++++++++++++++
2 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 user/frei0r-plugins/facebl0r-opencv-3.4.3.patch
diff --git a/user/frei0r-plugins/APKBUILD b/user/frei0r-plugins/APKBUILD
index 26b233467a..bbfd1c2ca3 100644
--- a/user/frei0r-plugins/APKBUILD
+++ b/user/frei0r-plugins/APKBUILD
@@ -12,7 +12,9 @@ depends=""
makedepends="opencv-dev gavl-dev file cairo-dev doxygen
automake autoconf libtool"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://files.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz"
+source="https://files.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz
+ facebl0r-opencv-3.4.3.patch
+ "
prepare() {
default_prepare
@@ -35,4 +37,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="843790389e6de83817d1c3744a91d3365864bb0c22cf6598707ccba5ec8933f6209434011cde1303e16edd89f6cde2f22aa1fb6eca3548d892a2c77332c44aac frei0r-plugins-1.6.1.tar.gz"
+sha512sums="843790389e6de83817d1c3744a91d3365864bb0c22cf6598707ccba5ec8933f6209434011cde1303e16edd89f6cde2f22aa1fb6eca3548d892a2c77332c44aac frei0r-plugins-1.6.1.tar.gz
+785ff3459f371620780f274b82702c8f6625d78fcd6000fddca0585e3aeaa0af57fd9d9444c4d0f1ca47e84b47b8a2fca4b86fa44ebe93487948eb8f4a193503 facebl0r-opencv-3.4.3.patch"
diff --git a/user/frei0r-plugins/facebl0r-opencv-3.4.3.patch b/user/frei0r-plugins/facebl0r-opencv-3.4.3.patch
new file mode 100644
index 0000000000..f3d4f46bb0
--- /dev/null
+++ b/user/frei0r-plugins/facebl0r-opencv-3.4.3.patch
@@ -0,0 +1,22 @@
+From b0a06d52e39438fae2afbf98bafe6c794d13b83e Mon Sep 17 00:00:00 2001
+From: Christoph Willing <chris.willing@linux.com>
+Date: Sat, 14 Jul 2018 21:34:03 +1000
+Subject: [PATCH] Include opencv2/imgproc.hpp for CV_RGB()
+
+Signed-off-by: Christoph Willing <chris.willing@linux.com>
+---
+ src/filter/facebl0r/facebl0r.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp
+index 6d6e8f2..823462a 100644
+--- a/src/filter/facebl0r/facebl0r.cpp
++++ b/src/filter/facebl0r/facebl0r.cpp
+@@ -19,6 +19,7 @@
+ #include <stdlib.h>
+ #include <opencv/cv.h>
+ #include <opencv/highgui.h>
++#include <opencv2/imgproc.hpp>
+
+ #include <frei0r.hpp>
+ #include <frei0r_math.h>
--
GitLab