Update to r62122.ce0bfc65020-1

author: graysky 2023-06-04 08:15:21 -0400
committer: graysky 2023-06-04 08:15:21 -0400
commit: 0188fb3c82254900c7f13efe62beec11b5428a7f (patch)
tree: 9e35b7073e00eb1d6702298b6f7e5b080a58baa2
parent: 9e2bbf44184f9ebdfc9851bb22f765ad909ccfbd (diff)
download: aur-0188fb3c82254900c7f13efe62beec11b5428a7f.tar.gz
4 files changed, 53 insertions, 320 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 54083240ade0..077699da782e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-nexus-git
-	pkgver = r62102.f960b3749f3
+	pkgver = r62122.ce0bfc65020
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -80,9 +80,7 @@ pkgbase = kodi-nexus-git
 	source = https://mirrors.kodi.tv/build-deps/sources/flatbuffers-23.3.3.tar.gz
 	source = https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
 	source = cheat-sse-build.patch
-	source = gcc13.patch
-	source = https://github.com/xbmc/xbmc/commit/28ed2221.patch
-	source = https://github.com/xbmc/xbmc/commit/023717ed.patch
+	source = 0001-flatbuffers-use-23.3.3-to-fix-build-with-gcc13.patch
 	b2sums = SKIP
 	b2sums = 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c
 	b2sums = db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c
@@ -93,9 +91,7 @@ pkgbase = kodi-nexus-git
 	b2sums = be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66
 	b2sums = 1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61
 	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
-	b2sums = cae6c719106d57102e54b8e21f29f32fc3b9453e16c4fc2ad6dbe64cc6dc550da149e75cd8c26a446cefae44d5c52a95a3c073ad2d42296650d9c68704da8abd
-	b2sums = a83e294a5e179c0b3d2d378db115af03aacff3e24c2a90a0485413225178cc175efb083047b90c8231c3435b22f859477939febe963092fb03f1f4ebcb7a5934
-	b2sums = e60221f70947838cc3ffce9c848d109fc108cda616306b860330def5d1b3adca01a6d8f3e9afdde9283432cf843d8b7af2fd7693c2ff21cb3548625c651058b9
+	b2sums = d24ddcde4e78fea147e326e1b0257d5a7bcda45cd918f1c4d30d150cf83208662b2f9bded61a482ce1afca479d995ac029556b5b88330e53faa30878f8752331
 
 pkgname = kodi-nexus-git
 	pkgdesc = A software media player and entertainment hub for digital media (Nexus branch)
@@ -142,7 +138,7 @@ pkgname = kodi-nexus-git
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = pipewire: PipeWire support
 	optdepends = upower: Display battery level
-	provides = kodi=r62102.f960b3749f3
+	provides = kodi=r62122.ce0bfc65020
 	provides = kodi-x11
 	provides = kodi-wayland
 	provides = kodi-gbm
@@ -155,7 +151,7 @@ pkgname = kodi-nexus-git-eventclients
 	pkgdesc = Kodi Event Clients (Nexus branch)
 	optdepends = kodi: local machine eventclient use
 	optdepends = python: most eventclients are implemented in python
-	provides = kodi-eventclients=r62102.f960b3749f3
+	provides = kodi-eventclients=r62122.ce0bfc65020
 	conflicts = kodi-eventclients
 
 pkgname = kodi-nexus-git-tools-texturepacker
@@ -164,11 +160,11 @@ pkgname = kodi-nexus-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r62102.f960b3749f3
+	provides = kodi-tools-texturepacker=r62122.ce0bfc65020
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-nexus-git-dev
 	pkgdesc = Kodi dev files (Nexus branch)
 	depends = kodi-nexus-git
-	provides = kodi-nexus-dev=r62102.f960b3749f3
+	provides = kodi-nexus-dev=r62122.ce0bfc65020
 	conflicts = kodi-nexus-dev
diff --git a/0001-flatbuffers-use-23.3.3-to-fix-build-with-gcc13.patch b/0001-flatbuffers-use-23.3.3-to-fix-build-with-gcc13.patch
new file mode 100644
index 000000000000..416bc1bd8d1c
--- /dev/null
+++ b/0001-flatbuffers-use-23.3.3-to-fix-build-with-gcc13.patch
@@ -0,0 +1,38 @@
+Subject: [PATCH] flatbuffers: use 23.3.3 to fix build with gcc13
+
+---
+ tools/depends/native/flatbuffers/Makefile            | 4 ++--
+ tools/depends/target/flatbuffers/FLATBUFFERS-VERSION | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tools/depends/native/flatbuffers/Makefile b/tools/depends/native/flatbuffers/Makefile
+index 6911d4c..2d55d7e 100644
+--- a/tools/depends/native/flatbuffers/Makefile
++++ b/tools/depends/native/flatbuffers/Makefile
+@@ -5,10 +5,10 @@ DEPS =../../Makefile.include Makefile ../../download-files.include
+ 
+ # lib name, version
+ LIBNAME=flatbuffers
+-VERSION=2.0.0
++VERSION=23.3.3
+ SOURCE=$(LIBNAME)-$(VERSION)
+ ARCHIVE=$(SOURCE).tar.gz
+-SHA512=26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
++SHA512=4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0
+ include ../../download-files.include
+ 
+ APP=$(PLATFORM)/build-cmake/flatc
+diff --git a/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION b/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION
+index 4d05761..5ccaa80 100644
+--- a/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION
++++ b/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION
+@@ -1,4 +1,4 @@
+ LIBNAME=flatbuffers
+-VERSION=2.0.0
++VERSION=23.3.3
+ ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+-SHA512=26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
++SHA512=4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0
+-- 
+2.41.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 2ff9b0fde96c..77c0a1d26d7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _clangbuild=
 
 pkgbase=kodi-nexus-git
 pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r62102.f960b3749f3
+pkgver=r62122.ce0bfc65020
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -80,9 +80,7 @@ source=(
   "https://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
   cheat-sse-build.patch
-  gcc13.patch
-  https://github.com/xbmc/xbmc/commit/28ed2221.patch
-  https://github.com/xbmc/xbmc/commit/023717ed.patch
+  0001-flatbuffers-use-23.3.3-to-fix-build-with-gcc13.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -104,9 +102,7 @@ b2sums=('SKIP'
         'be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66'
         '1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61'
         '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
-        'cae6c719106d57102e54b8e21f29f32fc3b9453e16c4fc2ad6dbe64cc6dc550da149e75cd8c26a446cefae44d5c52a95a3c073ad2d42296650d9c68704da8abd'
-        'a83e294a5e179c0b3d2d378db115af03aacff3e24c2a90a0485413225178cc175efb083047b90c8231c3435b22f859477939febe963092fb03f1f4ebcb7a5934'
-        'e60221f70947838cc3ffce9c848d109fc108cda616306b860330def5d1b3adca01a6d8f3e9afdde9283432cf843d8b7af2fd7693c2ff21cb3548625c651058b9')
+        'd24ddcde4e78fea147e326e1b0257d5a7bcda45cd918f1c4d30d150cf83208662b2f9bded61a482ce1afca479d995ac029556b5b88330e53faa30878f8752331')
 
 pkgver() {
   cd "$_gitname"
@@ -119,11 +115,11 @@ prepare() {
 
   cd "$_gitname"
 
+  rm -rf system/certs # remove not needed cacert
+
   [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
-  patch -p1 -i ../28ed2221.patch # Fix build with GCC 13
-  patch -p1 -i ../023717ed.patch # Fix build with GCC 13
-  patch -p1 -i ../gcc13.patch # Fix build with GCC 13
-  
+  patch -p1 -i ../0001-flatbuffers-use-23.3.3-to-fix-build-with-gcc13.patch
+
   if [[ -n "$_clangbuild" ]]; then
     msg "Building with clang"
     export CC=clang CXX=clang++
@@ -159,6 +155,7 @@ build() {
     -DENABLE_VDPAU=ON
     -DENABLE_XSLT=ON
     -DENABLE_LIRCCLIENT=ON
+    -DENABLE_INTERNAL_RapidJSON=OFF
     -DENABLE_INTERNAL_FFMPEG=ON
     -DENABLE_INTERNAL_CROSSGUID=ON
     -DENABLE_INTERNAL_FSTRCMP=ON
diff --git a/gcc13.patch b/gcc13.patch
deleted file mode 100644
index 0d5c25441e8c..000000000000
--- a/gcc13.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-From 3e9ca53755d14417ec0f426193f63593a4ee988f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
-Date: Sat, 6 May 2023 00:24:06 +0200
-Subject: [PATCH 1/8] IDecoder: Add missing cstdint include for gcc>=13
-
----
- tools/depends/native/TexturePacker/src/decoder/IDecoder.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/depends/native/TexturePacker/src/decoder/IDecoder.h b/tools/depends/native/TexturePacker/src/decoder/IDecoder.h
-index 3279c55a1c13f..5bc06f2f96b43 100644
---- a/tools/depends/native/TexturePacker/src/decoder/IDecoder.h
-+++ b/tools/depends/native/TexturePacker/src/decoder/IDecoder.h
-@@ -20,6 +20,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-
-From d72b5b8c5e1e1f3976996930d664a4149f80c87b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
-Date: Sat, 6 May 2023 00:26:44 +0200
-Subject: [PATCH 2/8] [depends][crossguid] Patch for compatibility with gcc>=13
-
----
- cmake/modules/FindCrossGUID.cmake                      |  3 ++-
- .../target/crossguid/003-add-cstdint-include.patch     | 10 ++++++++++
- tools/depends/target/crossguid/Makefile                |  1 +
- 3 files changed, 13 insertions(+), 1 deletion(-)
- create mode 100644 tools/depends/target/crossguid/003-add-cstdint-include.patch
-
-diff --git a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake
-index d68948a9e0650..4aceb84dfcd49 100644
---- a/cmake/modules/FindCrossGUID.cmake
-+++ b/cmake/modules/FindCrossGUID.cmake
-@@ -29,7 +29,8 @@ if(ENABLE_INTERNAL_CROSSGUID)
-   endif()
- 
-   set(patches "${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/001-fix-unused-function.patch"
--              "${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/002-disable-Wall-error.patch")
-+              "${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/002-disable-Wall-error.patch"
-+              "${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/003-add-cstdint-include.patch")
- 
-   generate_patchcommand("${patches}")
- 
-diff --git a/tools/depends/target/crossguid/003-add-cstdint-include.patch b/tools/depends/target/crossguid/003-add-cstdint-include.patch
-new file mode 100644
-index 0000000000000..9a710d835a99c
---- /dev/null
-+++ b/tools/depends/target/crossguid/003-add-cstdint-include.patch
-@@ -0,0 +1,10 @@
-+--- a/include/crossguid/guid.hpp
-++++ b/include/crossguid/guid.hpp
-+@@ -36,6 +36,7 @@ THE SOFTWARE.
-+ #include <string_view>
-+ #include <utility>
-+ #include <iomanip>
-++#include <cstdint>
-+ 
-+ #define BEGIN_XG_NAMESPACE namespace xg {
-+ #define END_XG_NAMESPACE }
-diff --git a/tools/depends/target/crossguid/Makefile b/tools/depends/target/crossguid/Makefile
-index 2138ede9d3049..da01c39e25d45 100644
---- a/tools/depends/target/crossguid/Makefile
-+++ b/tools/depends/target/crossguid/Makefile
-@@ -47,6 +47,7 @@ endif
- 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- 	cd $(PLATFORM); patch -p1 -i ../001-fix-unused-function.patch
- 	cd $(PLATFORM); patch -p1 -i ../002-disable-Wall-error.patch
-+	cd $(PLATFORM); patch -p1 -i ../003-add-cstdint-include.patch
- 	cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) ..
- 
- .installed-$(PLATFORM): $(PLATFORM)
-
-From 9a1b8e1a92d6269ab383d0845b92d0d001873194 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
-Date: Sat, 6 May 2023 01:16:17 +0200
-Subject: [PATCH 3/8] [depends][flatbuffers] Update to 23.3.3
-
----
- tools/depends/native/flatbuffers/Makefile            | 4 ++--
- tools/depends/target/flatbuffers/FLATBUFFERS-VERSION | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tools/depends/native/flatbuffers/Makefile b/tools/depends/native/flatbuffers/Makefile
-index 6911d4c78641a..2d55d7e5830cd 100644
---- a/tools/depends/native/flatbuffers/Makefile
-+++ b/tools/depends/native/flatbuffers/Makefile
-@@ -5,10 +5,10 @@ DEPS =../../Makefile.include Makefile ../../download-files.include
- 
- # lib name, version
- LIBNAME=flatbuffers
--VERSION=2.0.0
-+VERSION=23.3.3
- SOURCE=$(LIBNAME)-$(VERSION)
- ARCHIVE=$(SOURCE).tar.gz
--SHA512=26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
-+SHA512=4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0
- include ../../download-files.include
- 
- APP=$(PLATFORM)/build-cmake/flatc
-diff --git a/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION b/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION
-index 4d05761cfa4b5..5ccaa80c2d668 100644
---- a/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION
-+++ b/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION
-@@ -1,4 +1,4 @@
- LIBNAME=flatbuffers
--VERSION=2.0.0
-+VERSION=23.3.3
- ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
--SHA512=26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
-+SHA512=4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0
-
-From c98cd6995b03b99ddedc266dfebd040324aed08b Mon Sep 17 00:00:00 2001
-From: Lukas Rusak <lorusak@gmail.com>
-Date: Fri, 5 May 2023 16:14:16 -0700
-Subject: [PATCH 4/8] Observable: remove virtual keyword as it's never
- overriden
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-/home/lukas/Documents/git/xbmc/xbmc/utils/Observer.h:51:23: warning: ‘virtual Observable& Observable::operator=(const Observable&)’ was hidden [-Woverloaded-virtual=]
-   51 |   virtual Observable &operator=(const Observable &observable);
-      |                       ^~~~~~~~
-
-Signed-off-by: Lukas Rusak <lorusak@gmail.com>
----
- xbmc/utils/Observer.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/utils/Observer.h b/xbmc/utils/Observer.h
-index 71adddd5b3651..49c9b3c2ab092 100644
---- a/xbmc/utils/Observer.h
-+++ b/xbmc/utils/Observer.h
-@@ -48,7 +48,7 @@ class Observable
- public:
-   Observable() = default;
-   virtual ~Observable() = default;
--  virtual Observable &operator=(const Observable &observable);
-+  Observable& operator=(const Observable& observable);
- 
-   /*!
-    * @brief Register an observer.
-
-From fce0bcf4e203cc6cac0d91974c669b7459250eb0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
-Date: Sat, 6 May 2023 15:25:25 +0200
-Subject: [PATCH 5/8] [CMake][FlatBuffers][FlatC] Make it build with our old
- build servers
-
-Suppresses errors like these:
-
-.../binary_annotator.cpp:196:28: error: 'value' is unavailable: introduced in macOS 10.14
-  return root_table_offset.value();
-                           ^
-.../include/c++/v1/optional:944:33: note: 'value' has been explicitly marked unavailable here
-    constexpr value_type const& value() const&
-                                ^
----
- cmake/modules/FindFlatBuffers.cmake      | 6 ++++++
- cmake/modules/buildtools/FindFlatC.cmake | 6 ++++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/cmake/modules/FindFlatBuffers.cmake b/cmake/modules/FindFlatBuffers.cmake
-index fffac4fae7390..e4d8b0c65188d 100644
---- a/cmake/modules/FindFlatBuffers.cmake
-+++ b/cmake/modules/FindFlatBuffers.cmake
-@@ -31,6 +31,12 @@ if(ENABLE_INTERNAL_FLATBUFFERS)
-                  "${EXTRA_ARGS}")
-   set(BUILD_BYPRODUCTS ${DEPENDS_PATH}/include/flatbuffers/flatbuffers.h)
- 
-+  # Make it build with older XCode, remove once new build servers are in place
-+  # Fixes "error: 'value' is unavailable: introduced in macOS 10.14"
-+  if(APPLE)
-+    list(APPEND CMAKE_ARGS -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")
-+  endif()
-+
-   BUILD_DEP_TARGET()
- else()
-   find_path(FLATBUFFERS_INCLUDE_DIR NAMES flatbuffers/flatbuffers.h)
-diff --git a/cmake/modules/buildtools/FindFlatC.cmake b/cmake/modules/buildtools/FindFlatC.cmake
-index e42c81463542f..b6feae664c3ce 100644
---- a/cmake/modules/buildtools/FindFlatC.cmake
-+++ b/cmake/modules/buildtools/FindFlatC.cmake
-@@ -65,6 +65,12 @@ if(NOT TARGET flatbuffers::flatc)
-       set(WIN_DISABLE_PROJECT_FLAGS 1)
-     endif()
- 
-+    # Make it build with older XCode, remove once new build servers are in place
-+    # Fixes "error: 'value' is unavailable: introduced in macOS 10.14"
-+    if(APPLE)
-+      list(APPEND CMAKE_ARGS -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")
-+    endif()
-+
-     set(FLATBUFFERS_FLATC_EXECUTABLE ${INSTALL_DIR}/flatc CACHE INTERNAL "FlatBuffer compiler")
- 
-     set(BUILD_NAME flatc)
-
-From c3f457170a2b34c0d3b7d96e1fe6c796b7a8f08d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
-Date: Sat, 6 May 2023 18:11:36 +0200
-Subject: [PATCH 6/8] [CMake][FlatC] Don't look for local flatc if
- ENABLE_INTERNAL_FLATBUFFERS in enabled
-
-The internal headers and external flatc may not be compatible.
----
- cmake/modules/buildtools/FindFlatC.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/buildtools/FindFlatC.cmake b/cmake/modules/buildtools/FindFlatC.cmake
-index b6feae664c3ce..b0849d59137c2 100644
---- a/cmake/modules/buildtools/FindFlatC.cmake
-+++ b/cmake/modules/buildtools/FindFlatC.cmake
-@@ -19,7 +19,7 @@ if(NOT TARGET flatbuffers::flatc)
-   find_program(FLATBUFFERS_FLATC_EXECUTABLE NAMES flatc
-                                             HINTS ${NATIVEPREFIX}/bin)
- 
--  if(FLATBUFFERS_FLATC_EXECUTABLE)
-+  if(FLATBUFFERS_FLATC_EXECUTABLE AND NOT ENABLE_INTERNAL_FLATBUFFERS)
-     execute_process(COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" --version
-                     OUTPUT_VARIABLE FLATBUFFERS_FLATC_VERSION
-                     OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-From 56973329e871569f1b50e80a48ce2bcc3d8baaff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
-Date: Sat, 6 May 2023 21:27:01 +0200
-Subject: [PATCH 7/8] !!!TEMP!!! I'm becoming desperate...
-
----
- cmake/modules/FindFlatBuffers.cmake      | 6 ++++++
- cmake/modules/buildtools/FindFlatC.cmake | 8 +++++++-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindFlatBuffers.cmake b/cmake/modules/FindFlatBuffers.cmake
-index e4d8b0c65188d..5a95fdcc10f85 100644
---- a/cmake/modules/FindFlatBuffers.cmake
-+++ b/cmake/modules/FindFlatBuffers.cmake
-@@ -34,7 +34,13 @@ if(ENABLE_INTERNAL_FLATBUFFERS)
-   # Make it build with older XCode, remove once new build servers are in place
-   # Fixes "error: 'value' is unavailable: introduced in macOS 10.14"
-   if(APPLE)
-+    message(STATUS "I'm in the correct branch")
-+    message(STATUS "CMAKE_ARGS before: ${CMAKE_ARGS}")
-     list(APPEND CMAKE_ARGS -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")
-+    message(STATUS "CMAKE_ARGS after: ${CMAKE_ARGS}")
-+  else()
-+    message(STATUS "I'm in the wrong branch")
-+    message(STATUS "I'm in the wrong branch. CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME} CMAKE_HOST_SYSTEM_NAME: ${CMAKE_HOST_SYSTEM_NAME}")
-   endif()
- 
-   BUILD_DEP_TARGET()
-diff --git a/cmake/modules/buildtools/FindFlatC.cmake b/cmake/modules/buildtools/FindFlatC.cmake
-index b0849d59137c2..6bebc755d56a9 100644
---- a/cmake/modules/buildtools/FindFlatC.cmake
-+++ b/cmake/modules/buildtools/FindFlatC.cmake
-@@ -67,8 +67,14 @@ if(NOT TARGET flatbuffers::flatc)
- 
-     # Make it build with older XCode, remove once new build servers are in place
-     # Fixes "error: 'value' is unavailable: introduced in macOS 10.14"
--    if(APPLE)
-+    if(LINUX)
-+      message(STATUS "I'm in the correct branch")
-+      message(STATUS "CMAKE_ARGS before: ${CMAKE_ARGS}")
-       list(APPEND CMAKE_ARGS -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")
-+      message(STATUS "CMAKE_ARGS after: ${CMAKE_ARGS}")
-+    else()
-+      message(STATUS "I'm in the wrong branch")
-+      message(STATUS "I'm in the wrong branch. CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME} CMAKE_HOST_SYSTEM_NAME: ${CMAKE_HOST_SYSTEM_NAME}")
-     endif()
- 
-     set(FLATBUFFERS_FLATC_EXECUTABLE ${INSTALL_DIR}/flatc CACHE INTERNAL "FlatBuffer compiler")
-
-From cb6c8bbb20096afca2b456221fa5e036b01f272a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
-Date: Sat, 6 May 2023 22:10:26 +0200
-Subject: [PATCH 8/8] fixup! !!!TEMP!!! I'm becoming desperate...
-
----
- cmake/modules/buildtools/FindFlatC.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/buildtools/FindFlatC.cmake b/cmake/modules/buildtools/FindFlatC.cmake
-index 6bebc755d56a9..0ccbc04dc9924 100644
---- a/cmake/modules/buildtools/FindFlatC.cmake
-+++ b/cmake/modules/buildtools/FindFlatC.cmake
-@@ -67,7 +67,7 @@ if(NOT TARGET flatbuffers::flatc)
- 
-     # Make it build with older XCode, remove once new build servers are in place
-     # Fixes "error: 'value' is unavailable: introduced in macOS 10.14"
--    if(LINUX)
-+    if(APPLE)
-       message(STATUS "I'm in the correct branch")
-       message(STATUS "CMAKE_ARGS before: ${CMAKE_ARGS}")
-       list(APPEND CMAKE_ARGS -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")
author	graysky	2023-06-04 08:15:21 -0400
committer	graysky	2023-06-04 08:15:21 -0400
commit	0188fb3c82254900c7f13efe62beec11b5428a7f (patch)
tree	9e35b7073e00eb1d6702298b6f7e5b080a58baa2
parent	9e2bbf44184f9ebdfc9851bb22f765ad909ccfbd (diff)
download	aur-0188fb3c82254900c7f13efe62beec11b5428a7f.tar.gz