summaryrefslogtreecommitdiffstats
path: root/package/vlc/0009-opencv_example-add-missing-include-statements.patch
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2016-02-28 21:18:22 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-03-05 15:00:26 +0100
commite1b34f00b4991ca6353330c650f71bddee92fd12 (patch)
treec7b46477e4b5e89522c37d9f19af6b6736ee668a /package/vlc/0009-opencv_example-add-missing-include-statements.patch
parent7f82fe9751d813e9f75b8332ad8cd64ce24ec463 (diff)
downloadbuildroot-e1b34f00b4991ca6353330c650f71bddee92fd12.tar.gz
buildroot-e1b34f00b4991ca6353330c650f71bddee92fd12.zip
package/vlc: bump version to 2.2.2
Removed two patches applied upstream. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/vlc/0009-opencv_example-add-missing-include-statements.patch')
-rw-r--r--package/vlc/0009-opencv_example-add-missing-include-statements.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/package/vlc/0009-opencv_example-add-missing-include-statements.patch b/package/vlc/0009-opencv_example-add-missing-include-statements.patch
deleted file mode 100644
index 7b7f72702c..0000000000
--- a/package/vlc/0009-opencv_example-add-missing-include-statements.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Backport from: https://git.videolan.org/?p=vlc.git;a=commit;h=b82416d7000a993b33e903095a590fe32212a85e
-
-From b82416d7000a993b33e903095a590fe32212a85e Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Sun, 24 May 2015 14:30:10 +0200
-Subject: [PATCH 9/9] opencv_example: add missing #include statements
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
- modules/video_filter/opencv_example.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-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>
-
- /*****************************************************************************
---
-2.4.2
-
OpenPOWER on IntegriCloud