From 3511de20ea3e2e2185ffa720b6366a6bc8065626 Mon Sep 17 00:00:00 2001 From: graysky Date: Fri, 5 Mar 2021 06:54:42 -0500 Subject: [PATCH] alarm/kodi-rpi to 19.0-6 Add missing libudfread support to enable playback from ISO files. --- alarm/kodi-rpi-legacy/PKGBUILD | 1 - alarm/kodi-rpi/PKGBUILD | 32 ++++++++++++++++++++------------ alarm/kodi-rpi/kodi.config.txt | 2 +- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/alarm/kodi-rpi-legacy/PKGBUILD b/alarm/kodi-rpi-legacy/PKGBUILD index 876b172fe..8b346dd9e 100644 --- a/alarm/kodi-rpi-legacy/PKGBUILD +++ b/alarm/kodi-rpi-legacy/PKGBUILD @@ -9,7 +9,6 @@ buildarch=20 -_prefix=/usr pkgbase=kodi-rpi-legacy pkgname=( diff --git a/alarm/kodi-rpi/PKGBUILD b/alarm/kodi-rpi/PKGBUILD index d4752445c..584a6e692 100644 --- a/alarm/kodi-rpi/PKGBUILD +++ b/alarm/kodi-rpi/PKGBUILD @@ -9,14 +9,13 @@ buildarch=12 - pkgbase=kodi-rpi pkgname=( 'kodi-rpi' 'kodi-rpi-eventclients' 'kodi-rpi-tools-texturepacker' 'kodi-rpi-dev' ) pkgver=19.0 -pkgrel=5 +pkgrel=6 arch=('armv7h' 'aarch64') url="https://github.com/popcornmix/xbmc/tree/gbm" license=('GPL2') @@ -52,6 +51,7 @@ _spdlog_version="1.5.0" _crossguid_version="8f399e8bd4" _fstrcmp_version="0.7.D001" _flatbuffers_version="1.11.0" +_libudfread_version="1.1.0" _name="gbm_matrix-$pkgver-$_codename" source=( "xbmc-$pkgver.tar.gz::https://github.com/graysky2/xbmc/archive/$_name.tar.gz" @@ -60,10 +60,11 @@ source=( "libdvdread-$_libdvdread_version.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_version.tar.gz" "ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz" "http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz" - "http://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_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/flatbuffers-$_flatbuffers_version.tar.gz" + "http://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_version.tar.gz" + "http://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz" kodi.service 99-kodi.rules polkit.rules @@ -84,6 +85,7 @@ noextract=( "crossguid-$_crossguid_version.tar.gz" "fstrcmp-$_fstrcmp_version.tar.gz" "flatbuffers-$_flatbuffers_version.tar.gz" + "libudfread-$_libudfread_version.tar.gz" ) sha256sums=('92adf716d9d42b9b8cb86b997fb7a98a95fbb782f2db218cba54c4cd3c759527' '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d' @@ -91,14 +93,15 @@ sha256sums=('92adf716d9d42b9b8cb86b997fb7a98a95fbb782f2db218cba54c4cd3c759527' 'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf' '0b209a9b15f2335e516bf2ad1249fffc6b55425145f17c9674dc430abf6a67ad' '1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365' - 'b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a' '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10' 'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476' '1789b97e790da8f2cb5ff827d15580878c8629fd889f5f038d7524dca43eacc9' + 'b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a' + '5ad9f95c53e8f29853c1fefa0a20a301be4045e2c7ae49d1164bc74d94155627' 'bb8f0c0fd03ff7c13c0503f2c96f86772d8bbd05adbc97d5b383f603a98456c0' '61a0648d4a5086f560ceb4e020f82472d00b99398f2cacba94fad3e96c4c362a' '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f' - 'c89b58f6eba6e71a909ceeac1d65f5ab68c5ea711c34659cdbe980d11b353233' + 'ca91d35bf6d87ed6e43f366a87babf26eed9f186ca362edb59ae242fc62b3692' 'f521b98232e5035b7cada46cf03975b8d753e93d0802bf22913fceed769f9d96' '9c5e79ed8719cd032a3b17dac585aeff28a198e37af1da9af68ef1b86bab4d18' '16d6c79ff3a3d3653f21d77a36326a0335c8cec49a9c06dbc2de0ed143e50a9f' @@ -165,6 +168,7 @@ build() { -DENABLE_INTERNAL_CROSSGUID=ON -DENABLE_INTERNAL_FSTRCMP=ON -DENABLE_INTERNAL_FLATBUFFERS=ON + -DENABLE_INTERNAL_UDFREAD=ON -DENABLE_MYSQLCLIENT=ON -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz" @@ -175,6 +179,7 @@ build() { -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" + -DUDFREAD_URL="$srcdir/libudfread-$_libudfread_version.tar.gz" ) cmake "${_args[@]}" ../"xbmc-$_name" @@ -184,12 +189,12 @@ build() { package_kodi-rpi() { pkgdesc="Media player and entertainment hub for Raspberry Pi 3/4/400, gbm fork" depends=( - 'bluez-libs' 'curl' 'desktop-file-utils' 'hicolor-icon-theme' 'lcms2' - 'libass' 'libbluray' 'libcdio' 'libcec-rpi' 'libmicrohttpd' 'libnfs' 'libplist' - 'libpulse' 'libva' 'libxslt' 'lirc' 'mariadb-libs' 'mesa' - 'python-pillow' 'python-pycryptodomex' 'python-simplejson' 'shairplay' - 'smbclient' 'taglib' 'tinyxml' - 'libinput' 'libxkbcommon' 'polkit' 'linux>=5.4.35' 'dav1d' + 'bluez-libs' 'curl' 'dav1d' 'desktop-file-utils' 'hicolor-icon-theme' + 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec-rpi' 'libmicrohttpd' 'libnfs' + 'libplist' 'libpulse' 'libva' 'libxslt' 'lirc' 'mariadb-libs' 'mesa' + 'python-pillow' 'python-pycryptodomex' 'python-simplejson' + 'shairplay' 'smbclient' 'sqlite' 'taglib' 'tinyxml' + 'libinput' 'libxkbcommon' 'polkit' 'linux>=5.4.35' ) optdepends=( 'afpfs-ng: Apple shares support' @@ -227,8 +232,11 @@ package_kodi-rpi() { install -Dm0644 "$srcdir/polkit.rules" "$pkgdir/usr/share/polkit-1/rules.d/10-kodi.rules" chmod 0750 "$pkgdir/usr/share/polkit-1/rules.d/" - # setup video drivers for kodi-gbm on RPi4 + # setup video drivers for kodi-gbm install -Dm0644 "$srcdir/kodi.config.txt" "$pkgdir/boot/kodi.config.txt" + + # rpi4 wants 512 MB of memory + sed -i 's/@@@/512/' "$pkgdir/boot/kodi.config.txt" } package_kodi-rpi-eventclients() { diff --git a/alarm/kodi-rpi/kodi.config.txt b/alarm/kodi-rpi/kodi.config.txt index bdd386596..9e2c2f26b 100644 --- a/alarm/kodi-rpi/kodi.config.txt +++ b/alarm/kodi-rpi/kodi.config.txt @@ -1,4 +1,4 @@ -dtoverlay=vc4-kms-v3d,cma-512 +dtoverlay=vc4-kms-v3d,cma-@@@ dtoverlay=rpivid-v4l2 disable_overscan=1 disable_fw_kms_setup=1