From 710d85f4a9170fa23f7a6a4568bccd4ecc311ed6 Mon Sep 17 00:00:00 2001
From: graysky <graysky@archlinux.us>
Date: Sun, 17 Feb 2019 21:02:07 -0500
Subject: [PATCH] alarm/kodi-rbp to 18.1-1 (#1670)

---
 ...-fix.passthrough.for.hifiberry_digi.patch} |  0
 alarm/kodi-rbp/PKGBUILD                       | 19 ++++++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)
 rename alarm/kodi-rbp/{hifiberry_digi.patch => 01-fix.passthrough.for.hifiberry_digi.patch} (100%)

diff --git a/alarm/kodi-rbp/hifiberry_digi.patch b/alarm/kodi-rbp/01-fix.passthrough.for.hifiberry_digi.patch
similarity index 100%
rename from alarm/kodi-rbp/hifiberry_digi.patch
rename to alarm/kodi-rbp/01-fix.passthrough.for.hifiberry_digi.patch
diff --git a/alarm/kodi-rbp/PKGBUILD b/alarm/kodi-rbp/PKGBUILD
index 9f518064a..fb19589f2 100644
--- a/alarm/kodi-rbp/PKGBUILD
+++ b/alarm/kodi-rbp/PKGBUILD
@@ -11,10 +11,10 @@ _prefix=/usr
 
 pkgbase=kodi-rbp
 pkgname=('kodi-rbp' 'kodi-rbp-eventclients' 'kodi-rbp-tools-texturepacker' 'kodi-rbp-dev')
-pkgver=18.0
-pkgrel=2
+pkgver=18.1
+pkgrel=1
 _codename=Leia
-_tag="18.0-$_codename"
+_tag="18.1-$_codename"
 _ffmpeg_version="4.0.3-$_codename-RC5"
 _libdvdcss_version="1.4.2-$_codename-Beta-5"
 _libdvdnav_version="6.0.0-$_codename-Alpha-3"
@@ -42,6 +42,7 @@ source=("https://github.com/popcornmix/xbmc/archive/newclock5_$_tag.tar.gz"
   '99-kodi.rules'
   'polkit.rules'
   '00-fix.building.with.mariadb.patch::https://github.com/wsnipex/xbmc/commit/cd20c8eb8a0394db1f028b118c4ca9b91b7e746a.patch'
+  '01-fix.passthrough.for.hifiberry_digi.patch'
   "ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
   "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"
@@ -50,7 +51,6 @@ source=("https://github.com/popcornmix/xbmc/archive/newclock5_$_tag.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"
-  "hifiberry_digi.patch"
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -62,12 +62,13 @@ noextract=(
   "fstrcmp-$_fstrcmp_version.tar.gz"
   "flatbuffers-$_flatbuffers_version.tar.gz"
 )
-sha256sums=('9c056808eecc7dd2e72fffd3f3412d83c60fe3742bc0d96f16f9abdfc55c8012'
+sha256sums=('22a46122a8e6f5a6507baae8e6be6beaf5a4203358478c94da525187b0681b99'
             '6eded8b5f52808d5ffa77de546fbf799a255dde2473540e8a8bd46daa6f753d9'
             'fe7a1ab2a6e2bf00f756c76545a338d2763003052764d722d492b06b1bc05f5e'
             'b31570f95654434b01fd8531612fbb6be77cbc1c519dd60f92feae26eb160f3d'
             '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96'
             '849daf1d5b081ef6d0e428bbc7d448799fc43a8ac9e79cd7513de0eb5a91b0bb'
+            'a7aa50c25ff53b87c79c9235d9a3de62ccffcab4faa15b489ae2d8be9b0c0b35'
             '9a971662e44353c120f2ccf87655571998956e699a2dd800ec708b8b928a53c8'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
@@ -75,9 +76,7 @@ sha256sums=('9c056808eecc7dd2e72fffd3f3412d83c60fe3742bc0d96f16f9abdfc55c8012'
             '73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44'
             '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10'
             'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
-            '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3'
-            'a7aa50c25ff53b87c79c9235d9a3de62ccffcab4faa15b489ae2d8be9b0c0b35'
-)
+            '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3')
 prepare() {
   cd "xbmc-newclock5_$_tag"
 
@@ -85,9 +84,7 @@ prepare() {
   mkdir $srcdir/kodi-build
 
   patch -Np1 -i ../00-fix.building.with.mariadb.patch
-
-  # fix for lack of passthrough audio with hifiberry-digi+ card
-  patch -Np1 -i "$srcdir/hifiberry_digi.patch"
+  patch -Np1 -i ../01-fix.passthrough.for.hifiberry_digi.patch
 }
 
 build() {