[vlc-commits] [Git][videolan/vlc][master] Upgrade contrib librist library to 0.2.14

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
25ef539a by Sergio Ammirata at 2026-04-30T09:34:42+00:00
Upgrade contrib librist library to 0.2.14

- - - - -


5 changed files:

- − contrib/src/librist/0001-meson-don-t-force-the-Windows-version-if-it-s-higher.patch
- contrib/src/librist/SHA512SUMS
- − contrib/src/librist/librist-fix-libcjson-meson.patch
- contrib/src/librist/rules.mak
- − contrib/src/librist/win32-timing.patch


Changes:

=====================================
contrib/src/librist/0001-meson-don-t-force-the-Windows-version-if-it-s-higher.patch deleted
=====================================
@@ -1,43 +0,0 @@
-From ce4c19c96fb0f90c7728fc209f3544023bb5ddcd Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Tue, 23 May 2023 15:02:15 +0200
-Subject: [PATCH 1/2] meson: don't force the Windows version if it's higher
- than Vista
-
-If the user requires a newer Windows version it should set it manually.
-
-It is also questionable to call inet_ntop (aka InetNtopA) if the build
-requests minimum support for Win XP (VLC 3.0). It's only available since
-Vista [1]. So building for a Vista target should be fine.
-
-[1] https://learn.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-inet_ntop
----
- meson.build | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index f8ec49b..c2df33a 100755
---- a/meson.build
-+++ b/meson.build
-@@ -64,7 +64,17 @@ threads = []
- test_args = []
- if host_machine.system() == 'windows'
- 	deps += [ cc.find_library('ws2_32') ]
--	add_project_arguments(['-D_WIN32_WINNT=0x0601'], language: 'c')
-+
-+windows_version_test = '''
-+#include <windef.h>
-+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600
-+# error _WIN32_WINNT toolchain default not high enough
-+#endif
-+'''
-+	if not cc.compiles(windows_version_test, name: '_WIN32_WINNT includes Vista')
-+		add_project_arguments(['-D_WIN32_WINNT=0x0600'], language: 'c')
-+	endif
-+
- 	if get_option('default_library') != 'static'
- 		add_project_arguments(['-DLIBRIST_BUILDING_DLL'], language: 'c')
- 	endif
--- 
-2.37.3.windows.1
-


=====================================
contrib/src/librist/SHA512SUMS
=====================================
@@ -1 +1 @@
-fa4e1aea75206781d062d350410e2f4e095e52191d22fb1882ec779ca13845294d00b5e4f06f04573eb8945ec280c304c96c1607622e978a241c5086b7d0a831  librist-v0.2.7.tar.gz
+eb730efb2c1d59177e85fb0da0ecc9c6db42ccfff3cd8bde7ef6df4bd13c623d0ac489abb0bb9c3f63bb43b7730903436c434a9f5d7f5d5314c12f3af905135b  librist-v0.2.14.tar.gz


=====================================
contrib/src/librist/librist-fix-libcjson-meson.patch deleted
=====================================
@@ -1,13 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a77780667dfb07d700d39c6c3353c0ba4906b178..0ed820152476e0caed3ba6d203ba236083fb8438 100755
---- a/meson.build
-+++ b/meson.build
-@@ -156,7 +156,7 @@ endif
- 
- #On ubuntu cjson does not come with pkgconfig files, hence the extended checking.
- if not builtin_cjson
--	cjson_lib = dependency('cJSON', required: false)
-+	cjson_lib = dependency('libcjson', required: false)
- 	if not cjson_lib.found()
- 		cjson_lib = cc.find_library('cjson', required: required_library, has_headers: ['cjson/cJSON.h'])
- 		if not cjson_lib.found()


=====================================
contrib/src/librist/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # librist
 
-LIBRIST_VERSION := v0.2.7
+LIBRIST_VERSION := v0.2.14
 LIBRIST_URL := https://code.videolan.org/rist/librist/-/archive/$(LIBRIST_VERSION)/librist-$(LIBRIST_VERSION).tar.gz
 
 ifdef BUILD_NETWORK
@@ -25,6 +25,21 @@ ifdef HAVE_WIN32
 LIBRIST_CONF += -Dhave_mingw_pthreads=true
 endif
 
+# Prefer nettle+gmp+gnutls over the bundled mbedtls when the license
+# allows it. gnutls (nettle/gmp) can't be used with the LGPLv2 license.
+ifdef GPL
+LIBRIST_USE_GNUTLS = 1
+else
+ifdef GNUV3
+LIBRIST_USE_GNUTLS = 1
+endif
+endif
+
+ifeq ($(LIBRIST_USE_GNUTLS),1)
+DEPS_librist += gnutls $(DEPS_gnutls)
+LIBRIST_CONF += -Duse_nettle=true -Duse_mbedtls=false
+endif
+
 $(TARBALLS)/librist-$(LIBRIST_VERSION).tar.gz:
 	$(call download_pkg,$(LIBRIST_URL),librist)
 
@@ -32,9 +47,6 @@ $(TARBALLS)/librist-$(LIBRIST_VERSION).tar.gz:
 
 librist: librist-$(LIBRIST_VERSION).tar.gz .sum-librist
 	$(UNPACK)
-	$(APPLY) $(SRC)/librist/librist-fix-libcjson-meson.patch
-	$(APPLY) $(SRC)/librist/win32-timing.patch
-	$(APPLY) $(SRC)/librist/0001-meson-don-t-force-the-Windows-version-if-it-s-higher.patch
 	$(MOVE)
 
 .librist: librist crossfile.meson


=====================================
contrib/src/librist/win32-timing.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- librist/contrib/mbedtls/library/timing.c.orig	2022-04-21 15:15:32.479888797 +0300
-+++ librist/contrib/mbedtls/library/timing.c	2022-04-21 15:15:46.615589264 +0300
-@@ -195,7 +195,7 @@
- #endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
-           __GNUC__ && __ia64__ */
- 
--#if !defined(HAVE_HARDCLOCK) && defined(_MSC_VER) && \
-+#if !defined(HAVE_HARDCLOCK) && defined(_WIN32) && \
-     !defined(EFIX64) && !defined(EFI32)
- 
- #define HAVE_HARDCLOCK



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/25ef539aaa4d4c843ee18ee6309aeff520f12ab9

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/25ef539aaa4d4c843ee18ee6309aeff520f12ab9
You're receiving this email because of your account on code.videolan.org.