alarm/kodi-rpi-git to 20.x.61807.fb384656b3-1

This commit is contained in:
graysky 2022-12-29 09:53:13 -05:00
parent 9c64dea9d9
commit 0532be1ef6
2 changed files with 43 additions and 13 deletions

View file

@ -0,0 +1,23 @@
From 9620920d9fd43dc96a8d3469b905f2a7c802936a Mon Sep 17 00:00:00 2001
Date: Thu, 15 Dec 2022 13:42:44 -0500
Subject: [PATCH] FFMPEG-VERSION: use checksum for 4.4.2
---
tools/depends/target/ffmpeg/FFMPEG-VERSION | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION
index 2c9eda8..a8b7be3 100644
--- a/tools/depends/target/ffmpeg/FFMPEG-VERSION
+++ b/tools/depends/target/ffmpeg/FFMPEG-VERSION
@@ -1,5 +1,5 @@
LIBNAME=ffmpeg
BASE_URL=https://github.com/xbmc/FFmpeg
-VERSION=4.4.1-Nexus-Alpha1
+VERSION=4.4.2
ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
-SHA512=8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5
+SHA512=fa5c1d571e510170b9721fb8813b734c70e40b3b5b4df7badc8a1106e45e9d47b9a39e903409693dafb410264db4072856a655f26d9997e6742ed956dcdb97c2
--
2.39.0

View file

@ -13,16 +13,16 @@ pkgname=(
'kodi-rpi-git-eventclients' 'kodi-rpi-git-tools-texturepacker' 'kodi-rpi-git-dev'
)
_commitnumber=61800
_commit=2f18bdb48d2d9a4fa8c77f5ab02d1bf1caeb190f
_commitnumber=61807
_commit=fb384656b39212a369a07273e7e4f2c4dbd33468
# set this to anything to build with clang
# recommend manually setting -DUSE_LTO=OFF to -DUSE_LTO=$(nproc) in build()
_clangbuild=
pkgver="20.x.$_commitnumber.${_commit:0:10}"
pkgrel=2
arch=('armv7h' 'aarch64')
pkgrel=1
arch=('aarch64' 'armv7h')
url="https://github.com/graysky2/xbmc/tree/gs-gbm_nexus"
license=('GPL2')
makedepends=(
@ -34,7 +34,7 @@ makedepends=(
'python-pycryptodomex' 'python-pillow' 'python-pybluez'
'python-simplejson' 'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest' 'graphviz'
'libinput' 'libxkbcommon' 'pipewire' 'pcre'
'libinput' 'libxkbcommon' 'pcre' 'pipewire'
)
[[ -n "$_clangbuild" ]] && makedepends+=('clang' 'lld' 'llvm')
@ -43,20 +43,21 @@ _init_version=1.136
_libdvdcss_version="1.4.3-Next-Nexus-Alpha2-2"
_libdvdnav_version="6.1.1-Next-Nexus-Alpha2-2"
_libdvdread_version="6.1.3-Next-Nexus-Alpha2-2"
_ffmpeg_version="4.4.1-Nexus-Alpha1"
#_ffmpeg_version="4.4.1-Nexus-Alpha1"
_ffmpeg_version="4.4.2"
_fmt_version="9.1.0"
_spdlog_version="1.10.0"
_crossguid_version="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_fstrcmp_version="0.7.D001"
_flatbuffers_version="2.0.0"
_libudfread_version="1.1.2"
_name="gbm_nexus-$pkgver-$_codename"
source=(
"xbmc-$pkgver.tar.gz::https://github.com/graysky2/xbmc/archive/$_commit.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"
"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"
#"ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
"https://ffmpeg.org/releases/ffmpeg-$_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"
@ -65,7 +66,8 @@ source=(
"http://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
"ArchARM-kodi-init-v$_init_version.tar.gz::https://github.com/graysky2/kodi-standalone-service/archive/v$_init_version.tar.gz"
kodi.config.txt
"0001-kodi-999.01-PR22291-fix-mesa-22.3.0-build.patch::https://raw.githubusercontent.com/LibreELEC/LibreELEC.tv/master/packages/mediacenter/kodi/patches/kodi-999.01-PR22291-fix-mesa-22.3.0-build.patch"
0001-upstream-build-fixes-from-debian.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/22291.patch
0002-FFMPEG-VERSION-use-checksum-for-4.4.2.patch
)
backup=(boot/kodi.config.txt etc/conf.d/kodi-standalone)
noextract=(
@ -80,11 +82,11 @@ noextract=(
"flatbuffers-$_flatbuffers_version.tar.gz"
"libudfread-$_libudfread_version.tar.gz"
)
sha256sums=('d3e9cafe1e2ca043c1367eac370ef64f59fe974e12eb6c9e265144ad98687cb4'
sha256sums=('e37b4097cc10ca431d79538ba77b74fc2deda735c5fbc1dbb28c2fc9703cc41a'
'f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e'
'584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc'
'719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62'
'abbce62231baffe237e412689c71ffe01bfc83135afd375f1e538caae87729ed'
'058efd4b6459bc9df54186f17a989d0af619a793aa62f07e96b88632706d6a17'
'5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2'
'697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224'
'6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4'
@ -93,14 +95,16 @@ sha256sums=('d3e9cafe1e2ca043c1367eac370ef64f59fe974e12eb6c9e265144ad98687cb4'
'2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5'
'b94c70baa45e30346224ceecfab031dd183e09303b1f97d6522f9941da9b0067'
'9ce6051a2157e6b677090f201d98870a33db6c90c91dc0d480a87fb7ab84e3e5'
'80c7c3399ef1b72dae214ecd5157469a2d0c69b6d931573482dba33c79ac296a')
'cac4d2a509dbc9b126428ea9338c3ef3b820637a0332c2de4f1c4ec983def1dc'
'38f2b335b1f726a86a74e9f243ccf49adbe741b9e0431781cff48cc0bf28fcbb')
prepare() {
[[ -d kodi-build ]] && rm -rf kodi-build
mkdir "$srcdir/kodi-build"
cd "xbmc-$_commit"
patch -p1 -i ../0001-kodi-999.01-PR22291-fix-mesa-22.3.0-build.patch
patch -p1 -i ../0001-upstream-build-fixes-from-debian.patch
patch -p1 -i ../0002-FFMPEG-VERSION-use-checksum-for-4.4.2.patch
}
build() {
@ -234,6 +238,9 @@ package_kodi-rpi-git() {
# man page
install -Dm0644 "$_initshit/doc/kodi.service.1" "$pkgdir/usr/share/man/man1/kodi.service.1"
# avoid error <general>: GetDirectory - Error getting /usr/lib/kodi/addons
mkdir -p "$pkgdir"/usr/lib/kodi/addons
}
package_kodi-rpi-git-eventclients() {