kodi/trunk/gcc13.patch

   1 From 3e9ca53755d14417ec0f426193f63593a4ee988f Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
   3 Date: Sat, 6 May 2023 00:24:06 +0200
   4 Subject: [PATCH 1/8] IDecoder: Add missing cstdint include for gcc>=13
   5
   6 ---
   7  tools/depends/native/TexturePacker/src/decoder/IDecoder.h | 1 +
   8  1 file changed, 1 insertion(+)
   9
  10 diff --git a/tools/depends/native/TexturePacker/src/decoder/IDecoder.h b/tools/depends/native/TexturePacker/src/decoder/IDecoder.h
  11 index 3279c55a1c13f..5bc06f2f96b43 100644
  12 --- a/tools/depends/native/TexturePacker/src/decoder/IDecoder.h
  13 +++ b/tools/depends/native/TexturePacker/src/decoder/IDecoder.h
  14 @@ -20,6 +20,7 @@
  15
  16  #pragma once
  17
  18 +#include <cstdint>
  19  #include <string>
  20  #include <vector>
  21
  22
  23 From d72b5b8c5e1e1f3976996930d664a4149f80c87b Mon Sep 17 00:00:00 2001
  24 From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
  25 Date: Sat, 6 May 2023 00:26:44 +0200
  26 Subject: [PATCH 2/8] [depends][crossguid] Patch for compatibility with gcc>=13
  27
  28 ---
  29  cmake/modules/FindCrossGUID.cmake                      |  3 ++-
  30  .../target/crossguid/003-add-cstdint-include.patch     | 10 ++++++++++
  31  tools/depends/target/crossguid/Makefile                |  1 +
  32  3 files changed, 13 insertions(+), 1 deletion(-)
  33  create mode 100644 tools/depends/target/crossguid/003-add-cstdint-include.patch
  34
  35 diff --git a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake
  36 index d68948a9e0650..4aceb84dfcd49 100644
  37 --- a/cmake/modules/FindCrossGUID.cmake
  38 +++ b/cmake/modules/FindCrossGUID.cmake
  39 @@ -29,7 +29,8 @@ if(ENABLE_INTERNAL_CROSSGUID)
  40    endif()
  41
  42    set(patches "${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/001-fix-unused-function.patch"
  43 -              "${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/002-disable-Wall-error.patch")
  44 +              "${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/002-disable-Wall-error.patch"
  45 +              "${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/003-add-cstdint-include.patch")
  46
  47    generate_patchcommand("${patches}")
  48
  49 diff --git a/tools/depends/target/crossguid/003-add-cstdint-include.patch b/tools/depends/target/crossguid/003-add-cstdint-include.patch
  50 new file mode 100644
  51 index 0000000000000..9a710d835a99c
  52 --- /dev/null
  53 +++ b/tools/depends/target/crossguid/003-add-cstdint-include.patch
  54 @@ -0,0 +1,10 @@
  55 +--- a/include/crossguid/guid.hpp
  56 ++++ b/include/crossguid/guid.hpp
  57 +@@ -36,6 +36,7 @@ THE SOFTWARE.
  58 + #include <string_view>
  59 + #include <utility>
  60 + #include <iomanip>
  61 ++#include <cstdint>
  62 +
  63 + #define BEGIN_XG_NAMESPACE namespace xg {
  64 + #define END_XG_NAMESPACE }
  65 diff --git a/tools/depends/target/crossguid/Makefile b/tools/depends/target/crossguid/Makefile
  66 index 2138ede9d3049..da01c39e25d45 100644
  67 --- a/tools/depends/target/crossguid/Makefile
  68 +++ b/tools/depends/target/crossguid/Makefile
  69 @@ -47,6 +47,7 @@ endif
  70         cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
  71         cd $(PLATFORM); patch -p1 -i ../001-fix-unused-function.patch
  72         cd $(PLATFORM); patch -p1 -i ../002-disable-Wall-error.patch
  73 +       cd $(PLATFORM); patch -p1 -i ../003-add-cstdint-include.patch
  74         cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) ..
  75
  76  .installed-$(PLATFORM): $(PLATFORM)
  77
  78 From 9a1b8e1a92d6269ab383d0845b92d0d001873194 Mon Sep 17 00:00:00 2001
  79 From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
  80 Date: Sat, 6 May 2023 01:16:17 +0200
  81 Subject: [PATCH 3/8] [depends][flatbuffers] Update to 23.3.3
  82
  83 ---
  84  tools/depends/native/flatbuffers/Makefile            | 4 ++--
  85  tools/depends/target/flatbuffers/FLATBUFFERS-VERSION | 4 ++--
  86  2 files changed, 4 insertions(+), 4 deletions(-)
  87
  88 diff --git a/tools/depends/native/flatbuffers/Makefile b/tools/depends/native/flatbuffers/Makefile
  89 index 6911d4c78641a..2d55d7e5830cd 100644
  90 --- a/tools/depends/native/flatbuffers/Makefile
  91 +++ b/tools/depends/native/flatbuffers/Makefile
  92 @@ -5,10 +5,10 @@ DEPS =../../Makefile.include Makefile ../../download-files.include
  93
  94  # lib name, version
  95  LIBNAME=flatbuffers
  96 -VERSION=2.0.0
  97 +VERSION=23.3.3
  98  SOURCE=$(LIBNAME)-$(VERSION)
  99  ARCHIVE=$(SOURCE).tar.gz
 100 -SHA512=26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
 101 +SHA512=4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0
 102  include ../../download-files.include
 103
 104  APP=$(PLATFORM)/build-cmake/flatc
 105 diff --git a/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION b/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION
 106 index 4d05761cfa4b5..5ccaa80c2d668 100644
 107 --- a/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION
 108 +++ b/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION
 109 @@ -1,4 +1,4 @@
 110  LIBNAME=flatbuffers
 111 -VERSION=2.0.0
 112 +VERSION=23.3.3
 113  ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
 114 -SHA512=26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
 115 +SHA512=4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0
 116
 117 From c98cd6995b03b99ddedc266dfebd040324aed08b Mon Sep 17 00:00:00 2001
 118 From: Lukas Rusak <lorusak@gmail.com>
 119 Date: Fri, 5 May 2023 16:14:16 -0700
 120 Subject: [PATCH 4/8] Observable: remove virtual keyword as it's never
 121  overriden
 122 MIME-Version: 1.0
 123 Content-Type: text/plain; charset=UTF-8
 124 Content-Transfer-Encoding: 8bit
 125
 126 /home/lukas/Documents/git/xbmc/xbmc/utils/Observer.h:51:23: warning: ‘virtual Observable& Observable::operator=(const Observable&)’ was hidden [-Woverloaded-virtual=]
 127    51 |   virtual Observable &operator=(const Observable &observable);
 128       |                       ^~~~~~~~
 129
 130 Signed-off-by: Lukas Rusak <lorusak@gmail.com>
 131 ---
 132  xbmc/utils/Observer.h | 2 +-
 133  1 file changed, 1 insertion(+), 1 deletion(-)
 134
 135 diff --git a/xbmc/utils/Observer.h b/xbmc/utils/Observer.h
 136 index 71adddd5b3651..49c9b3c2ab092 100644
 137 --- a/xbmc/utils/Observer.h
 138 +++ b/xbmc/utils/Observer.h
 139 @@ -48,7 +48,7 @@ class Observable
 140  public:
 141    Observable() = default;
 142    virtual ~Observable() = default;
 143 -  virtual Observable &operator=(const Observable &observable);
 144 +  Observable& operator=(const Observable& observable);
 145
 146    /*!
 147     * @brief Register an observer.
 148
 149 From fce0bcf4e203cc6cac0d91974c669b7459250eb0 Mon Sep 17 00:00:00 2001
 150 From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
 151 Date: Sat, 6 May 2023 15:25:25 +0200
 152 Subject: [PATCH 5/8] [CMake][FlatBuffers][FlatC] Make it build with our old
 153  build servers
 154
 155 Suppresses errors like these:
 156
 157 .../binary_annotator.cpp:196:28: error: 'value' is unavailable: introduced in macOS 10.14
 158   return root_table_offset.value();
 159                            ^
 160 .../include/c++/v1/optional:944:33: note: 'value' has been explicitly marked unavailable here
 161     constexpr value_type const& value() const&
 162                                 ^
 163 ---
 164  cmake/modules/FindFlatBuffers.cmake      | 6 ++++++
 165  cmake/modules/buildtools/FindFlatC.cmake | 6 ++++++
 166  2 files changed, 12 insertions(+)
 167
 168 diff --git a/cmake/modules/FindFlatBuffers.cmake b/cmake/modules/FindFlatBuffers.cmake
 169 index fffac4fae7390..e4d8b0c65188d 100644
 170 --- a/cmake/modules/FindFlatBuffers.cmake
 171 +++ b/cmake/modules/FindFlatBuffers.cmake
 172 @@ -31,6 +31,12 @@ if(ENABLE_INTERNAL_FLATBUFFERS)
 173                   "${EXTRA_ARGS}")
 174    set(BUILD_BYPRODUCTS ${DEPENDS_PATH}/include/flatbuffers/flatbuffers.h)
 175
 176 +  # Make it build with older XCode, remove once new build servers are in place
 177 +  # Fixes "error: 'value' is unavailable: introduced in macOS 10.14"
 178 +  if(APPLE)
 179 +    list(APPEND CMAKE_ARGS -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")
 180 +  endif()
 181 +
 182    BUILD_DEP_TARGET()
 183  else()
 184    find_path(FLATBUFFERS_INCLUDE_DIR NAMES flatbuffers/flatbuffers.h)
 185 diff --git a/cmake/modules/buildtools/FindFlatC.cmake b/cmake/modules/buildtools/FindFlatC.cmake
 186 index e42c81463542f..b6feae664c3ce 100644
 187 --- a/cmake/modules/buildtools/FindFlatC.cmake
 188 +++ b/cmake/modules/buildtools/FindFlatC.cmake
 189 @@ -65,6 +65,12 @@ if(NOT TARGET flatbuffers::flatc)
 190        set(WIN_DISABLE_PROJECT_FLAGS 1)
 191      endif()
 192
 193 +    # Make it build with older XCode, remove once new build servers are in place
 194 +    # Fixes "error: 'value' is unavailable: introduced in macOS 10.14"
 195 +    if(APPLE)
 196 +      list(APPEND CMAKE_ARGS -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")
 197 +    endif()
 198 +
 199      set(FLATBUFFERS_FLATC_EXECUTABLE ${INSTALL_DIR}/flatc CACHE INTERNAL "FlatBuffer compiler")
 200
 201      set(BUILD_NAME flatc)
 202
 203 From c3f457170a2b34c0d3b7d96e1fe6c796b7a8f08d Mon Sep 17 00:00:00 2001
 204 From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
 205 Date: Sat, 6 May 2023 18:11:36 +0200
 206 Subject: [PATCH 6/8] [CMake][FlatC] Don't look for local flatc if
 207  ENABLE_INTERNAL_FLATBUFFERS in enabled
 208
 209 The internal headers and external flatc may not be compatible.
 210 ---
 211  cmake/modules/buildtools/FindFlatC.cmake | 2 +-
 212  1 file changed, 1 insertion(+), 1 deletion(-)
 213
 214 diff --git a/cmake/modules/buildtools/FindFlatC.cmake b/cmake/modules/buildtools/FindFlatC.cmake
 215 index b6feae664c3ce..b0849d59137c2 100644
 216 --- a/cmake/modules/buildtools/FindFlatC.cmake
 217 +++ b/cmake/modules/buildtools/FindFlatC.cmake
 218 @@ -19,7 +19,7 @@ if(NOT TARGET flatbuffers::flatc)
 219    find_program(FLATBUFFERS_FLATC_EXECUTABLE NAMES flatc
 220                                              HINTS ${NATIVEPREFIX}/bin)
 221
 222 -  if(FLATBUFFERS_FLATC_EXECUTABLE)
 223 +  if(FLATBUFFERS_FLATC_EXECUTABLE AND NOT ENABLE_INTERNAL_FLATBUFFERS)
 224      execute_process(COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" --version
 225                      OUTPUT_VARIABLE FLATBUFFERS_FLATC_VERSION
 226                      OUTPUT_STRIP_TRAILING_WHITESPACE)
 227
 228 From 56973329e871569f1b50e80a48ce2bcc3d8baaff Mon Sep 17 00:00:00 2001
 229 From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
 230 Date: Sat, 6 May 2023 21:27:01 +0200
 231 Subject: [PATCH 7/8] !!!TEMP!!! I'm becoming desperate...
 232
 233 ---
 234  cmake/modules/FindFlatBuffers.cmake      | 6 ++++++
 235  cmake/modules/buildtools/FindFlatC.cmake | 8 +++++++-
 236  2 files changed, 13 insertions(+), 1 deletion(-)
 237
 238 diff --git a/cmake/modules/FindFlatBuffers.cmake b/cmake/modules/FindFlatBuffers.cmake
 239 index e4d8b0c65188d..5a95fdcc10f85 100644
 240 --- a/cmake/modules/FindFlatBuffers.cmake
 241 +++ b/cmake/modules/FindFlatBuffers.cmake
 242 @@ -34,7 +34,13 @@ if(ENABLE_INTERNAL_FLATBUFFERS)
 243    # Make it build with older XCode, remove once new build servers are in place
 244    # Fixes "error: 'value' is unavailable: introduced in macOS 10.14"
 245    if(APPLE)
 246 +    message(STATUS "I'm in the correct branch")
 247 +    message(STATUS "CMAKE_ARGS before: ${CMAKE_ARGS}")
 248      list(APPEND CMAKE_ARGS -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")
 249 +    message(STATUS "CMAKE_ARGS after: ${CMAKE_ARGS}")
 250 +  else()
 251 +    message(STATUS "I'm in the wrong branch")
 252 +    message(STATUS "I'm in the wrong branch. CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME} CMAKE_HOST_SYSTEM_NAME: ${CMAKE_HOST_SYSTEM_NAME}")
 253    endif()
 254
 255    BUILD_DEP_TARGET()
 256 diff --git a/cmake/modules/buildtools/FindFlatC.cmake b/cmake/modules/buildtools/FindFlatC.cmake
 257 index b0849d59137c2..6bebc755d56a9 100644
 258 --- a/cmake/modules/buildtools/FindFlatC.cmake
 259 +++ b/cmake/modules/buildtools/FindFlatC.cmake
 260 @@ -67,8 +67,14 @@ if(NOT TARGET flatbuffers::flatc)
 261
 262      # Make it build with older XCode, remove once new build servers are in place
 263      # Fixes "error: 'value' is unavailable: introduced in macOS 10.14"
 264 -    if(APPLE)
 265 +    if(LINUX)
 266 +      message(STATUS "I'm in the correct branch")
 267 +      message(STATUS "CMAKE_ARGS before: ${CMAKE_ARGS}")
 268        list(APPEND CMAKE_ARGS -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")
 269 +      message(STATUS "CMAKE_ARGS after: ${CMAKE_ARGS}")
 270 +    else()
 271 +      message(STATUS "I'm in the wrong branch")
 272 +      message(STATUS "I'm in the wrong branch. CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME} CMAKE_HOST_SYSTEM_NAME: ${CMAKE_HOST_SYSTEM_NAME}")
 273      endif()
 274
 275      set(FLATBUFFERS_FLATC_EXECUTABLE ${INSTALL_DIR}/flatc CACHE INTERNAL "FlatBuffer compiler")
 276
 277 From cb6c8bbb20096afca2b456221fa5e036b01f272a Mon Sep 17 00:00:00 2001
 278 From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
 279 Date: Sat, 6 May 2023 22:10:26 +0200
 280 Subject: [PATCH 8/8] fixup! !!!TEMP!!! I'm becoming desperate...
 281
 282 ---
 283  cmake/modules/buildtools/FindFlatC.cmake | 2 +-
 284  1 file changed, 1 insertion(+), 1 deletion(-)
 285
 286 diff --git a/cmake/modules/buildtools/FindFlatC.cmake b/cmake/modules/buildtools/FindFlatC.cmake
 287 index 6bebc755d56a9..0ccbc04dc9924 100644
 288 --- a/cmake/modules/buildtools/FindFlatC.cmake
 289 +++ b/cmake/modules/buildtools/FindFlatC.cmake
 290 @@ -67,7 +67,7 @@ if(NOT TARGET flatbuffers::flatc)
 291
 292      # Make it build with older XCode, remove once new build servers are in place
 293      # Fixes "error: 'value' is unavailable: introduced in macOS 10.14"
 294 -    if(LINUX)
 295 +    if(APPLE)
 296        message(STATUS "I'm in the correct branch")
 297        message(STATUS "CMAKE_ARGS before: ${CMAKE_ARGS}")
 298        list(APPEND CMAKE_ARGS -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")