* update vlc to 3.0.21-12
This commit is contained in:
parent
9481b494f7
commit
4a42aaa211
@ -1,7 +1,7 @@
|
||||
pkgbase = vlc
|
||||
pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player
|
||||
pkgver = 3.0.21
|
||||
pkgrel = 11
|
||||
pkgrel = 12
|
||||
url = https://www.videolan.org/vlc/
|
||||
arch = x86_64
|
||||
arch = powerpc64le
|
||||
@ -117,11 +117,13 @@ pkgbase = vlc
|
||||
source = https://download.videolan.org/vlc/3.0.21/vlc-3.0.21.tar.xz.asc
|
||||
source = update-vlc-plugin-cache.hook
|
||||
source = taglib-2.patch
|
||||
source = libnfs6-mr-6527.patch
|
||||
validpgpkeys = 65F7C6B4206BD057A7EB73787180713BE58D1ADC
|
||||
sha512sums = cb1af76c8056648c331d7e6e0680d161ed1849eb635987504f45eae02531e9b432651034317fa7e02b0722905dfb9f0f5dad67b5924cc62edcaf0d173ac36aee
|
||||
sha512sums = SKIP
|
||||
sha512sums = b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3
|
||||
sha512sums = ea0d1e1dfed16dac8f9027eb55d987dee59630568b9744ceb42bfa134ea9295252d83574f3d793a76a5be3b02661c1731ed366003b6b55b2d7f02fde70586ff3
|
||||
sha512sums = ea13dd8a1815af183064590d25eb9e652e81bd2d481d311bc4f841c32977205d1d3663d1c3e1c2fe642d546b5e6ab38d5fa6e3ea77808f76d138052900c19032
|
||||
makedepends_x86_64 = libgoom2
|
||||
makedepends_x86_64 = taglib
|
||||
makedepends_powerpc64le = libgoom2
|
||||
|
@ -10,7 +10,7 @@ _vlcver=3.0.21
|
||||
# optional fixup version including hyphen
|
||||
_vlcfixupver=
|
||||
pkgver=$_vlcver${_vlcfixupver//-/.r}
|
||||
pkgrel=11
|
||||
pkgrel=12
|
||||
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
|
||||
url=https://www.videolan.org/vlc/
|
||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||
@ -131,11 +131,13 @@ source=(
|
||||
https://download.videolan.org/$pkgname/$_vlcver/$pkgname-$_vlcver$_vlcfixupver.tar.xz{,.asc}
|
||||
update-vlc-plugin-cache.hook
|
||||
taglib-2.patch
|
||||
libnfs6-mr-6527.patch
|
||||
)
|
||||
sha512sums=('cb1af76c8056648c331d7e6e0680d161ed1849eb635987504f45eae02531e9b432651034317fa7e02b0722905dfb9f0f5dad67b5924cc62edcaf0d173ac36aee'
|
||||
'SKIP'
|
||||
'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3'
|
||||
'ea0d1e1dfed16dac8f9027eb55d987dee59630568b9744ceb42bfa134ea9295252d83574f3d793a76a5be3b02661c1731ed366003b6b55b2d7f02fde70586ff3')
|
||||
'ea0d1e1dfed16dac8f9027eb55d987dee59630568b9744ceb42bfa134ea9295252d83574f3d793a76a5be3b02661c1731ed366003b6b55b2d7f02fde70586ff3'
|
||||
'ea13dd8a1815af183064590d25eb9e652e81bd2d481d311bc4f841c32977205d1d3663d1c3e1c2fe642d546b5e6ab38d5fa6e3ea77808f76d138052900c19032')
|
||||
validpgpkeys=(65F7C6B4206BD057A7EB73787180713BE58D1ADC) # VideoLAN Release Signing Key
|
||||
|
||||
prepare() {
|
||||
|
46
vlc/libnfs6-mr-6527.patch
Normal file
46
vlc/libnfs6-mr-6527.patch
Normal file
@ -0,0 +1,46 @@
|
||||
From a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc Mon Sep 17 00:00:00 2001
|
||||
From: Steve Lhomme <robux4@ycbcr.xyz>
|
||||
Date: Mon, 16 Dec 2024 09:28:55 +0100
|
||||
Subject: [PATCH] nfs: fix libnfs API v2 support
|
||||
|
||||
Introduced in libnfs 6.0.0.
|
||||
|
||||
Co-authored-by: ronnie sahlberg <ronniesahlberg@gmail.com>
|
||||
Co-authored-by: Thomas Guillem <thomas@gllm.fr>
|
||||
---
|
||||
modules/access/nfs.c | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules/access/nfs.c b/modules/access/nfs.c
|
||||
index f164cda86499..3510c3fe1f14 100644
|
||||
--- a/modules/access/nfs.c
|
||||
+++ b/modules/access/nfs.c
|
||||
@@ -188,7 +188,8 @@ nfs_read_cb(int i_status, struct nfs_context *p_nfs, void *p_data,
|
||||
else
|
||||
{
|
||||
p_sys->res.read.i_len = i_status;
|
||||
- memcpy(p_sys->res.read.p_buf, p_data, i_status);
|
||||
+ if (p_sys->res.read.p_buf != NULL && p_data != NULL)
|
||||
+ memcpy(p_sys->res.read.p_buf, p_data, i_status);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -208,9 +209,15 @@ FileRead(stream_t *p_access, void *p_buf, size_t i_len)
|
||||
return 0;
|
||||
|
||||
p_sys->res.read.i_len = 0;
|
||||
+#ifdef LIBNFS_API_V2
|
||||
+ p_sys->res.read.p_buf = NULL;
|
||||
+ if (nfs_read_async(p_sys->p_nfs, p_sys->p_nfsfh, p_buf, i_len, nfs_read_cb,
|
||||
+ p_access) < 0)
|
||||
+#else
|
||||
p_sys->res.read.p_buf = p_buf;
|
||||
if (nfs_read_async(p_sys->p_nfs, p_sys->p_nfsfh, i_len, nfs_read_cb,
|
||||
p_access) < 0)
|
||||
+#endif
|
||||
{
|
||||
msg_Err(p_access, "nfs_read_async failed");
|
||||
return 0;
|
||||
--
|
||||
GitLab
|
||||
|
Loading…
x
Reference in New Issue
Block a user