Update to r64763.ffbc0975418-1

2 files changed, 122 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d53ca3256393..c7b6ce816d2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-git
-	pkgver = r64676.37865f4ab50
+	pkgver = r64763.ffbc0975418
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -94,7 +94,7 @@ pkgbase = kodi-git
 	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
 
 pkgname = kodi-git
-	pkgdesc = A software media player and entertainment hub for digital media (master branch)
+	pkgdesc = A software media player and entertainment hub for digital media (gl renderer, master branch)
 	depends = bluez-libs
 	depends = curl
 	depends = dav1d
@@ -114,6 +114,64 @@ pkgname = kodi-git
 	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
+	depends = libdisplay-info
+	depends = tinyxml2
+	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=r64763.ffbc0975418
+	provides = kodi-x11
+	provides = kodi-wayland
+	provides = kodi-gbm
+	conflicts = kodi-gles
+	conflicts = kodi-x11
+	conflicts = kodi-wayland
+	conflicts = kodi-gbm
+
+pkgname = kodi-git-gles
+	pkgdesc = A software media player and entertainment hub for digital media (gles renderer, master 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
@@ -140,7 +198,8 @@ pkgname = kodi-git
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = pipewire: PipeWire support
 	optdepends = upower: Display battery level
-	provides = kodi=r64676.37865f4ab50
+	provides = kodi-common=r64763.ffbc0975418
+	provides = kodi=r64763.ffbc0975418
 	provides = kodi-x11
 	provides = kodi-wayland
 	provides = kodi-gbm
@@ -153,8 +212,6 @@ pkgname = kodi-git-eventclients
 	pkgdesc = Kodi Event Clients (master branch)
 	optdepends = kodi: local machine eventclient use
 	optdepends = python: most eventclients are implemented in python
-	provides = kodi-eventclients=r64676.37865f4ab50
-	conflicts = kodi-eventclients
 
 pkgname = kodi-git-tools-texturepacker
 	pkgdesc = Kodi Texturepacker tool (master branch)
@@ -162,11 +219,7 @@ pkgname = kodi-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r64676.37865f4ab50
-	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-git-dev
 	pkgdesc = Kodi dev files (master branch)
 	depends = kodi-git
-	provides = kodi-dev=r64676.37865f4ab50
-	conflicts = kodi-dev
diff --git a/PKGBUILD b/PKGBUILD
index 12e349434c69..e8cf19bda6ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,8 +21,8 @@
 _clangbuild=
 
 pkgbase=kodi-git
-pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r64676.37865f4ab50
+pkgname=("$pkgbase" "$pkgbase-gles" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
+pkgver=r64763.ffbc0975418
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -106,8 +106,10 @@ pkgver() {
 }
 
 prepare() {
-  [[ -d kodi-build ]] && rm -rf kodi-build
+  [[ -d "$srcdir/kodi-build" ]] && rm -rf "$srcdir/kodi-build"
   mkdir "$srcdir/kodi-build"
+  [[ -d "$srcdir/kodi-build-gles" ]] && rm -rf "$srcdir/kodi-build-gles"
+  mkdir "$srcdir/kodi-build-gles"
 
   cd "$_gitname"
 
@@ -122,7 +124,6 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/kodi-build"
 
   _args=(
     -DCMAKE_BUILD_TYPE=Release
@@ -164,26 +165,31 @@ 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=gl
   )
 
   # https://github.com/google/flatbuffers/issues/7404
   CXXFLAGS+=' -Wno-error=restrict'
 
   echo "building kodi"
-  cmake "${_args[@]}" ../"$_gitname"
+  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"
   make
 }
 
 # kodi
 # components: kodi
 package_kodi-git() {
-  pkgdesc="A software media player and entertainment hub for digital media (master branch)"
+  pkgdesc="A software media player and entertainment hub for digital media (gl renderer, master 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' 'mariadb-libs'
-    'mesa' 'libpipewire' 'python-pillow' 'python-pycryptodomex'
+    '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' 'libdisplay-info' 'tinyxml2'
@@ -198,8 +204,8 @@ package_kodi-git() {
     'pipewire: PipeWire support'
     'upower: Display battery level'
   )
-  provides=("kodi=${pkgver}" 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
-  conflicts=('kodi' 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
+  provides=("kodi-common=${pkgver}" 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
+  conflicts=('kodi-gles' 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
 
   _components=(
     'kodi'
@@ -218,12 +224,53 @@ package_kodi-git() {
   mkdir -p "$pkgdir"/usr/lib/kodi/addons
 }
 
+# kodi-gles
+# components: kodi
+package_kodi-git-gles() {
+  pkgdesc="A software media player and entertainment hub for digital media (gles renderer, master 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' 'libdisplay-info' 'tinyxml2'
+  )
+  [[ -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
+
+  # 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
 # components: kodi-eventclients-common kodi-eventclients-ps3 kodi-eventclients-kodi-send
 package_kodi-git-eventclients() {
   pkgdesc="Kodi Event Clients (master branch)"
-  provides=("kodi-eventclients=${pkgver}")
-  conflicts=('kodi-eventclients')
   optdepends=(
     'kodi: local machine eventclient use'
     'python: most eventclients are implemented in python'
@@ -247,8 +294,6 @@ package_kodi-git-eventclients() {
 # components: kodi-tools-texturepacker
 package_kodi-git-tools-texturepacker() {
   pkgdesc="Kodi Texturepacker tool (master branch)"
-  provides=("kodi-tools-texturepacker=${pkgver}")
-  conflicts=('kodi-tools-texturepacker')
   depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo')
 
   _components=(
@@ -268,8 +313,6 @@ package_kodi-git-tools-texturepacker() {
 package_kodi-git-dev() {
   pkgdesc="Kodi dev files (master branch)"
   depends=('kodi-git')
-  provides=("kodi-dev=${pkgver}")
-  conflicts=('kodi-dev')
 
   _components=(
     'kodi-addon-dev'