From e4a398632b16a645a361d5122dcbcd0a330a729e Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 11 Jul 2019 23:53:13 +0200
Subject: Deps: updates to opencv, frei0r-plugins and mlt

---
 deps/frei0r-plugins/frei0r-plugins.SlackBuild            | 14 +++++++++-----
 deps/frei0r-plugins/patches/frei0r_opencv2_include.patch | 10 ++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 deps/frei0r-plugins/patches/frei0r_opencv2_include.patch

(limited to 'deps/frei0r-plugins')

diff --git a/deps/frei0r-plugins/frei0r-plugins.SlackBuild b/deps/frei0r-plugins/frei0r-plugins.SlackBuild
index 6e91161..9d526ec 100755
--- a/deps/frei0r-plugins/frei0r-plugins.SlackBuild
+++ b/deps/frei0r-plugins/frei0r-plugins.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2017  Eric Hameleers, Eindhoven, NL
+# Copyright 2017, 2019  Eric Hameleers, Eindhoven, NL
 # Copyright 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -26,7 +26,7 @@
 
 PKGNAM=frei0r-plugins
 VERSION=${VERSION:-1.6.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -35,7 +35,7 @@ PKG=$TMP/package-$PKGNAM
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
     *) ARCH=$(uname -m) ;;
@@ -43,8 +43,8 @@ if [ -z "$ARCH" ]; then
   export ARCH
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   SLKLDFLAGS=""
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
@@ -85,6 +85,9 @@ find . \
 sed -i CMakeLists.txt \
     -e "s, lib/, lib${LIBDIRSUFFIX}/,g" -e "s,/lib,/lib${LIBDIRSUFFIX},g"
 
+## Apply a patch to make it compile against opencv >= 3.4:
+#cat $CWD/patches/frei0r_opencv2_include.patch | patch -p1 --verbose || exit 1
+
 # Configure and compile:
 mkdir -p build
 cd build
@@ -96,6 +99,7 @@ cd build
     -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DWITHOUT_OPENCV=ON \
     ..
   make
   make install DESTDIR=$PKG
diff --git a/deps/frei0r-plugins/patches/frei0r_opencv2_include.patch b/deps/frei0r-plugins/patches/frei0r_opencv2_include.patch
new file mode 100644
index 0000000..d139575
--- /dev/null
+++ b/deps/frei0r-plugins/patches/frei0r_opencv2_include.patch
@@ -0,0 +1,10 @@
+--- frei0r-plugins-1.6.1/src/filter/facebl0r/facebl0r.cpp.orig    2018-07-14 20:49:01.564511495 +1000
++++ frei0r-plugins-1.6.1/src/filter/facebl0r/facebl0r.cpp 2018-07-14 18:47:44.430685507 +1000
+@@ -19,6 +19,7 @@
+ #include <stdlib.h>
+ #include <opencv/cv.h>
+ #include <opencv/highgui.h>
++#include <opencv2/imgproc.hpp>
+ 
+ 
+ #include <frei0r.hpp>
-- 
cgit v1.2.3