summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@iinet.net.au>2015-09-09 23:07:01 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-09-09 23:07:01 +0700
commit5facd795f67c074db3f47a68d58811189543eb00 (patch)
treed5e80f79370bb8e012257bfbdd895fb2f6642d6b
parent749150d8e138bc814dce8034c6d3f02535bcba7e (diff)
downloadslackbuilds-5facd795f67c074db3f47a68d58811189543eb00.tar.gz
multimedia/vlc: Patched for opencv 3.0.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--multimedia/vlc/patch-vlc-opencv3.diff13
-rw-r--r--multimedia/vlc/vlc.SlackBuild4
2 files changed, 16 insertions, 1 deletions
diff --git a/multimedia/vlc/patch-vlc-opencv3.diff b/multimedia/vlc/patch-vlc-opencv3.diff
new file mode 100644
index 0000000000..6ffefa94d1
--- /dev/null
+++ b/multimedia/vlc/patch-vlc-opencv3.diff
@@ -0,0 +1,13 @@
+diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
+index ae3af05..998f286 100644
+--- a/modules/video_filter/opencv_example.cpp
++++ b/modules/video_filter/opencv_example.cpp
+@@ -41,6 +41,8 @@
+
+ #include <opencv2/core/core_c.h>
+ #include <opencv2/core/core.hpp>
++#include <opencv2/imgproc/imgproc_c.h>
++#include <opencv2/imgproc/imgproc.hpp>
+ #include <opencv2/objdetect/objdetect.hpp>
+
+ /*****************************************************************************
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index ef46374daf..e9ca7f5cd3 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -29,7 +29,7 @@
PRGNAM=vlc
VERSION=${VERSION:-2.1.6}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -85,6 +85,8 @@ mkdir -p decklink/include
unzip -o $CWD/$DECKLINKSDK
cp -p Blackmagic\ DeckLink\ SDK\ ${DECKLINK_SDK_VERSION}/Linux/include/* decklink/include/
+patch -p1 < $CWD/patch-vlc-opencv3.diff
+
patch -p0 < $CWD/patch-freerdp.diff
patch -p0 < $CWD/patch-freerdp_1_2.diff
patch -p0 < $CWD/patch-projectM-fontpath.diff