From 34a7e6d7d81b2b9f68fa97877ac91518f7a4ec6e Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 20 Jan 2025 19:28:23 +0100 Subject: [PATCH] fix(main/vlc,x11/vlc-qt): Fix build with current libnfs --- ...944c2d50cacfacdd5b16d4ea5e7b4766a9fc.patch | 46 +++++++++++++++++++ packages/vlc/build.sh | 2 +- ...944c2d50cacfacdd5b16d4ea5e7b4766a9fc.patch | 1 + x11-packages/vlc-qt/build.sh | 2 +- 4 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 packages/vlc/a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc.patch create mode 120000 x11-packages/vlc-qt/a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc.patch diff --git a/packages/vlc/a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc.patch b/packages/vlc/a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc.patch new file mode 100644 index 00000000000000..1c386faeb60a4c --- /dev/null +++ b/packages/vlc/a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc.patch @@ -0,0 +1,46 @@ +From a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +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 +Co-authored-by: Thomas Guillem +--- + 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 + diff --git a/packages/vlc/build.sh b/packages/vlc/build.sh index 09bc903191c1dc..89491499beed8e 100644 --- a/packages/vlc/build.sh +++ b/packages/vlc/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A popular libre and open source media player and multime TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="3.0.21" -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://download.videolan.org/pub/videolan/vlc/${TERMUX_PKG_VERSION}/vlc-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0 TERMUX_PKG_DEPENDS="chromaprint, dbus, ffmpeg, fluidsynth, fontconfig, freetype, fribidi, glib, gst-plugins-base, gstreamer, harfbuzz, liba52, libandroid-shmem, libandroid-spawn, libaom, libarchive, libass, libbluray, libc++, libcaca, libcairo, libcddb, libdav1d, libdvbpsi, libdvdnav, libdvdread, libebml, libflac, libgcrypt, libgnutls, libgpg-error, libiconv, libidn, libjpeg-turbo, liblua52, libmad, libmatroska, libmpeg2, libnfs, libogg, libopus, libpng, librsvg, libsecret, libsoxr, libssh2, libtheora, libtwolame, libvorbis, libvpx, libx11, libx264, libx265, libxcb, libxml2, mpg123, ncurses, opengl, pulseaudio, samba, taglib, zlib" diff --git a/x11-packages/vlc-qt/a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc.patch b/x11-packages/vlc-qt/a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc.patch new file mode 120000 index 00000000000000..2156164abe74ef --- /dev/null +++ b/x11-packages/vlc-qt/a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc.patch @@ -0,0 +1 @@ +../../packages/vlc/a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc.patch \ No newline at end of file diff --git a/x11-packages/vlc-qt/build.sh b/x11-packages/vlc-qt/build.sh index c80538d5e0f238..58fc66ca2983fd 100644 --- a/x11-packages/vlc-qt/build.sh +++ b/x11-packages/vlc-qt/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A popular libre and open source media player and multime TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="3.0.21" -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://download.videolan.org/pub/videolan/vlc/${TERMUX_PKG_VERSION}/vlc-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0 TERMUX_PKG_DEPENDS="chromaprint, dbus, ffmpeg, fluidsynth, fontconfig, freetype, fribidi, glib, gst-plugins-base, gstreamer, harfbuzz, liba52, libandroid-shmem, libandroid-spawn, libaom, libarchive, libass, libbluray, libc++, libcaca, libcairo, libcddb, libdav1d, libdvbpsi, libdvdnav, libdvdread, libebml, libflac, libgcrypt, libgnutls, libgpg-error, libiconv, libidn, libjpeg-turbo, liblua52, libmad, libmatroska, libmpeg2, libnfs, libogg, libopus, libpng, librsvg, libsecret, libsoxr, libssh2, libtheora, libtwolame, libvorbis, libvpx, libx11, libx264, libx265, libxcb, libxml2, mpg123, ncurses, opengl, pulseaudio, qt5-qtbase, qt5-qtsvg, qt5-qtx11extras, samba, taglib, xcb-util-keysyms, zlib"