Merge pull request #852 from AlwinEsch/Matrix-change

[Matrix] fix build error about gtest if warning set to error
xbmc · Dec 11, 2021 · ea598cf · ea598cf
2 parents 1d88779 + f3716d7
commit ea598cf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/depends/common/googletest/0001-FixWarningMaybe-uninitialized.patch b/depends/common/googletest/0001-FixWarningMaybe-uninitialized.patch
@@ -0,0 +1,20 @@
+--- a/googletest/src/gtest-death-test.cc
++++ b/googletest/src/gtest-death-test.cc
+@@ -1281,7 +1281,7 @@
+ GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+ GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+ static void StackLowerThanAddress(const void* ptr, bool* result) {
+-  int dummy;
++  int dummy = 0;
+   *result = (&dummy < ptr);
+ }
+
+@@ -1289,7 +1289,7 @@
+ GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+ GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+ static bool StackGrowsDown() {
+-  int dummy;
++  int dummy = 0;
+   bool result;
+   StackLowerThanAddress(&dummy, &result);
+   return result;
diff --git a/inputstream.adaptive/addon.xml.in b/inputstream.adaptive/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="inputstream.adaptive"
-  version="19.0.0"
+  version="19.0.1"
   name="InputStream Adaptive"
   provider-name="peak3d">
   <requires>@ADDON_DEPENDS@</requires>
@@ -15,6 +15,9 @@
   <extension point="xbmc.addon.metadata">
     <platform>@PLATFORM@</platform>
     <news>
+v19.0.1 (2021-12-10)
+- Fix compile error by GCC 11
+
 v19.0.0 (2021-09-14)
 - Change test builds to released 'Kodi 19 Matrix'
 - Increase version to 19.0.0