summaryrefslogtreecommitdiffstats
path: root/package/vlc/0008-opencv_wrapper-use-opencv2-style-includes.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/0008-opencv_wrapper-use-opencv2-style-includes.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/0008-opencv_wrapper-use-opencv2-style-includes.patch')
-rw-r--r--package/vlc/0008-opencv_wrapper-use-opencv2-style-includes.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/package/vlc/0008-opencv_wrapper-use-opencv2-style-includes.patch b/package/vlc/0008-opencv_wrapper-use-opencv2-style-includes.patch
deleted file mode 100644
index 0ce0206d10..0000000000
--- a/package/vlc/0008-opencv_wrapper-use-opencv2-style-includes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Backport from: https://git.videolan.org/?p=vlc.git;a=commit;h=cc236e4652255902f2c2cee3b18f83367f35a8c7
-
-From cc236e4652255902f2c2cee3b18f83367f35a8c7 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Sun, 24 May 2015 14:30:09 +0200
-Subject: [PATCH 8/9] opencv_wrapper: use opencv2-style includes
-
-If old opencv1-style legacy include directory is available, this change
-becomes purely cosmetic (maybe will compile a bit faster).
-It becomes an FTBFS fix when opencv1-style include directory is missing
-(i.e. from opencv-3.0).
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
- modules/video_filter/opencv_wrapper.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
-index e36e1a5..5d74241 100644
---- a/modules/video_filter/opencv_wrapper.c
-+++ b/modules/video_filter/opencv_wrapper.c
-@@ -39,8 +39,8 @@
- #include <vlc_image.h>
- #include "filter_picture.h"
-
--#include <cxcore.h>
--#include <cv.h>
-+#include <opencv2/core/core_c.h>
-+#include <opencv2/core/types_c.h>
-
- /*****************************************************************************
- * Local prototypes
---
-2.4.2
-
OpenPOWER on IntegriCloud