alarm/kodi-rbp-git to 18.0b3.20181002-1 (#1628)

alarm/kodi-rbp-git/PKGBUILD

@@ -12,15 +12,15 @@ _prefix=/usr
 pkgbase=kodi-rbp-git
 _suffix=rbp-git
 pkgname=("kodi-$_suffix" "kodi-eventclients-$_suffix" "kodi-tools-texturepacker-$_suffix" "kodi-dev-$_suffix")
-pkgver=18.0b2.20180909
-pkgrel=2
-_commit=7868a27c6a83eafd3bf505172b59481868d940fb
+pkgver=18.0b3.20181002
+pkgrel=1
+_commit=5718827da2a8aea8acf8d9265689705031d73289
 _short=${_commit::+7}
 _codename=Leia
-_tag="18.0b2-$_codename"
+_tag="18.0b3-$_codename"
 _rtype=Alpha
 _ffmpeg_version="4.0.2-$_codename-$_rtype"3
-_libdvdcss_version="1.4.1-$_codename-$_rtype"-3
+_libdvdcss_version="1.4.1-$_codename-Beta"-3
 _libdvdnav_version="6.0.0-$_codename-$_rtype"-3
 _libdvdread_version="6.0.0-$_codename-$_rtype"-3
 _fmt_version="3.0.1"
@@ -33,14 +33,14 @@ license=('GPL2')
 makedepends=(
   'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'doxygen'
   'gperf' 'hicolor-icon-theme' 'jasper' 'java-environment' 'libaacs' 'libass'
-  'libbluray' 'libcdio' 'libmariadbclient' 'libmicrohttpd' 'groff'
+  'libbluray-kodi-rbp' 'libcdio' 'libmariadbclient' 'libmicrohttpd' 'groff'
   'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libssh' 'libcec-rpi'
   'libxrandr' 'libxslt' 'lirc' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow'
   'python2-pybluez' 'python2-simplejson' 'raspberrypi-firmware' 'rtmpdump'
   'shairplay' 'smbclient' 'speex' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower'
   'yajl' 'zip' 'giflib' 'rapidjson' 'polkit' 'libinput' 'libxkbcommon' 'ghostscript'
 )
-source=("xbmc-$_tag.tar.gz::https://api.github.com/repos/xbmc/xbmc/tarball/$_commit"
+source=("xbmc-newclock5_$_tag-$_short.tar.gz::https://api.github.com/repos/popcornmix/xbmc/tarball/$_commit"
   'kodi.service'
   '99-kodi.rules'
   'polkit.rules'
@@ -64,13 +64,13 @@ noextract=(
   "fstrcmp-$_fstrcmp_version.tar.gz"
   "flatbuffers-$_flatbuffers_version.tar.gz"
 )
-sha256sums=('fd36de783dbf37fa21714ec9d080cc0495eff5018f3d37cf376131a6cd0cf767'
-            '8523f3e9362181c9728ea226b2f82ef85bda1e4ea050f70ddb33f6d2d96ad999'
+sha256sums=('dc41e3c08834d84f6bb0cee9998d8f928d348f6d77ce701f627dea78054bb46a'
+            '856de10e157f44baf97140b896d9e8d8ddd6c8a422c92a5ca03a0e68444d7583'
             'b31570f95654434b01fd8531612fbb6be77cbc1c519dd60f92feae26eb160f3d'
             '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96'
             '0b9d951911a8576c26dec8a31f394282677e48afff49b9579448121d27b8509e'
             '0e4980abac7b886e0eb5f4157941947be3c10d616a19bd311dc2f9fd2eb6a631'
-            '6af3d4f60e5af2c11ebe402b530c07c8878df1a6cf19372e16c92848d69419a5'
+            '579aa102ac14ff4a21aa4081fe47f8cb3941002a37ee96286d3737afd79e80d9'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
             'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
             'dce62ab75a161dd4353a98364feb166d35e7eea382169d59d9ce842c49c55bad'
@@ -79,11 +79,13 @@ sha256sums=('fd36de783dbf37fa21714ec9d080cc0495eff5018f3d37cf376131a6cd0cf767'
             '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3')
 
 prepare() {
-  cd "xbmc-xbmc-$_short"
+  cd "popcornmix-xbmc-$_short"
+
+  patch -Np1 -i ../hifiberry_digi.patch
 
-  patch -Np1 -i "$srcdir/hifiberry_digi.patch"
   [[ -d kodi-build ]] && rm -rf kodi-build
   mkdir $srcdir/kodi-build
+
 }
 
 build() {
@@ -111,22 +113,20 @@ build() {
     -DWITH_CPU="$_CPU" \
     -DENABLE_EVENTCLIENTS=ON \
     -DENABLE_OPENGL=OFF \
-    -DENABLE_VAAPI=OFF \
-    -DENABLE_VDPAU=OFF \
+    -DENABLE_INTERNAL_FFMPEG=ON \
+    -DENABLE_INTERNAL_FMT=ON \
+    -DENABLE_INTERNAL_CROSSGUID=ON \
+    -DENABLE_INTERNAL_FSTRCMP=ON \
+    -DENABLE_INTERNAL_FLATBUFFERS=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" \
-    -DENABLE_INTERNAL_FFMPEG=ON \
     -DFMT_URL="$srcdir/fmt-$_fmt_version.tar.gz" \
-    -DENABLE_INTERNAL_FMT=ON \
     -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" \
-    -DENABLE_INTERNAL_CROSSGUID=ON \
     -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" \
-    -DENABLE_INTERNAL_FSTRCMP=ON \
     -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" \
-    -DENABLE_INTERNAL_FLATBUFFERS=ON \
-    ../"xbmc-xbmc-$_short"
+    ../"popcornmix-xbmc-$_short"
   make
   make preinstall
 }

alarm/kodi-rbp-git/kodi.install

@@ -8,8 +8,8 @@ post_install() {
   chown -R kodi:kodi var/lib/kodi
 
   echo "****************************************************************"
-  echo "If kodi systemd service does not start, try adding a udev rule:"
-  echo "echo 'SUBSYSTEM==\"vchiq\",GROUP=\"video\",MODE=\"0660\"' > /etc/udev/rules.d/10-vchiq-permissions.rules"
+  echo "Recommended GPU memory for 1080p x265 content is at least 320 MB"
+  echo "Add the following to /boot/config.txt: gpu_mem=320"
   echo "****************************************************************"
 }
 

alarm/kodi-rbp-git/kodi.service

@@ -8,6 +8,7 @@ Group = kodi
 Type = simple
 ExecStart = /usr/bin/kodi-standalone
 Restart = on-failure
+KillMode = mixed
 
 [Install]
 WantedBy = multi-user.target