stable git build should not include codename

1 files changed, 96 insertions, 71 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0e1e42448ed0..c95a8b04a1f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,22 +20,26 @@
 # set this to anything to build with clang rather than with gcc
 _clangbuild=
 
+# define the applicaton render system, valid values are either 'gl' or 'gles'
+_renderer=gles
+
 pkgbase=kodi-stable-git
 pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r57747.813a194c4e8
+pkgver=r62310.f1caa0dc88b
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
 makedepends=(
   'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'git' 'glew'
-  'gperf' 'hicolor-icon-theme' 'java-runtime' 'libaacs' 'libass'
+  'gperf' 'hicolor-icon-theme' 'java-runtime<21' 'fmt' 'libaacs' 'libass'
   'libbluray' 'libcdio' 'libcec' 'libgl' 'mariadb-libs' 'libmicrohttpd'
   'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libva'
   'libva-vdpau-driver' 'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm'
-  'python-pycryptodomex' 'python-pillow' 'python-pybluez'
-  'python-simplejson' 'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
-  'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest' 'graphviz'
+  'pipewire' 'python-pycryptodomex' 'python-pillow' 'python-pybluez'
+  'python-simplejson' 'shairplay' 'smbclient' 'sndio' 'spdlog' 'taglib'
+  'tinyxml' 'swig' 'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest'
+  'graphviz' 'pcre'
   # wayland
   'wayland-protocols' 'waylandpp' 'libxkbcommon'
   # gbm
@@ -45,9 +49,8 @@ options=(!lto)
 
 [[ -n "$_clangbuild" ]] && makedepends+=('clang' 'lld' 'llvm')
 
-_gitname='xbmc'
-_codename=Matrix
-_sse_workaround=1
+_gitname=xbmc
+_codename=Nexus
 
 # Found on their respective github release pages. One can check them against
 # what is pulled down when not specifying them in the cmake step.
@@ -58,61 +61,58 @@ _sse_workaround=1
 # https://github.com/xbmc/libdvdnav/tags
 # https://github.com/xbmc/libdvdread/tags
 #
-# fmt and crossguid can be found http://mirrors.kodi.tv/build-deps/sources/
-#
-_libdvdcss_version="1.4.2-Leia-Beta-5"
-_libdvdnav_version="6.0.0-Leia-Alpha-3"
-_libdvdread_version="6.0.0-Leia-Alpha-3"
-_ffmpeg_version="4.3.2-$_codename-19.2"
-_fmt_version="6.1.2"
-_spdlog_version="1.5.0"
-_crossguid_version="8f399e8bd4"
+_libdvdcss_version="1.4.3-Next-Nexus-Alpha2-2"
+_libdvdnav_version="6.1.1-Next-Nexus-Alpha2-2"
+_libdvdread_version="6.1.3-Next-Nexus-Alpha2-2"
+_ffmpeg_version="4.4.1-Nexus-Alpha1"
+_crossguid_version="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
 _fstrcmp_version="0.7.D001"
-_flatbuffers_version="1.12.0"
-_libudfread_version="1.1.0"
-
+_flatbuffers_version="23.3.3"
+_libudfread_version="1.1.2"
 source=(
   "git+https://github.com/xbmc/xbmc.git#branch=$_codename"
   "libdvdcss-$_libdvdcss_version.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version.tar.gz"
   "libdvdnav-$_libdvdnav_version.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version.tar.gz"
   "libdvdread-$_libdvdread_version.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_version.tar.gz"
   "ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
-  "http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz"
-  "http://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_version.tar.gz"
-  "http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz"
-  "http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
-  "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
-  "http://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
-  cheat-sse-build.patch
-  build-fix-for-dav1d-1.0.0.patch
-  0001-add-dav1d-patch-to-build-system.patch
+  "https://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz"
+  "https://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
+  "https://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
+  "https://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
+  kodi-fmt-10.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/23571.patch
+  flatb23.patch::https://github.com/xbmc/xbmc/commit/35be40daa39965a9ea5b3569eb7d515e6a14da5d.patch
+  0001-ffmpeg-fix-build-with-binutils-update.patch
+  https://github.com/xbmc/xbmc/pull/23227.patch
+  https://github.com/xbmc/xbmc/commit/d2022ce1.patch
+  https://github.com/xbmc/xbmc/commit/6f5dff4b.patch
+  https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/24577.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
   "libdvdnav-$_libdvdnav_version.tar.gz"
   "libdvdread-$_libdvdread_version.tar.gz"
   "ffmpeg-$_ffmpeg_version.tar.gz"
-  "fmt-$_fmt_version.tar.gz"
-  "spdlog-$_spdlog_version.tar.gz"
   "crossguid-$_crossguid_version.tar.gz"
   "fstrcmp-$_fstrcmp_version.tar.gz"
   "flatbuffers-$_flatbuffers_version.tar.gz"
   "libudfread-$_libudfread_version.tar.gz"
 )
 b2sums=('SKIP'
-        '283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da'
-        '7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355'
-        '0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c'
-        '60299be16d73fb689b698f5b322d9cd38093894222070d2f1c28a37477a338405938959440a3f5646d946f3c2287072fdfa582b644a36f3a23e7d637b51113fc'
-        '36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d'
-        'bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28'
-        'e6f1f495adf541102e3b5ac11dfd14b770a52e23ef9d613bc6204f6493ff4df4da9ba290ad6c3a7e5c7fcf159cafdf355bfe668a4ddceb4329df934c65966d19'
+        '2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c'
+        'db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c'
+        'c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1'
+        '51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6'
+        '0f78a8ab5a420297f666b3b8156d499a9141ec25c049d4d2bb2ba594dc585abe211a149b83c605cce4f5530207231a065d5f3a87a0c969781de8c6381afa2527'
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
-        '441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6'
-        'e7fab72ebecb372c54af77b4907e53f77a5503af66e129bd2083ef7f4209ebfbed163ffd552e32b7181829664fff6ab82a1cdf00c81dc6f3cc6bfc8fa7242f6e'
-        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
-        '6928d0fb1f4cb2609dee87c7078e02cecc37ddef263485b47be0ae5c281be67b403b39c95ea370c6b6667e1eceb1c7e6fb83ec9b04acd0bdbe4abec17fb84385'
-        'f1769867f7bb998e9705cfe7709072436bc4824775ad6ccd151bb240798413a92c4a5c92452f5b781a439660a3d9a0846ebf6fefebdfa50b95f076ffdc6ff55e')
+        'be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66'
+        '1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61'
+        '45e4a4fc3ddd3bc2329b42a3f72c3e4fae1adb93e9d4b945a5aba3a70bee3ddce416fcb19061ad2263d1f247da5fc7143944408fb5294b762e45ac2f0981c06a'
+        'bdc249920685a3738f872d9ea19a5c46b244d437d30b7dad958dcf33b5bfb88782c1a73bd15dcb1c26f0b643f1e4711775621a2753a1b5668efacc2144fd06e6'
+        '7e15afcc0cc7f529e6c491c985968bc53be413424b890e4eab2ce8e3d0f21b08347698e660e0f4f0cc50c5279f052be7a2d84d5351509d34193066d797a44130'
+        '0e205a9d4a371776cbeaacb88b5a915986d6e2b7b2d32d55e672902a6c6c6530573bbcd20557819f61a12e17931d43788e8508becd26778bcc151bd0838183d5'
+        'ee94696b2e7cbdf904e271e205206a60c77571e167563a882fdeb4f0df49f53c9f38489148c697d8e694087f7fc2cf157f89c4787a4c519fac3736f976bfc854'
+        '4338568d343e48bbd68855faf1c3affc90598bbed1b2f213053fbe1df81ec3ff4e463ee24f9a971e928df7b1ff47f6dd723790fb70eb65388bc3e0adcacb9ad4'
+        '85c21d0c3e74a6c3184308c06deb0b523e721037ce8bd5e8fe3d84dc017bad63b8ef78ffdc9c9c8f24b9deb2732dd604c09f21979a900a60633c1c879e5e744b')
 
 pkgver() {
   cd "$_gitname"
@@ -125,13 +125,14 @@ prepare() {
 
   cd "$_gitname"
 
-  # make build system patch ffmpeg for dav1d 1.0.0
-  patch -p1 -i ../0001-add-dav1d-patch-to-build-system.patch
-
-  # put patch in source tree so kodi build system can pick it up
-  cp ../build-fix-for-dav1d-1.0.0.patch tools/depends/target/ffmpeg
+  rm -rf system/certs # remove not needed cacert
 
-  [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i ../cheat-sse-build.patch
+  patch -p1 -i ../0001-ffmpeg-fix-build-with-binutils-update.patch
+  patch -p1 -i ../flatb23.patch
+  patch -p1 -i ../23227.patch
+  patch -p1 -i ../d2022ce1.patch
+  patch -p1 -i ../6f5dff4b.patch
+  patch -p1 -i ../24577.patch
 
   if [[ -n "$_clangbuild" ]]; then
     msg "Building with clang"
@@ -142,24 +143,41 @@ prepare() {
 build() {
   cd "$srcdir/kodi-build"
 
-  # fix build breakage introduced with gcc-12.1.0-1
-  export CFLAGS+=" -Wno-error"
-  export CXXFLAGS="${CFLAGS}"
-
   _args=(
     -DCMAKE_BUILD_TYPE=Release
     -DCMAKE_INSTALL_PREFIX=/usr
     -DCMAKE_INSTALL_LIBDIR=/usr/lib
+    -DENABLE_SSE=ON
+    -DENABLE_SSE2=ON
+    -DENABLE_SSE3=ON
+    -DENABLE_SSSE3=ON
+    -DENABLE_SSE4_1=ON
+    -DENABLE_SSE4_2=ON
+    -DENABLE_AVX=ON
+    -DENABLE_AVX2=ON
     -DUSE_LTO=$(nproc)
-    -DVERBOSE=ON
     -DENABLE_LDGOLD=OFF
+    -DENABLE_AIRTUNES=ON
+    -DENABLE_AVAHI=ON
+    -DENABLE_BLURAY=ON
+    -DENABLE_CEC=ON
+    -DENABLE_DBUS=ON
+    -DENABLE_DVDCSS=ON
+    -DENABLE_EGL=ON
     -DENABLE_EVENTCLIENTS=ON
+    -DENABLE_MICROHTTPD=ON
     -DENABLE_MYSQLCLIENT=ON
+    -DENABLE_NFS=ON
+    -DENABLE_OPTICAL=ON
+    -DENABLE_SMBCLIENT=ON
+    -DENABLE_UDEV=ON
+    -DENABLE_UPNP=ON
     -DENABLE_VAAPI=ON
     -DENABLE_VDPAU=ON
+    -DENABLE_XSLT=ON
+    -DENABLE_LIRCCLIENT=ON
+    -DENABLE_INTERNAL_RapidJSON=OFF
     -DENABLE_INTERNAL_FFMPEG=ON
-    -DENABLE_INTERNAL_FMT=ON
-    -DENABLE_INTERNAL_SPDLOG=ON
     -DENABLE_INTERNAL_CROSSGUID=ON
     -DENABLE_INTERNAL_FSTRCMP=ON
     -DENABLE_INTERNAL_FLATBUFFERS=ON
@@ -168,13 +186,11 @@ build() {
     -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz"
     -Dlibdvdread_URL="$srcdir/libdvdread-$_libdvdread_version.tar.gz"
     -DFFMPEG_URL="$srcdir/ffmpeg-$_ffmpeg_version.tar.gz"
-    -DFMT_URL="$srcdir/fmt-$_fmt_version.tar.gz"
-    -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz"
     -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz"
     -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz"
     -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz"
     -DUDFREAD_URL="$srcdir/libudfread-$_libudfread_version.tar.gz"
-    -DAPP_RENDER_SYSTEM=gl
+    -DAPP_RENDER_SYSTEM=$_renderer
   )
 
   # https://github.com/google/flatbuffers/issues/7404
@@ -188,14 +204,14 @@ build() {
 # kodi
 # components: kodi
 package_kodi-stable-git() {
-  pkgdesc="A software media player and entertainment hub for digital media (Matrix branch)"
+  pkgdesc="A software media player and entertainment hub for digital media (Nexus branch, $_renderer renderer)"
   depends=(
-    'bluez-libs' 'curl' 'dav1d' 'desktop-file-utils' 'hicolor-icon-theme'
+    'bluez-libs' 'curl' 'dav1d' 'desktop-file-utils' 'hicolor-icon-theme' 'fmt'
     'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec' 'libmicrohttpd' 'libnfs'
-    'libplist' 'libpulse' 'libva' 'libvdpau' 'libxslt' 'lirc' 'mariadb-libs'
-    'mesa' 'python-pillow' 'python-pycryptodomex' 'python-simplejson'
-    'shairplay' 'smbclient' 'sqlite' 'taglib' 'tinyxml'
-    'libxrandr' 'libxkbcommon' 'waylandpp' 'libinput'
+    'libplist' 'libpulse' 'libva' 'libvdpau' 'libxslt' 'lirc' 'lzo'
+    'mariadb-libs' 'mesa' 'libpipewire' 'python-pillow' 'python-pycryptodomex'
+    'python-simplejson' 'shairplay' 'smbclient' 'sndio' 'spdlog' 'sqlite'
+    'taglib' 'tinyxml' 'libxrandr' 'libxkbcommon' 'waylandpp' 'libinput'
     'pcre'
   )
   [[ -n "$_clangbuild" ]] && depends+=('glu')
@@ -205,11 +221,11 @@ package_kodi-stable-git() {
     'bluez: Blutooth support'
     'python-pybluez: Bluetooth support'
     'pulseaudio: PulseAudio support'
+    'pipewire: PipeWire support'
     'upower: Display battery level'
   )
-  provides=("kodi=${pkgver}" 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
-  replaces=('kodi' 'kodi-x11' 'kodi-wayland' 'kodi-gbm' 'kodi-matrix-git')
-  conflicts=('kodi' 'kodi-x11' 'kodi-wayland' 'kodi-gbm' 'kodi-matrix-git')
+  provides=("kodi-common=${pkgver}" 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
+  conflicts=('kodi' 'kodi-gles' 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
 
   _components=(
     'kodi'
@@ -222,12 +238,21 @@ package_kodi-stable-git() {
     -DCMAKE_INSTALL_COMPONENT="$_cmp" \
      -P cmake_install.cmake
   done
+
+  # avoid error <general>: GetDirectory - Error getting /usr/lib/kodi/addons
+  # https://bugs.archlinux.org/task/77366
+  mkdir -p "$pkgdir"/usr/lib/kodi/addons
+
+  # https://archlinux.org/todo/use-system-ca-store/
+  mkdir -p "$pkgdir"/usr/share/kodi/system/certs
+  ln -s /etc/ssl/cert.pem "$pkgdir"/usr/share/kodi/system/certs/cacert.pem
+
 }
 
 # kodi-eventclients
 # components: kodi-eventclients-common kodi-eventclients-ps3 kodi-eventclients-kodi-send
 package_kodi-stable-git-eventclients() {
-  pkgdesc="Kodi Event Clients (Matrix branch)"
+  pkgdesc="Kodi Event Clients (Nexus branch)"
   provides=("kodi-eventclients=${pkgver}")
   conflicts=('kodi-eventclients')
   optdepends=(
@@ -252,7 +277,7 @@ package_kodi-stable-git-eventclients() {
 # kodi-tools-texturepacker
 # components: kodi-tools-texturepacker
 package_kodi-stable-git-tools-texturepacker() {
-  pkgdesc="Kodi Texturepacker tool (Matrix branch)"
+  pkgdesc="Kodi Texturepacker tool (Nexus branch)"
   provides=("kodi-tools-texturepacker=${pkgver}")
   conflicts=('kodi-tools-texturepacker')
   depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo')
@@ -272,7 +297,7 @@ package_kodi-stable-git-tools-texturepacker() {
 # kodi-dev
 # components: kodi-addon-dev kodi-eventclients-dev
 package_kodi-stable-git-dev() {
-  pkgdesc="Kodi dev files (Matrix branch)"
+  pkgdesc="Kodi dev files (Nexus branch)"
   depends=('kodi-stable-git')
   provides=("kodi-dev=${pkgver}")
   conflicts=('kodi-dev')