Update to 19.0b2-2

2 files changed, 65 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c25a5a539be..68a14f9de5d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kodi-devel
 	pkgver = 19.0b2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://kodi.tv
 	arch = x86_64
 	license = GPL2
@@ -131,6 +131,7 @@ pkgname = kodi-devel-x11
 	depends = python
 	depends = smbclient
 	depends = taglib
+	depends = libplist
 	depends = tinyxml
 	depends = kodi-devel
 	provides = KODI-DEVEL-BIN
@@ -186,6 +187,7 @@ pkgname = kodi-devel-gbm
 	depends = python
 	depends = smbclient
 	depends = taglib
+	depends = libplist
 	depends = tinyxml
 	depends = kodi-devel
 	provides = KODI-DEVEL-BIN
diff --git a/PKGBUILD b/PKGBUILD
index e40151e878ac..6917e8ec89a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ pkgname=(
 )
 pkgver=19.0b2
 #_major=18.7.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
@@ -135,89 +135,69 @@ prepare() {
 
 build() {
   export PATH="$srcdir/path:$PATH"
-
   ### Optionally uncomment and setup to your liking
   # export CFLAGS+=" -march=native"
   # export CXXFLAGS="${CFLAGS}"
 
-  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-$_tag"
-  make
-  make preinstall
-
-  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-$_tag"
-  make
-  make preinstall
-
-  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-$_tag"
-  make
-  make preinstall
+  _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"
+    _args+=(
+      -DCORE_PLATFORM_NAME=x11
+      -DAPP_RENDER_SYSTEM=gl
+    )
+
+    cmake "${_args[@]}" ../xbmc
+    make
+    make preinstall
+  fi
+
+  if [[ "$_build_wayland" -eq 1 ]]; then
+    echo "building kodi-wayland"
+    cd "$srcdir/kodi-build-wayland"
+    _args+=(
+      -DCORE_PLATFORM_NAME=wayland
+      -DAPP_RENDER_SYSTEM=gl
+    )
+
+    cmake "${_args[@]}" ../xbmc
+    make
+    make preinstall
+  fi
+
+  if [[ "$_build_gbm" -eq 1 ]]; then
+    echo "building kodi-gbm"
+    cd "$srcdir/kodi-build-gbm"
+    _args+=(
+      -DCORE_PLATFORM_NAME=gbm
+      -DAPP_RENDER_SYSTEM=gles
+    )
+    cmake "${_args[@]}" ../xbmc
+    make
+    make preinstall
+  fi
 }
 
 # kodi
@@ -271,7 +251,7 @@ package_kodi-devel-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"
   )
 
@@ -308,7 +288,7 @@ package_kodi-devel-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"
   )