alarm/kodi-rbp4 to 18.8-1

alarm/kodi-rbp4/PKGBUILD

@@ -25,10 +25,10 @@ _prefix=/usr
 
 pkgbase=kodi-rbp4
 pkgname=('kodi-rbp4' 'kodi-rbp4-eventclients' 'kodi-rbp4-tools-texturepacker' 'kodi-rbp4-dev')
-pkgver=18.7.1
-pkgrel=2
+pkgver=18.8
+pkgrel=1
 _codename=Leia
-_ffmpeg_version="4.0.4-$_codename-18.4"
+_ffmpeg_version="4.2.2-Matrix-Alpha1"
 _libdvdcss_version="1.4.2-$_codename-Beta-5"
 _libdvdnav_version="6.0.0-$_codename-Alpha-3"
 _libdvdread_version="6.0.0-$_codename-Alpha-3"
@@ -69,9 +69,10 @@ source=(
   "http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
   01-fix.in-tree.ffmpeg.paths.for.makechrootpkg.hack.patch
-  18131.patch
   sysusers.conf
   tmpfiles.conf
+  # user ffmpeg
+  000-PR17300.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17300.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -83,11 +84,11 @@ noextract=(
   "fstrcmp-$_fstrcmp_version.tar.gz"
   "flatbuffers-$_flatbuffers_version.tar.gz"
 )
-sha256sums=('63f9e5e4219e5e8cad96e68d10393f6ac11d28e4b3915a6f6168340531210bff'
-            '585796d8a7f1ece32c24ff67b38885f0e3397372a4b9879eee3160a59391e333'
+sha256sums=('135d1f47223d404095b88494da091cb2588c36a5ff3f337bd083a9017fbe1c71'
+            'd5384a1450d1ba16f7f2b2db1b858ad442b7398787e046623b16547c72a94b8e'
             '8e14cf455898246d11edd4ff7f4ed11a44c729fb40c34455a5b336a90ccc1f7b'
             '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f'
-            'e11e7594af35f36ab2711252c3d6bb106908f26605498aef4a9be2d7bc001db2'
+            '0dba571f9809588cfbdc29d6a551dab4cd5736701653d9263847c9ac67bcde86'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
             'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
@@ -96,9 +97,9 @@ sha256sums=('63f9e5e4219e5e8cad96e68d10393f6ac11d28e4b3915a6f6168340531210bff'
             'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
             '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3'
             '70b4c7db8766761ca060c038c8abb36c8c678246ca6c5efbde84c58442748ef2'
-            '1bfa84c0ae99a4ed731261cb39cb347c2809ca63d0d318393bdbbee900bbf8bc'
             'f521b98232e5035b7cada46cf03975b8d753e93d0802bf22913fceed769f9d96'
-            '9c5e79ed8719cd032a3b17dac585aeff28a198e37af1da9af68ef1b86bab4d18')
+            '9c5e79ed8719cd032a3b17dac585aeff28a198e37af1da9af68ef1b86bab4d18'
+            '3aaca3630689b76e7a7f35656a4ada3fb18ecd7e3fe199634264ccf76b96c0f0')
 
 prepare() {
   # Must use MMAL headers and pc files rather than opengl ones so we copy the
@@ -130,8 +131,7 @@ prepare() {
   # Big thanks to asavah for helpful advice here and in the cmake step
   patch -Np1 -i ../01-fix.in-tree.ffmpeg.paths.for.makechrootpkg.hack.patch
 
-  # fix for libmicrohttpd 0.9.7.1
-  patch -Np1 -i ../18131.patch
+  patch -Np1 -i ../000-PR17300.patch
 }
 
 build() {
@@ -141,7 +141,7 @@ build() {
 
   # building for RPi4
   unset CFLAGS CXXFLAGS
-  export CFLAGS="-march=armv8-a+crc+simd -mtune=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard -O2 -pipe -fstack-protector-strong -fno-plt"
+  export CFLAGS=" -march=armv8-a+crc+simd -mtune=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard -O2 -pipe -fstack-protector-strong -fno-plt"
   export CXXFLAGS="${CFLAGS}"
 
   # exporting PKG_CONFIG_PATH and building with the extra lib definitions

alarm/kodi-rbp4/kodi.service

@@ -1,8 +1,7 @@
 [Unit]
 Description=Kodi standalone (GBM)
-After=systemd-user-sessions.service network.target network-online.target sound.target upower.service mysqld.service
-Requires=graphical.target
-Wants=network.target network-online.target
+After=remote-fs.target systemd-user-sessions.service network-online.target nss-lookup.target sound.target bluetooth.target polkit.service upower.service mysqld.service
+Wants=network-online.target polkit.service upower.service
 Conflicts=getty@tty1.service
 
 [Service]
@@ -14,6 +13,7 @@ Environment=WINDOWING=gbm
 ExecStart=/usr/bin/kodi-standalone
 Restart=on-abort
 StandardInput=tty
+StandardOutput=journal
 
 [Install]
-WantedBy=graphical.target
+Alias=display-manager.service