From 0ca04f0cdb2d86056f258db24e86aa381c7f8a68 Mon Sep 17 00:00:00 2001 From: graysky Date: Tue, 10 Jan 2023 06:10:47 -0500 Subject: [PATCH] alarm/kodi-rpi-legacy to 19.5.57808.a74170b3c0-4 --- ...0001-add-dav1d-patch-to-build-system.patch | 23 ---------------- alarm/kodi-rpi-legacy/PKGBUILD | 27 +++++++------------ .../build-fix-for-dav1d-1.0.0.patch | 23 ---------------- 3 files changed, 10 insertions(+), 63 deletions(-) delete mode 100644 alarm/kodi-rpi-legacy/0001-add-dav1d-patch-to-build-system.patch delete mode 100644 alarm/kodi-rpi-legacy/build-fix-for-dav1d-1.0.0.patch diff --git a/alarm/kodi-rpi-legacy/0001-add-dav1d-patch-to-build-system.patch b/alarm/kodi-rpi-legacy/0001-add-dav1d-patch-to-build-system.patch deleted file mode 100644 index d13e60e02..000000000 --- a/alarm/kodi-rpi-legacy/0001-add-dav1d-patch-to-build-system.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 22ac2d50eec4070fa58b1c7915a9fbf66070b57b Mon Sep 17 00:00:00 2001 -Date: Mon, 9 Jan 2023 11:07:51 -0500 -Subject: add dav1d patch to build system - ---- - cmake/modules/FindFFMPEG.cmake | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake -index 9ce807c..d1c7810 100644 ---- a/cmake/modules/FindFFMPEG.cmake -+++ b/cmake/modules/FindFFMPEG.cmake -@@ -279,6 +279,7 @@ if(NOT FFMPEG_FOUND) - ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake - && - patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/0001-rpi-Add-hevc-acceleration.patch && -+ patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch && - echo "########################################## patched ffmpeg ##############################" - ) - --- -2.39.0 - diff --git a/alarm/kodi-rpi-legacy/PKGBUILD b/alarm/kodi-rpi-legacy/PKGBUILD index 254c95c1a..4e8f337e2 100644 --- a/alarm/kodi-rpi-legacy/PKGBUILD +++ b/alarm/kodi-rpi-legacy/PKGBUILD @@ -19,7 +19,7 @@ _commit=a74170b3c0e5ec870781e6742775681d4c88a436 _commitnumber=57808 pkgver=19.5."$_commitnumber.${_commit:0:10}" -pkgrel=3 +pkgrel=4 arch=('armv7h') url="https://github.com/graysky2/xbmc/tree/gs-gbm_matrix" license=('GPL2') @@ -39,7 +39,8 @@ _init_version=1.136 _libdvdcss_version="1.4.2-Leia-Beta-5" _libdvdnav_version="6.0.0-Leia-Alpha-3" _libdvdread_version="6.0.0-Leia-Alpha-3" -_ffmpeg_version="4.3.2-$_codename-19.2" +#_ffmpeg_version="4.3.2-$_codename-19.2" +_ffmpeg_version="4.3-kodi-dav1d-1.0" _fmt_version="6.1.2" _spdlog_version="1.5.0" _crossguid_version="8f399e8bd4" @@ -51,7 +52,8 @@ source=( "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://sources.archlinux.org/other/community/kodi/kodi-ffmpeg-$_ffmpeg_version.tar.gz" "https://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz" "https://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_version.tar.gz" "https://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz" @@ -60,9 +62,7 @@ source=( "https://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 - build-fix-for-dav1d-1.0.0.patch - 0001-add-dav1d-patch-to-build-system.patch - 0002-upstream-build-fixes-from-debian.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/22291.patch + 0001-upstream-build-fixes-from-debian.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/22291.patch ) backup=(boot/kodi.config.txt etc/conf.d/kodi-standalone) noextract=( @@ -81,7 +81,7 @@ sha256sums=('81b005202c761c3cfbb8e242f77ff52445d9dd32d02579f39f23db4077d37f04' '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d' '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a' 'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf' - '58fe3a3ba38d2b30cd8bfe40e1b3bf82296b258627d0740c284af29f0c8a6655' + '9d8b26e2a16029c4c15fd3232303515a3cb37b1d2bff02ee0fa5f0230c3a2fd4' '1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365' 'b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a' '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10' @@ -89,9 +89,7 @@ sha256sums=('81b005202c761c3cfbb8e242f77ff52445d9dd32d02579f39f23db4077d37f04' '62f2223fb9181d1d6338451375628975775f7522185266cd5296571ac152bc45' '5ad9f95c53e8f29853c1fefa0a20a301be4045e2c7ae49d1164bc74d94155627' 'b94c70baa45e30346224ceecfab031dd183e09303b1f97d6522f9941da9b0067' - '9ce6051a2157e6b677090f201d98870a33db6c90c91dc0d480a87fb7ab84e3e5' - 'bcde6299a805430c3ca1f2807101edc7001e77b1934088db9057f74d9a9dd8f6' - '0550a6decd442da8b5b3fa0efdbea52b646fcd91203e8f61de9bab0400a2fc77' + '590a2fcc8d4855ef1e1196b7a81954670cd1d7580d94e41c8b5e99c5f206d37d' 'cac4d2a509dbc9b126428ea9338c3ef3b820637a0332c2de4f1c4ec983def1dc') prepare() { @@ -99,12 +97,7 @@ prepare() { mkdir "$srcdir/kodi-build" cd "xbmc-$_commit" - # make build system patch ffmpeg for dav1d 1.0.0 - patch -p1 -i ../0001-add-dav1d-patch-to-build-system.patch - - # put patch in source tree so kodi build system can pick it up - cp ../build-fix-for-dav1d-1.0.0.patch tools/depends/target/ffmpeg - patch -p1 -i ../0002-upstream-build-fixes-from-debian.patch + patch -p1 -i ../0001-upstream-build-fixes-from-debian.patch } build() { @@ -130,7 +123,7 @@ build() { -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz" -Dlibdvdread_URL="$srcdir/libdvdread-$_libdvdread_version.tar.gz" - -DFFMPEG_URL="$srcdir/ffmpeg-$_ffmpeg_version.tar.gz" + -DFFMPEG_URL="$srcdir/kodi-ffmpeg-$_ffmpeg_version.tar.gz" -DFMT_URL="$srcdir/fmt-$_fmt_version.tar.gz" -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz" -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" diff --git a/alarm/kodi-rpi-legacy/build-fix-for-dav1d-1.0.0.patch b/alarm/kodi-rpi-legacy/build-fix-for-dav1d-1.0.0.patch deleted file mode 100644 index d13e60e02..000000000 --- a/alarm/kodi-rpi-legacy/build-fix-for-dav1d-1.0.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 22ac2d50eec4070fa58b1c7915a9fbf66070b57b Mon Sep 17 00:00:00 2001 -Date: Mon, 9 Jan 2023 11:07:51 -0500 -Subject: add dav1d patch to build system - ---- - cmake/modules/FindFFMPEG.cmake | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake -index 9ce807c..d1c7810 100644 ---- a/cmake/modules/FindFFMPEG.cmake -+++ b/cmake/modules/FindFFMPEG.cmake -@@ -279,6 +279,7 @@ if(NOT FFMPEG_FOUND) - ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake - && - patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/0001-rpi-Add-hevc-acceleration.patch && -+ patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch && - echo "########################################## patched ffmpeg ##############################" - ) - --- -2.39.0 -