alarm/kodi-rbp to 18.0-2 (#1667)

This commit is contained in:
Lukasz Jankowski 2019-02-16 19:16:52 +00:00 committed by Kevin Mihelich
parent 7a7120cf70
commit 6699597cb4
2 changed files with 22 additions and 3 deletions

View file

@ -12,7 +12,7 @@ _prefix=/usr
pkgbase=kodi-rbp pkgbase=kodi-rbp
pkgname=('kodi-rbp' 'kodi-rbp-eventclients' 'kodi-rbp-tools-texturepacker' 'kodi-rbp-dev') pkgname=('kodi-rbp' 'kodi-rbp-eventclients' 'kodi-rbp-tools-texturepacker' 'kodi-rbp-dev')
pkgver=18.0 pkgver=18.0
pkgrel=1 pkgrel=2
_codename=Leia _codename=Leia
_tag="18.0-$_codename" _tag="18.0-$_codename"
_ffmpeg_version="4.0.3-$_codename-RC5" _ffmpeg_version="4.0.3-$_codename-RC5"
@ -50,6 +50,7 @@ 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/crossguid-$_crossguid_version.tar.gz"
"http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_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/flatbuffers-$_flatbuffers_version.tar.gz"
"hifiberry_digi.patch"
) )
noextract=( noextract=(
"libdvdcss-$_libdvdcss_version.tar.gz" "libdvdcss-$_libdvdcss_version.tar.gz"
@ -74,8 +75,9 @@ sha256sums=('9c056808eecc7dd2e72fffd3f3412d83c60fe3742bc0d96f16f9abdfc55c8012'
'73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44' '73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44'
'3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10' '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10'
'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476' 'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
'5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3') '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3'
'a7aa50c25ff53b87c79c9235d9a3de62ccffcab4faa15b489ae2d8be9b0c0b35'
)
prepare() { prepare() {
cd "xbmc-newclock5_$_tag" cd "xbmc-newclock5_$_tag"
@ -83,6 +85,9 @@ prepare() {
mkdir $srcdir/kodi-build mkdir $srcdir/kodi-build
patch -Np1 -i ../00-fix.building.with.mariadb.patch 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"
} }
build() { build() {

View file

@ -0,0 +1,14 @@
diff -rupN a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2019-01-28 19:02:31.000000000 +0100
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2019-02-15 22:20:14.000000000 +0100
@@ -1329,6 +1329,10 @@ void CAESinkALSA::EnumerateDevice(AEDevi
if (snd_card_get_name(cardNr, &cardName) == 0)
info.m_displayName = cardName;
+ /* hifiberry digi doesn't correctly report as iec958 device. Needs fixing in kernel driver */
+ if (info.m_displayName == "snd_rpi_hifiberry_digi")
+ info.m_deviceType = AE_DEVTYPE_IEC958;
+
if (info.m_deviceType == AE_DEVTYPE_HDMI && info.m_displayName.size() > 5 &&
info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI")
{