Update to r56848.9aafe587c95-1

1 files changed, 42 insertions, 67 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 23a9892079a3..b62c95918c22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,7 @@ pkgname=(
   "$pkgbase" "$pkgbase-x11" "$pkgbase-wayland" "$pkgbase-gbm"
   "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev"
 )
-pkgver=r56710.cb9d28f8471
+pkgver=r56848.9aafe587c95
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -128,31 +128,37 @@ build() {
   # export CFLAGS+=" -march=native"
   # export CXXFLAGS="${CFLAGS}"
 
+  _args=(
+      -DCMAKE_INSTALL_PREFIX=/usr
+      -DCMAKE_INSTALL_LIBDIR=/usr/lib
+      -DENABLE_EVENTCLIENTS=ON
+      -DENABLE_INTERNAL_FFMPEG=ON
+      -DENABLE_INTERNAL_FMT=ON
+      -DENABLE_INTERNAL_CROSSGUID=ON
+      -DENABLE_INTERNAL_FSTRCMP=ON
+      -DENABLE_INTERNAL_FLATBUFFERS=ON
+      -DENABLE_INTERNAL_SPDLOG=ON
+      -DENABLE_MYSQLCLIENT=ON
+      -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz"
+      -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"
+      -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz"
+      -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz"
+      -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz"
+      -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz"
+    )
+
   if [[ "$_build_x11" -eq 1 ]]; then
     echo "building kodi-x11"
     cd "$srcdir/kodi-build-x11"
-    cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-      -DENABLE_EVENTCLIENTS=ON \
-      -DENABLE_INTERNAL_FFMPEG=ON \
-      -DENABLE_INTERNAL_FMT=ON \
-      -DENABLE_INTERNAL_CROSSGUID=ON \
-      -DENABLE_INTERNAL_FSTRCMP=ON \
-      -DENABLE_INTERNAL_FLATBUFFERS=ON \
-      -DENABLE_INTERNAL_SPDLOG=ON \
-      -DENABLE_MYSQLCLIENT=ON \
-      -DCORE_PLATFORM_NAME=x11 \
-      -DAPP_RENDER_SYSTEM=gl \
-      -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" \
-      -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" \
-      -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" \
-      -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" \
-      -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" \
-      -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz" \
-      ../xbmc
+    _args+=(
+      -DCORE_PLATFORM_NAME=x11
+      -DAPP_RENDER_SYSTEM=gl
+    )
+
+    cmake "${_args[@]}" ../xbmc
     make
     make preinstall
   fi
@@ -160,27 +166,12 @@ build() {
   if [[ "$_build_wayland" -eq 1 ]]; then
     echo "building kodi-wayland"
     cd "$srcdir/kodi-build-wayland"
-    cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-      -DENABLE_EVENTCLIENTS=ON \
-      -DENABLE_INTERNAL_FFMPEG=ON \
-      -DENABLE_INTERNAL_FMT=ON \
-      -DENABLE_INTERNAL_CROSSGUID=ON \
-      -DENABLE_INTERNAL_FSTRCMP=ON \
-      -DENABLE_INTERNAL_FLATBUFFERS=ON \
-      -DENABLE_INTERNAL_SPDLOG=ON \
-      -DCORE_PLATFORM_NAME=wayland \
-      -DAPP_RENDER_SYSTEM=gl \
-      -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" \
-      -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" \
-      -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" \
-      -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" \
-      -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" \
-      -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz" \
-      ../xbmc
+    _args+=(
+      -DCORE_PLATFORM_NAME=wayland
+      -DAPP_RENDER_SYSTEM=gl
+    )
+
+    cmake "${_args[@]}" ../xbmc
     make
     make preinstall
   fi
@@ -188,27 +179,11 @@ build() {
   if [[ "$_build_gbm" -eq 1 ]]; then
     echo "building kodi-gbm"
     cd "$srcdir/kodi-build-gbm"
-    cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-      -DENABLE_EVENTCLIENTS=ON \
-      -DENABLE_INTERNAL_FFMPEG=ON \
-      -DENABLE_INTERNAL_FMT=ON \
-      -DENABLE_INTERNAL_CROSSGUID=ON \
-      -DENABLE_INTERNAL_FSTRCMP=ON \
-      -DENABLE_INTERNAL_FLATBUFFERS=ON \
-      -DENABLE_INTERNAL_SPDLOG=ON \
-      -DCORE_PLATFORM_NAME=gbm \
-      -DAPP_RENDER_SYSTEM=gles \
-      -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" \
-      -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" \
-      -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" \
-      -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" \
-      -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" \
-      -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz" \
-      ../xbmc
+    _args+=(
+      -DCORE_PLATFORM_NAME=gbm
+      -DAPP_RENDER_SYSTEM=gles
+    )
+    cmake "${_args[@]}" ../xbmc
     make
     make preinstall
   fi
@@ -265,7 +240,7 @@ package_kodi-git-x11() {
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libvdpau' 'libxrandr'
-    'libxslt' 'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib'
+    'libxslt' 'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib' 'libplist'
     'tinyxml' "$pkgbase"
   )
 
@@ -302,7 +277,7 @@ package_kodi-git-gbm() {
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libinput' 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon'
-    'libxslt' 'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib'
+    'libxslt' 'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib' 'libplist'
     'tinyxml' "$pkgbase"
   )