[vlc-commits] [Git][videolan/vlc][master] 4 commits: contribs: ebml: Fix build with GCC11

Thu Jan 20 10:45:03 UTC 2022


Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
6834f9a2 by Hugo Beauzée-Luyssen at 2022-01-20T09:46:19+00:00
contribs: ebml: Fix build with GCC11

Already applied upstream

- - - - -
5cea85fe by Hugo Beauzée-Luyssen at 2022-01-20T09:46:19+00:00
contribs: qt: Fix build with gcc11

- - - - -
7595f325 by Hugo Beauzée-Luyssen at 2022-01-20T09:46:19+00:00
contribs: qtdeclarative: Fix build with gcc11

- - - - -
a49c449f by Hugo Beauzée-Luyssen at 2022-01-20T09:46:19+00:00
contribs: srt: Fix build with gcc11

- - - - -


8 changed files:

- + contrib/src/ebml/missing-limits-include.patch
- contrib/src/ebml/rules.mak
- + contrib/src/qt/qt-fix-gcc11-build.patch
- contrib/src/qt/rules.mak
- + contrib/src/qtdeclarative/fix-gcc11-build.patch
- contrib/src/qtdeclarative/rules.mak
- + contrib/src/srt/fix-gcc11-build.patch
- contrib/src/srt/rules.mak


Changes:

=====================================
contrib/src/ebml/missing-limits-include.patch
=====================================
@@ -0,0 +1,36 @@
+From f0bfd53647961e799a43d918c46cf3b6bff89806 Mon Sep 17 00:00:00 2001
+From: Moritz Bunkus <mo at bunkus.online>
+Date: Sat, 27 Feb 2021 20:36:52 +0100
+Subject: [PATCH] include appropriate header files for std::numeric_limits
+
+Fixes #80.
+---
+ ChangeLog                 | 4 ++++
+ src/EbmlString.cpp        | 1 +
+ src/EbmlUnicodeString.cpp | 1 +
+ 3 files changed, 6 insertions(+)
+
+diff --git a/src/EbmlString.cpp b/src/EbmlString.cpp
+index 27e55fd..4c05fcf 100644
+--- a/src/EbmlString.cpp
++++ b/src/EbmlString.cpp
+@@ -34,6 +34,7 @@
+   \author Steve Lhomme     <robux4 @ users.sf.net>
+ */
+ #include <cassert>
++#include <limits>
+ 
+ #include "ebml/EbmlString.h"
+ 
+diff --git a/src/EbmlUnicodeString.cpp b/src/EbmlUnicodeString.cpp
+index 496a16a..99fc073 100644
+--- a/src/EbmlUnicodeString.cpp
++++ b/src/EbmlUnicodeString.cpp
+@@ -36,6 +36,7 @@
+ */
+ 
+ #include <cassert>
++#include <limits>
+ 
+ #include "ebml/EbmlUnicodeString.h"
+ 


=====================================
contrib/src/ebml/rules.mak
=====================================
@@ -14,6 +14,7 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.xz:
 
 ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
 	$(UNPACK)
+	$(APPLY) $(SRC)/ebml/missing-limits-include.patch
 	$(MOVE)
 
 .ebml: ebml toolchain.cmake


=====================================
contrib/src/qt/qt-fix-gcc11-build.patch
=====================================
@@ -0,0 +1,30 @@
+--- qt/src/corelib/global/qfloat16.h.old	2022-01-18 17:46:03.821787862 +0100
++++ qt/src/corelib/global/qfloat16.h	2022-01-18 17:46:52.824906487 +0100
+@@ -44,6 +44,7 @@
+ #include <QtCore/qglobal.h>
+ #include <QtCore/qmetatype.h>
+ #include <string.h>
++#include <limits>
+ 
+ #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
+ // All processors that support AVX2 do support F16C too. That doesn't mean
+--- qt/src/corelib/text/qbytearraymatcher.h.old	2022-01-18 17:47:49.667887059 +0100
++++ qt/src/corelib/text/qbytearraymatcher.h	2022-01-18 17:48:09.055540031 +0100
+@@ -41,6 +41,7 @@
+ #define QBYTEARRAYMATCHER_H
+ 
+ #include <QtCore/qbytearray.h>
++#include <limits>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+--- qt/src/3rdparty/angle/src/libANGLE/HandleAllocator.cpp.old	2022-01-18 17:55:16.527952044 +0100
++++ qt/src/3rdparty/angle/src/libANGLE/HandleAllocator.cpp	2022-01-18 17:55:28.315744081 +0100
+@@ -10,6 +10,7 @@
+ #include "libANGLE/HandleAllocator.h"
+ 
+ #include <algorithm>
++#include <limits>
+ 
+ #include "common/debug.h"
+ 


=====================================
contrib/src/qt/rules.mak
=====================================
@@ -50,6 +50,7 @@ else
 	cd $(UNPACK_DIR); for i in QtFontDatabaseSupport QtWindowsUIAutomationSupport QtEventDispatcherSupport QtCore; do \
 		sed -i -e 's,"../../../../../src,"../src,g' include/$$i/$(QT_VERSION)/$$i/private/*.h; done
 endif
+	$(APPLY) $(SRC)/qt/qt-fix-gcc11-build.patch
 
 endif
 	$(MOVE)


=====================================
contrib/src/qtdeclarative/fix-gcc11-build.patch
=====================================
@@ -0,0 +1,11 @@
+--- qtdeclarative/src/3rdparty/masm/yarr/Yarr.h.old	2022-01-18 18:04:29.778230868 +0100
++++ qtdeclarative/src/3rdparty/masm/yarr/Yarr.h	2022-01-18 18:04:57.625743037 +0100
+@@ -27,7 +27,7 @@
+ 
+ #pragma once
+ 
+-#include <limits.h>
++#include <limits>
+ #include "YarrErrorCode.h"
+ 
+ namespace JSC { namespace Yarr {


=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -21,6 +21,7 @@ $(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
 
 qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
 	$(UNPACK)
+	$(APPLY) $(SRC)/qtdeclarative/fix-gcc11-build.patch
 	$(MOVE)
 
 QT_DECLARATIVE_CONFIG := \


=====================================
contrib/src/srt/fix-gcc11-build.patch
=====================================
@@ -0,0 +1,22 @@
+From f1b35cbf5b9b42b031e9b119e4c802b5f744468c Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <krop at users.noreply.github.com>
+Date: Wed, 10 Feb 2021 12:42:45 +0000
+Subject: [PATCH] [core] Fix build with GCC 11. (#1806)
+
+The 'limits' header must be included explicitly.
+---
+ srtcore/sync.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/srtcore/sync.h b/srtcore/sync.h
+index 59c125a75..9f01ca91e 100644
+--- a/srtcore/sync.h
++++ b/srtcore/sync.h
+@@ -15,6 +15,7 @@
+ //#define ENABLE_CXX17
+ 
+ #include <cstdlib>
++#include <limits>
+ #ifdef ENABLE_STDCXX_SYNC
+ #include <chrono>
+ #include <thread>


=====================================
contrib/src/srt/rules.mak
=====================================
@@ -27,6 +27,7 @@ $(TARBALLS)/srt-$(SRT_VERSION).tar.gz:
 srt: srt-$(SRT_VERSION).tar.gz .sum-srt
 	$(UNPACK)
 	$(APPLY) $(SRC)/srt/0001-core-ifdef-MSG_TRUNC-nixes-fix.patch
+	$(APPLY) $(SRC)/srt/fix-gcc11-build.patch
 	$(call pkg_static,"scripts/srt.pc.in")
 	mv srt-$(SRT_VERSION) $@ && touch $@
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/44318673acac58a0c42760f3014565f78c8793db...a49c449f1dd344087c4086fc03ecf4a5d69a6bf9

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/44318673acac58a0c42760f3014565f78c8793db...a49c449f1dd344087c4086fc03ecf4a5d69a6bf9
You're receiving this email because of your account on code.videolan.org.


