alarm/kodi-rpi-git: sync syntax with other pkgs

alarm/kodi-rpi-git/PKGBUILD

@@ -1,4 +1,5 @@
 # Contributor graysky <graysky AT archlinux DOT org>
+# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com>
 # Contributor Kevin Mihelich <kevin@archlinuxarm.org>
 # Contributor BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 # Contributor Oleg Rakhmanov <oleg [at] archlinuxarm [dot] com>
@@ -11,7 +12,10 @@ buildarch=12
 _prefix=/usr
 
 pkgbase=kodi-rpi-git
-pkgname=('kodi-rpi-git' 'kodi-rpi-git-eventclients' 'kodi-rpi-git-tools-texturepacker' 'kodi-rpi-git-dev')
+pkgname=(
+  'kodi-rpi-git'
+  'kodi-rpi-git-eventclients' 'kodi-rpi-git-tools-texturepacker' 'kodi-rpi-git-dev'
+)
 
 _commitnumber=57039
 _commit=46685b10c76b523eac8f38119c4705b618213235
@@ -22,17 +26,17 @@ arch=('armv7h' 'aarch64')
 url="https://github.com/popcornmix/xbmc/tree/gbm"
 license=('GPL2')
 makedepends=(
-  'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'glew'
+  'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'git' 'glew'
   'gperf' 'hicolor-icon-theme' 'java-runtime' 'libaacs' 'libass'
   'libbluray' 'libcdio' 'libcec-rpi' 'libgl' 'mariadb-libs' 'libmicrohttpd'
   'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libva'
-  'libvdpau' 'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm'
+  'libva-vdpau-driver' 'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm'
-  'python-pycryptodomex' 'python-pillow' 'python-pybluez' 'python-simplejson'
+  'python-pycryptodomex' 'python-pillow' 'python-pybluez'
-  'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
+  'python-simplejson' 'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
-  'upower' 'giflib' 'rapidjson' 'ghostscript' 'git' 'meson' 'gtest'
+  'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest' 'graphviz'
   'libinput' 'libxkbcommon' 'linux-raspberrypi4-headers'
 )
-_codename=Leia
+_codename=Matrix
 # Found on their respective github release pages. One can check them against
 # what is pulled down when not specifying them in the cmake step.
 # $CHROOT/build/kodi-git/src/kodi-build/build/download
@@ -44,31 +48,31 @@ _codename=Leia
 #
 # fmt and crossguid can be found http://mirrors.kodi.tv/build-deps/sources/
 #
-_libdvdcss_version="1.4.2-$_codename-Beta-5"
+_libdvdcss_version="1.4.2-Leia-Beta-5"
-_libdvdnav_version="6.0.0-$_codename-Alpha-3"
+_libdvdnav_version="6.0.0-Leia-Alpha-3"
-_libdvdread_version="6.0.0-$_codename-Alpha-3"
+_libdvdread_version="6.0.0-Leia-Alpha-3"
-_ffmpeg_version="4.3.1-Matrix-Beta1"
+_ffmpeg_version="4.3.1-$_codename-Beta1"
 _fmt_version="6.1.2"
+_spdlog_version="1.5.0"
 _crossguid_version="8f399e8bd4"
 _fstrcmp_version="0.7.D001"
 _flatbuffers_version="1.11.0"
-_spdlog_version="1.5.0"
+_name="gbm_matrix-$pkgver-$_codename"
 source=(
-  # popcornmix gbm branch
   "xbmc-$pkgver.tar.gz::https://github.com/popcornmix/xbmc/archive/$_commit.tar.gz"
-  kodi.service
-  99-kodi.rules
-  polkit.rules
-  kodi.config.txt
   "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/spdlog-$_spdlog_version.tar.gz"
+  kodi.service
+  99-kodi.rules
+  polkit.rules
+  kodi.config.txt
   sysusers.conf
   tmpfiles.conf
   use-mcpu-avoiding-march-and-mtune.patch
@@ -81,34 +85,35 @@ noextract=(
   "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"
-  "spdlog-$_spdlog_version.tar.gz"
 )
 sha256sums=('1df796866093cc8cb69ebc0d14190e5e74686fa6cb0b3a841d2410f3aadc7d4c'
-            'bb8f0c0fd03ff7c13c0503f2c96f86772d8bbd05adbc97d5b383f603a98456c0'
-            '61a0648d4a5086f560ceb4e020f82472d00b99398f2cacba94fad3e96c4c362a'
-            '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f'
-            'c89b58f6eba6e71a909ceeac1d65f5ab68c5ea711c34659cdbe980d11b353233'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
             'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
             '0b209a9b15f2335e516bf2ad1249fffc6b55425145f17c9674dc430abf6a67ad'
             '1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365'
+            'b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a'
             '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10'
             'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
             '1789b97e790da8f2cb5ff827d15580878c8629fd889f5f038d7524dca43eacc9'
-            'b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a'
+            'bb8f0c0fd03ff7c13c0503f2c96f86772d8bbd05adbc97d5b383f603a98456c0'
+            '61a0648d4a5086f560ceb4e020f82472d00b99398f2cacba94fad3e96c4c362a'
+            '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f'
+            'c89b58f6eba6e71a909ceeac1d65f5ab68c5ea711c34659cdbe980d11b353233'
             'f521b98232e5035b7cada46cf03975b8d753e93d0802bf22913fceed769f9d96'
             '9c5e79ed8719cd032a3b17dac585aeff28a198e37af1da9af68ef1b86bab4d18'
             '16d6c79ff3a3d3653f21d77a36326a0335c8cec49a9c06dbc2de0ed143e50a9f'
             '76eafede11af936bb554932b2be71ce91d4bf1c07107d847500ebbf3ff7d7245')
-prepare() {
-  cd "xbmc-$_commit"
 
+prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
-  mkdir "$srcdir"/kodi-build
+  mkdir "$srcdir/kodi-build"
+
+  cd "xbmc-$_commit"
 
   # put patch in source tree so kodi build system can pick it up
   cp ../use-mcpu-avoiding-march-and-mtune.patch \
@@ -119,7 +124,8 @@ prepare() {
 }
 
 build() {
-  cd kodi-build
+  cd "$srcdir/kodi-build"
+
   # the build system expects to find /usr/include/drm/drm_fourcc.h however we provide this
   # in /usr/lib/modules/x.y.z-1-ARCH/build/include/uapi/drm/drm_fourcc.h
   #
@@ -151,58 +157,61 @@ build() {
   fi
 
   _args=(
+    -DCORE_PLATFORM_NAME="x11 gbm"
+    -DAPP_RENDER_SYSTEM=gles
     -DCMAKE_INSTALL_PREFIX=/usr
     -DCMAKE_INSTALL_LIBDIR=/usr/lib
     -DVERBOSE=ON
     -DUSE_LTO=OFF
+    -DENABLE_LDGOLD=OFF
     -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 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"
+    -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"
-    -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz"
   )
 
   cmake "${_args[@]}" ../"xbmc-$_commit"
   make
-  make preinstall
 }
 
 package_kodi-rpi-git() {
   pkgdesc="Media player and entertainment hub for Raspberry Pi 3/4/400, gbm fork"
   depends=(
-    'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python-pycryptodomex'
+    'bluez-libs' 'curl' 'desktop-file-utils' 'hicolor-icon-theme' 'lcms2'
-    'python-pillow' 'python-simplejson' 'xorg-xdpyinfo'
+    'libass' 'libbluray' 'libcdio' 'libcec-rpi' 'libmicrohttpd' 'libnfs' 'libplist'
-    'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec-rpi'
+    'libpulse' 'libva' 'libxslt' 'lirc' 'mariadb-libs' 'mesa'
-    'libinput' 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon'
+    'python-pillow' 'python-pycryptodomex' 'python-simplejson' 'shairplay'
-    'libxslt' 'lirc' 'mariadb-libs' 'smbclient' 'taglib'
+    'smbclient' 'taglib' 'tinyxml'
-    'tinyxml' 'polkit' 'linux>=5.4.35' 'dav1d' 'shairplay' 'libplist'
+    'libinput' 'libxkbcommon' 'polkit' 'linux>=5.4.35' 'dav1d'
   )
   optdepends=(
     'afpfs-ng: Apple shares support'
     'bluez: Blutooth support'
     'python-pybluez: Bluetooth support'
-    'lsb-release: log distro information in crashlog'
+    'pulseaudio: PulseAudio support'
+    'upower: Display battery level'
   )
   install='kodi.install'
-  provides=('xbmc' "kodi=${pkgver}")
+  provides=('xbmc' "kodi=${pkgver}" "kodi-common=${pkgver}")
   conflicts=('xbmc' 'kodi' 'arm-mem-git' 'shairplay-git' 'kodi-rbp4-git' 'kodi-rpi' 'kodi-rpi-legacy')
   replaces=('xbmc-rbp-git' 'kodi-rbp4-git')
-  _components=('kodi' 'kodi-bin')
 
-  export PATH="$srcdir/path:$PATH"
+  _components=(
+    'kodi'
+    'kodi-bin'
+  )
 
   cd kodi-build
   for _cmp in ${_components[@]}; do
@@ -211,8 +220,6 @@ package_kodi-rpi-git() {
      -P cmake_install.cmake
   done
 
-  cd "$pkgdir"
-
   # fix permissions necessary for accelerated video playback
   install -Dm0644 "$srcdir/99-kodi.rules" "$pkgdir/usr/lib/udev/rules.d/99-kodi.rules"
 
@@ -232,9 +239,12 @@ package_kodi-rpi-git() {
 package_kodi-rpi-git-eventclients() {
   pkgdesc="Kodi Event Clients for Raspberry Pi 3/4/400, gbm fork"
   provides=("kodi-eventclients=${pkgver}")
-  replaces=('kodi-eventclients-rbp4-git')
   conflicts=('kodi-eventclients' 'kodi-eventclients-rbp4-git' 'kodi-rpi-eventclients' 'kodi-rpi-legacy-eventclients')
-  optdepends=('python: most eventclients are implemented in python')
+  replaces=('kodi-eventclients-rbp4-git')
+  optdepends=(
+    'kodi: local machine eventclient use'
+    'python: most eventclients are implemented in python'
+  )
 
   _components=(
     'kodi-eventclients-common'
@@ -242,8 +252,6 @@ package_kodi-rpi-git-eventclients() {
     'kodi-eventclients-kodi-send'
   )
 
-  export PATH="$srcdir/path:$PATH"
-
   cd kodi-build
   for _cmp in ${_components[@]}; do
     DESTDIR="$pkgdir" /usr/bin/cmake \
@@ -255,11 +263,12 @@ package_kodi-rpi-git-eventclients() {
 package_kodi-rpi-git-tools-texturepacker() {
   pkgdesc="Kodi Texturepacker Tool for Raspberry Pi 3/4/400, gbm fork"
   depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo')
-  replaces=('kodi-tools-texturepacker-rbp4-git')
   conflicts=('kodi-tools-texturepacker' 'kodi-tools-texturepacker-rbp4-git' 'kodi-rpi-tools-texturepacker' 'kodi-rpi-legacy-tools-texturepacker')
-  _components=('kodi-tools-texturepacker')
+  replaces=('kodi-tools-texturepacker-rbp4-git')
 
-  export PATH="$srcdir/path:$PATH"
+  _components=(
+    'kodi-tools-texturepacker'
+  )
 
   cd kodi-build
   for _cmp in ${_components[@]}; do
@@ -272,21 +281,14 @@ package_kodi-rpi-git-tools-texturepacker() {
 package_kodi-rpi-git-dev() {
   pkgdesc="Kodi dev files for Raspberry Pi 3/4/400, gbm fork"
   depends=('kodi')
-  replaces=('kodi-dev-rbp4-git')
   conflicts=('kodi-dev-rbp4-git' 'kodi-rpi-dev' 'kodi-rpi-legacy-dev')
+  replaces=('kodi-dev-rbp4-git')
   provides=("kodi-dev=${pkgver}")
 
-  _components=('kodi-addon-dev'
+  _components=(
-    'kodi-audio-dev'
+    'kodi-addon-dev'
     'kodi-eventclients-dev'
-    'kodi-game-dev'
+  )
-    'kodi-inputstream-dev'
-    'kodi-peripheral-dev'
-    'kodi-pvr-dev'
-    'kodi-screensaver-dev'
-    'kodi-visualization-dev')
-
-  export PATH="$srcdir/path:$PATH"
 
   cd kodi-build
   for _cmp in ${_components[@]}; do

alarm/kodi-rpi/PKGBUILD

@@ -161,7 +161,6 @@ build() {
     -DENABLE_EVENTCLIENTS=ON
     -DENABLE_INTERNAL_FFMPEG=ON
     -DENABLE_INTERNAL_FMT=ON
-    -DENABLE_INTERNAL_SPDLOG=ON
     -DENABLE_INTERNAL_CROSSGUID=ON
     -DENABLE_INTERNAL_FSTRCMP=ON
     -DENABLE_INTERNAL_FLATBUFFERS=ON