aboutsummaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-03-02 14:33:38 -0800
committerKhem Raj <raj.khem@gmail.com>2021-03-03 11:08:29 -0800
commitfa0ef82344b8295040aa3fb49c8ec8da86b7ad07 (patch)
tree18ff7b9ba8739294f26ee8bb50228021ee02276a /meta-multimedia
parent1498b3407fa723a984f58e97464caa11cd4d4c40 (diff)
downloadmeta-openembedded-contrib-fa0ef82344b8295040aa3fb49c8ec8da86b7ad07.tar.gz
vlc: Fix build with gcc 11
Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Andreas Müller <schnitzeltony@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc/0001-include-limits-header.patch43
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb1
2 files changed, 44 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-include-limits-header.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-include-limits-header.patch
new file mode 100644
index 0000000000..e1383c826c
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-include-limits-header.patch
@@ -0,0 +1,43 @@
+From 1068c7451855c3f9acde9af265b5a790073b1641 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 2 Mar 2021 14:28:27 -0800
+Subject: [PATCH] include <limits> header
+
+Fixes
+SegmentInformation.cpp:397:49: error: '::max' has not been declared; d
+id you mean 'std::max'?
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ modules/demux/adaptive/playlist/SegmentInformation.cpp | 1 +
+ modules/demux/hls/playlist/Parser.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp
+index 344e155..8eeb054 100644
+--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
++++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
+@@ -34,6 +34,7 @@
+
+ #include <algorithm>
+ #include <cassert>
++#include <limits>
+
+ using namespace adaptive::playlist;
+
+diff --git a/modules/demux/hls/playlist/Parser.cpp b/modules/demux/hls/playlist/Parser.cpp
+index 67110e4..7439699 100644
+--- a/modules/demux/hls/playlist/Parser.cpp
++++ b/modules/demux/hls/playlist/Parser.cpp
+@@ -42,6 +42,7 @@
+ #include <map>
+ #include <cctype>
+ #include <algorithm>
++#include <limits>
+
+ using namespace adaptive;
+ using namespace adaptive::playlist;
+--
+2.30.1
+
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb
index 046c059fb4..c0074aabb5 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb
@@ -25,6 +25,7 @@ SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \
file://0003-fix-luaL-checkint.patch \
file://0004-Use-packageconfig-to-detect-mmal-support.patch \
file://0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch \
+ file://0001-include-limits-header.patch \
"
SRC_URI[sha256sum] = "eff458f38a92126094f44f2263c2bf2c7cdef271b48192d0fe7b1726388cf879"