From 06c778c6da35b47af68acb3aed67caa287513c86 Mon Sep 17 00:00:00 2001 From: graysky Date: Sat, 12 Dec 2020 16:11:31 -0500 Subject: [PATCH] alarm/kodi-rpi to 18.9-2 Adjust replaces/conflicts/pkgdesc to play nice with kodi-rpi-legacy --- alarm/kodi-rpi/PKGBUILD | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/alarm/kodi-rpi/PKGBUILD b/alarm/kodi-rpi/PKGBUILD index decb6f49a..b62712395 100644 --- a/alarm/kodi-rpi/PKGBUILD +++ b/alarm/kodi-rpi/PKGBUILD @@ -26,7 +26,7 @@ _prefix=/usr pkgbase=kodi-rpi pkgname=('kodi-rpi' 'kodi-rpi-eventclients' 'kodi-rpi-tools-texturepacker' 'kodi-rpi-dev') pkgver=18.9 -pkgrel=1 +pkgrel=2 _codename=Leia _ffmpeg_version="4.2.2-Matrix-Alpha1" _libdvdcss_version="1.4.2-$_codename-Beta-5" @@ -37,7 +37,7 @@ _crossguid_version="8f399e8bd4" _fstrcmp_version="0.7.D001" _flatbuffers_version="1.9.0" arch=('armv7h') -url="https://kodi.tv" +url="https://github.com/popcornmix/xbmc/tree/leia_pi4" license=('GPL2') makedepends=( 'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'doxygen' 'glew' @@ -190,7 +190,7 @@ build() { } package_kodi-rpi() { - pkgdesc="A software media player and entertainment hub for digital media (Raspberry Pi)" + pkgdesc="Media player and entertainment hub for Raspberry Pi 4, leia_pi4 fork" depends=( 'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python2-pycryptodomex' 'python2-pillow6' 'python2-simplejson' 'xorg-xdpyinfo' @@ -209,9 +209,9 @@ package_kodi-rpi() { 'upower: Display battery level' ) install='kodi.install' - provides=('xbmc' 'kodi') - conflicts=('xbmc' 'kodi' 'arm-mem-git' 'shairplay-git' 'kodi-rbp' 'kodi-rbp3' 'kodi-rbp4') - replaces=('xbmc-rbp-git' 'kodi-rbp' 'kodi-rbp3' 'kodi-rbp4') + provides=('xbmc' "kodi=${pkgver}") + conflicts=('xbmc' 'kodi' 'arm-mem-git' 'shairplay-git' 'kodi-rbp' 'kodi-rbp3' 'kodi-rbp4' 'kodi-rpi-legacy') + replaces=('xbmc-rbp-git' 'kodi-rbp4') _components=('kodi' 'kodi-bin') export PATH="$srcdir/path:$PATH" @@ -244,10 +244,10 @@ package_kodi-rpi() { } package_kodi-rpi-eventclients() { - pkgdesc="Kodi Event Clients (Raspberry Pi)" - provides=('kodi-eventclients') - conflicts=('kodi-rbp-eventclients' 'kodi-rbp3-eventclients' 'kodi-rbp4-eventclients') - replaces=('kodi-rbp-eventclients' 'kodi-rbp3-eventclients' 'kodi-rbp4-eventclients') + pkgdesc="Kodi Event Clients for Raspberry Pi 4, leia_pi4 fork" + provides=("kodi-eventclients=${pkgver}") + conflicts=('kodi-rbp-eventclients' 'kodi-rbp3-eventclients' 'kodi-rbp4-eventclients' 'kodi-rpi-legacy-eventclients') + replaces=('kodi-rbp4-eventclients') optdepends=('python2: most eventclients are implemented in python2') _components=( @@ -272,10 +272,10 @@ package_kodi-rpi-eventclients() { } package_kodi-rpi-tools-texturepacker() { - pkgdesc="Kodi Texturepacker tool (Raspberry Pi)" + pkgdesc="Kodi Texturepacker Tool for Raspberry Pi 4, leia_pi4 fork" depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo') - conflicts=('kodi-rbp-tools-texturepacker' 'kodi-rbp3-tools-texturepacker' 'kodi-rbp4-tools-texturepacker') - replaces=('kodi-rbp-tools-texturepacker' 'kodi-rbp3-tools-texturepacker' 'kodi-rbp4-tools-texturepacker') + conflicts=('kodi-rbp-tools-texturepacker' 'kodi-rbp3-tools-texturepacker' 'kodi-rbp4-tools-texturepacker' 'kodi-rpi-legacy-tools-texturepacker') + replaces=('kodi-rbp4-tools-texturepacker') _components=('kodi-tools-texturepacker') export PATH="$srcdir/path:$PATH" @@ -289,11 +289,11 @@ package_kodi-rpi-tools-texturepacker() { } package_kodi-rpi-dev() { - pkgdesc="Kodi dev files (Raspberry Pi)" + pkgdesc="Kodi dev files for Raspberry Pi 4, leia_pi4 fork" depends=('kodi') - conflicts=('kodi-rbp-dev' 'kodi-rbp3-dev' 'kodi-rbp4-dev') - replaces=('kodi-rbp-dev' 'kodi-rbp3-dev' 'kodi-rbp4-dev') - provides=('kodi-dev') + conflicts=('kodi-rbp-dev' 'kodi-rbp3-dev' 'kodi-rbp4-dev' 'kodi-rpi-legacy-dev') + replaces=('kodi-rbp4-dev') + provides=("kodi-dev=${pkgver}") _components=('kodi-addon-dev' 'kodi-audio-dev'