Update to r62306.d527c92cc39-1

3 files changed, 32 insertions, 136 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4fc3c22d1e19..2d44b07db226 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-nexus-git
-	pkgver = r62252.b8fafb0a41d
+	pkgver = r62306.d527c92cc39
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -14,7 +14,7 @@ pkgbase = kodi-nexus-git
 	makedepends = glew
 	makedepends = gperf
 	makedepends = hicolor-icon-theme
-	makedepends = java-environment<21
+	makedepends = java-runtime<21
 	makedepends = fmt
 	makedepends = libaacs
 	makedepends = libass
@@ -79,7 +79,6 @@ pkgbase = kodi-nexus-git
 	source = https://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
 	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 = kodi-fmt-10.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/23571.patch
 	source = flatb23.patch::https://github.com/xbmc/xbmc/commit/35be40daa39965a9ea5b3569eb7d515e6a14da5d.patch
 	source = 0001-ffmpeg-fix-build-with-binutils-update.patch
@@ -92,13 +91,12 @@ pkgbase = kodi-nexus-git
 	b2sums = a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e
 	b2sums = be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66
 	b2sums = 1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61
-	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
 	b2sums = 45e4a4fc3ddd3bc2329b42a3f72c3e4fae1adb93e9d4b945a5aba3a70bee3ddce416fcb19061ad2263d1f247da5fc7143944408fb5294b762e45ac2f0981c06a
 	b2sums = bdc249920685a3738f872d9ea19a5c46b244d437d30b7dad958dcf33b5bfb88782c1a73bd15dcb1c26f0b643f1e4711775621a2753a1b5668efacc2144fd06e6
 	b2sums = 7e15afcc0cc7f529e6c491c985968bc53be413424b890e4eab2ce8e3d0f21b08347698e660e0f4f0cc50c5279f052be7a2d84d5351509d34193066d797a44130
 
 pkgname = kodi-nexus-git
-	pkgdesc = A software media player and entertainment hub for digital media (gl renderer, Nexus branch)
+	pkgdesc = A software media player and entertainment hub for digital media (Nexus branch, gles renderer)
 	depends = bluez-libs
 	depends = curl
 	depends = dav1d
@@ -143,67 +141,12 @@ pkgname = kodi-nexus-git
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = pipewire: PipeWire support
 	optdepends = upower: Display battery level
-	provides = kodi-common=r62252.b8fafb0a41d
-	provides = kodi-x11
-	provides = kodi-wayland
-	provides = kodi-gbm
-	conflicts = kodi-gles
-	conflicts = kodi-x11
-	conflicts = kodi-wayland
-	conflicts = kodi-gbm
-
-pkgname = kodi-nexus-git-gles
-	pkgdesc = A software media player and entertainment hub for digital media (gles renderer, Nexus branch)
-	depends = bluez-libs
-	depends = curl
-	depends = dav1d
-	depends = desktop-file-utils
-	depends = hicolor-icon-theme
-	depends = fmt
-	depends = lcms2
-	depends = libass
-	depends = libbluray
-	depends = libcdio
-	depends = libcec
-	depends = libmicrohttpd
-	depends = libnfs
-	depends = libplist
-	depends = libpulse
-	depends = libva
-	depends = libvdpau
-	depends = libxslt
-	depends = lirc
-	depends = lzo
-	depends = mariadb-libs
-	depends = mesa
-	depends = libpipewire
-	depends = python-pillow
-	depends = python-pycryptodomex
-	depends = python-simplejson
-	depends = shairplay
-	depends = smbclient
-	depends = sndio
-	depends = spdlog
-	depends = sqlite
-	depends = taglib
-	depends = tinyxml
-	depends = libxrandr
-	depends = libxkbcommon
-	depends = waylandpp
-	depends = libinput
-	depends = pcre
-	optdepends = afpfs-ng: Apple shares support
-	optdepends = bluez: Blutooth support
-	optdepends = python-pybluez: Bluetooth support
-	optdepends = pulseaudio: PulseAudio support
-	optdepends = pipewire: PipeWire support
-	optdepends = upower: Display battery level
-	provides = kodi-common=r62252.b8fafb0a41d
-	provides = kodi=r62252.b8fafb0a41d
+	provides = kodi-common=r62306.d527c92cc39
 	provides = kodi-x11
 	provides = kodi-wayland
 	provides = kodi-gbm
 	conflicts = kodi
+	conflicts = kodi-gles
 	conflicts = kodi-x11
 	conflicts = kodi-wayland
 	conflicts = kodi-gbm
@@ -212,7 +155,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=r62252.b8fafb0a41d
+	provides = kodi-eventclients=r62306.d527c92cc39
 	conflicts = kodi-eventclients
 
 pkgname = kodi-nexus-git-tools-texturepacker
@@ -221,11 +164,11 @@ pkgname = kodi-nexus-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r62252.b8fafb0a41d
+	provides = kodi-tools-texturepacker=r62306.d527c92cc39
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-nexus-git-dev
 	pkgdesc = Kodi dev files (Nexus branch)
 	depends = kodi-nexus-git
-	provides = kodi-nexus-dev=r62252.b8fafb0a41d
+	provides = kodi-nexus-dev=r62306.d527c92cc39
 	conflicts = kodi-nexus-dev
diff --git a/PKGBUILD b/PKGBUILD
index 3803f32e74dc..5902870056d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,16 +20,19 @@
 # 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-nexus-git
-pkgname=("$pkgbase" "$pkgbase-gles" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r62252.b8fafb0a41d
+pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
+pkgver=r62306.d527c92cc39
 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-environment<21' 'fmt' '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'
@@ -48,7 +51,6 @@ options=(!lto)
 
 _gitname=xbmc
 _codename=Nexus
-_sse_workaround=1
 
 # Found on their respective github release pages. One can check them against
 # what is pulled down when not specifying them in the cmake step.
@@ -77,7 +79,6 @@ source=(
   "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"
-  cheat-sse-build.patch
   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
@@ -101,7 +102,6 @@ b2sums=('SKIP'
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
         'be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66'
         '1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61'
-        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
         '45e4a4fc3ddd3bc2329b42a3f72c3e4fae1adb93e9d4b945a5aba3a70bee3ddce416fcb19061ad2263d1f247da5fc7143944408fb5294b762e45ac2f0981c06a'
         'bdc249920685a3738f872d9ea19a5c46b244d437d30b7dad958dcf33b5bfb88782c1a73bd15dcb1c26f0b643f1e4711775621a2753a1b5668efacc2144fd06e6'
         '7e15afcc0cc7f529e6c491c985968bc53be413424b890e4eab2ce8e3d0f21b08347698e660e0f4f0cc50c5279f052be7a2d84d5351509d34193066d797a44130')
@@ -112,14 +112,12 @@ pkgver() {
 }
 
 prepare() {
-  [[ -d "$srcdir/kodi-build" ]] && rm -rf "$srcdir/kodi-build"
+  [[ -d kodi-build ]] && rm -rf kodi-build
   mkdir "$srcdir/kodi-build"
-  [[ -d "$srcdir/kodi-build-gles" ]] && rm -rf "$srcdir/kodi-build-gles"
-  mkdir "$srcdir/kodi-build-gles"
 
   cd "$_gitname"
 
-  [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
+  rm -rf system/certs # remove not needed cacert
 
   patch -p1 -i ../0001-ffmpeg-fix-build-with-binutils-update.patch
   patch -p1 -i ../flatb23.patch
@@ -131,13 +129,21 @@ prepare() {
 }
 
 build() {
+  cd "$srcdir/kodi-build"
 
   _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
@@ -172,26 +178,21 @@ build() {
     -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=$_renderer
   )
 
   # https://github.com/google/flatbuffers/issues/7404
   CXXFLAGS+=' -Wno-error=restrict'
 
   echo "building kodi"
-  cd "$srcdir/kodi-build"
-  cmake "${_args[@]}" -DAPP_RENDER_SYSTEM=gl ../"$_gitname"
-  make
-
-  echo "building kodi-gles"
-  cd "$srcdir/kodi-build-gles"
-  cmake "${_args[@]}" -DAPP_RENDER_SYSTEM=gles ../"$_gitname"
+  cmake "${_args[@]}" ../"$_gitname"
   make
 }
 
 # kodi
 # components: kodi
 package_kodi-nexus-git() {
-  pkgdesc="A software media player and entertainment hub for digital media (gl renderer, Nexus 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' 'fmt'
     'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec' 'libmicrohttpd' 'libnfs'
@@ -212,7 +213,7 @@ package_kodi-nexus-git() {
     'upower: Display battery level'
   )
   provides=("kodi-common=${pkgver}" 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
-  conflicts=('kodi-gles' 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
+  conflicts=('kodi' 'kodi-gles' 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
 
   _components=(
     'kodi'
@@ -229,48 +230,11 @@ package_kodi-nexus-git() {
   # avoid error <general>: GetDirectory - Error getting /usr/lib/kodi/addons
   # https://bugs.archlinux.org/task/77366
   mkdir -p "$pkgdir"/usr/lib/kodi/addons
-}
-# kodi
-# components: kodi
-package_kodi-nexus-git-gles() {
-  pkgdesc="A software media player and entertainment hub for digital media (gles renderer, Nexus branch)"
-  depends=(
-    'bluez-libs' 'curl' 'dav1d' 'desktop-file-utils' 'hicolor-icon-theme' 'fmt'
-    'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec' 'libmicrohttpd' 'libnfs'
-    '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')
-
-  optdepends=(
-    'afpfs-ng: Apple shares support'
-    'bluez: Blutooth support'
-    'python-pybluez: Bluetooth support'
-    'pulseaudio: PulseAudio support'
-    'pipewire: PipeWire support'
-    'upower: Display battery level'
-  )
-  provides=("kodi-common=${pkgver}" "kodi=${pkgver}" 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
-  conflicts=('kodi' 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
-
-  _components=(
-    'kodi'
-    'kodi-bin'
-  )
 
-  cd kodi-build-gles
-  for _cmp in ${_components[@]}; do
-  DESTDIR="$pkgdir" /usr/bin/cmake \
-    -DCMAKE_INSTALL_COMPONENT="$_cmp" \
-     -P cmake_install.cmake
-  done
+  # 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
 
-  # avoid error <general>: GetDirectory - Error getting /usr/lib/kodi/addons
-  # https://bugs.archlinux.org/task/77366
-  mkdir -p "$pkgdir"/usr/lib/kodi/addons
 }
 
 # kodi-eventclients
diff --git a/cheat-sse-build.patch b/cheat-sse-build.patch
deleted file mode 100644
index df356d0fdb4a..000000000000
--- a/cheat-sse-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/modules/FindSSE.cmake	2017-08-22 09:29:22.000000000 +0200
-+++ b/cmake/modules/FindSSE.cmake	2018-01-06 19:36:32.716303559 +0100
-@@ -4,7 +4,7 @@
- 
- if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    if(CPU MATCHES "x86_64" OR CPU MATCHES "i.86")
--     exec_program(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO)
-+     set(CPUINFO "sse sse2 pni ssse3 sse4_1 sse4_2 avx avx2")
- 
-      string(REGEX REPLACE "^.*(sse).*$" "\\1" _SSE_THERE ${CPUINFO})
-      string(COMPARE EQUAL "sse" "${_SSE_THERE}" _SSE_TRUE)