diff options
| author | Tim Biermann <tbier@posteo.de> | 2022-06-06 17:48:43 +0200 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2022-06-06 17:48:43 +0200 |
| commit | 205206a16e32eafa8cbdc8ab2d0352fc42fd7acc (patch) | |
| tree | 42cf3dd0e3bcf93e7e91a00ecf570b70f57e659f /kodi-gbm | |
| parent | 56a7ccee53fbcdc6f4afc7e4e836df3dd8a938f0 (diff) | |
| parent | ea5f2dcc5e21237aafd6a1f7ee8031dd4930cf0e (diff) | |
| download | contrib-205206a16e32eafa8cbdc8ab2d0352fc42fd7acc.tar.gz contrib-205206a16e32eafa8cbdc8ab2d0352fc42fd7acc.tar.xz | |
Merge remote-tracking branch 'origin/3.6' into 3.7
Diffstat (limited to 'kodi-gbm')
| -rw-r--r-- | kodi-gbm/.signature | 6 | ||||
| -rw-r--r-- | kodi-gbm/Pkgfile | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/kodi-gbm/.signature b/kodi-gbm/.signature index 1d080a1ff..043ba5ed9 100644 --- a/kodi-gbm/.signature +++ b/kodi-gbm/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/3Y8kRNWu9lSPtP/E7MDqVKrGZIS5HyUWSx3EVuhn51Bh2Z1wsyIWlesY8cKCs+z7xNeOR9amjmPEurQk94TQ4= -SHA256 (Pkgfile) = 72a6db34c8850c1e950281bac1e5e550444db2d4088b9376bfb4278f36dad186 +RWSagIOpLGJF39pHTllCHWl6PhJkYWZad7cb1S5NGiqzgbebQdNWFNqHjrWDNGkXcMkwBXfbGhQFBwODpyhA77KhbjQhWo+aOg4= +SHA256 (Pkgfile) = 34bfbe7514c3000070b04ae7429007d8a616c7913eff61dc3342390aa4e348fa SHA256 (.footprint) = bcd059bec3d28b10a142ffcf74e81e625265355f566586b533afb4125684573f SHA256 (xbmc-19.4-Matrix.tar.gz) = cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da -SHA256 (4.3.1-Matrix-Beta1.tar.gz) = 0b209a9b15f2335e516bf2ad1249fffc6b55425145f17c9674dc430abf6a67ad +SHA256 (4.3-kodi-dav1d-1.0.tar.gz) = 9d8b26e2a16029c4c15fd3232303515a3cb37b1d2bff02ee0fa5f0230c3a2fd4 SHA256 (fmt-5.1.0.tar.gz) = 73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44 SHA256 (crossguid-8f399e8bd4.tar.gz) = 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10 SHA256 (kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz) = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d diff --git a/kodi-gbm/Pkgfile b/kodi-gbm/Pkgfile index df46c3ef5..78ba4b6b4 100644 --- a/kodi-gbm/Pkgfile +++ b/kodi-gbm/Pkgfile @@ -6,7 +6,7 @@ name=kodi-gbm version=19.4 -release=1 +release=2 # version variables {{{ _codename=Matrix @@ -19,7 +19,8 @@ _libdvdread_version="6.0.0-Leia-Alpha-3" # }}} # source {{{ source=(https://github.com/xbmc/xbmc/archive/$version-$_codename/xbmc-$version-$_codename.tar.gz - https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz + https://github.com/BlackIkeEagle/kodi-FFmpeg/archive/refs/heads/fix/4.3-kodi-dav1d-1.0.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/crossguid-$_crossguid_version.tar.gz https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version/${name/-gbm/}-libdvdcss-$_libdvdcss_version.tar.gz @@ -84,7 +85,7 @@ build() { -D ENABLE_TESTING=OFF \ -D VERBOSE=OFF \ -D ENABLE_INTERNAL_FFMPEG=ON \ - -D FFMPEG_URL="$SRC/$_ffmpeg_version.tar.gz" \ + -D FFMPEG_URL="$SRC/4.3-kodi-dav1d-1.0.tar.gz" \ -D ENABLE_INTERNAL_CROSSGUID=ON \ -D CROSSGUID_URL="$SRC/crossguid-$_crossguid_version.tar.gz" \ -D LIBDVDCSS_URL="$SRC/${name/-gbm/}-libdvdcss-$_libdvdcss_version.tar.gz" \ @@ -96,6 +97,7 @@ build() { -D ENABLE_INTERNAL_GTEST=OFF \ -D ENABLE_INTERNAL_RapidJSON=OFF \ -Wno-dev + #-D FFMPEG_URL="$SRC/$_ffmpeg_version.tar.gz" \ cmake --build build DESTDIR=$PKG cmake --build build --target install } |