[vlc-commits] [Git][videolan/vlc][3.0.x] 3 commits: contrib: librist: restore the nettle/gnutls backend selection on 3.0

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
cbfe5314 by Sergio Ammirata at 2026-08-03T08:36:37+02:00
contrib: librist: restore the nettle/gnutls backend selection on 3.0

3.0.x was missing the license-gated block that master keeps: when the
build is GPL or GPLv3, prefer nettle+gmp+gnutls over librist's bundled
mbedtls by adding gnutls to DEPS_librist and passing
-Duse_nettle=true -Duse_mbedtls=false. That keeps 3.0 librist on the
same crypto backend as master under the configurations VLC actually
builds, instead of silently falling back to the bundled copy.

- - - - -
79d87c10 by Sergio Ammirata at 2026-08-03T08:36:37+02:00
contrib: update librist to 0.2.20

Updates the librist contrib to the 0.2.20 release.

Of note for the VLC side: librist now builds against nettle 4.0, which
had removed the unified struct aes_ctx and the length argument on
several digest calls, and so broke this contrib's crypto backend
outright. nettle 3.x is still supported, selected on
NETTLE_VERSION_MAJOR, so this tree builds against either.

The release also brings optional constant-bitrate receiver output
pacing, RTT-based auto-mute for bonded sender legs, Advanced Profile
receiver dejitter off a spec-conformant 1 MHz source timestamp, an
AES-256-GCM authenticated passphrase channel for EAP, and a round of
pre-authentication hardening across the receiver, EAP/SRP, PSK key
state and URL parsing.

ABI 16:1:12, API 4.13.0. soversion is unchanged at 4, so 0.2.15 through
0.2.20 are binary-compatible.

Compile-tested on arm64-apple-darwin: modules/access/rist.c and
modules/access_output/rist.c build clean with no warnings, and every
librist symbol they reference resolves against the new static library.
As with the previous bump, librist is built here with -Duse_mbedtls=false
because mbedtls is not in this contrib tree; the VLC rist modules never
touch librist's crypto.

(cherry picked from commit 33271222639578a66c2e83e7ebf8a0eeae7d304a)

- - - - -
ab61255d by Steve Lhomme at 2026-08-03T08:36:37+02:00
NEWS: update gcrypt / librist

- - - - -


3 changed files:

- NEWS
- contrib/src/librist/SHA512SUMS
- contrib/src/librist/rules.mak


Changes:

=====================================
NEWS
=====================================
@@ -75,7 +75,7 @@ Contrib:
  * Update faad to 2.11.2
  * Update flac to 1.4.2
  * Update FFmpeg to 8.1.2
- * Update gcrypt to 1.12.0
+ * Update gcrypt to 1.12.2
  * Update glew to 2.3.1
  * Update gme to 0.6.5
  * Update gnutls to 3.8.13
@@ -106,8 +106,8 @@ Contrib:
  * Update vorbis to 1.3.7
  * Update x265 to 4.1
  * Update zlib to 1.3.2
- * Add librist 0.2.16
  * Update zvbi to 0.2.44
+ * Add librist 0.2.20
  * Switch mfx Library to Intel's vpl 2.13.0
 
 Changes between 3.0.22 and 3.0.23:


=====================================
contrib/src/librist/SHA512SUMS
=====================================
@@ -1 +1 @@
-f561e48bb0949e702ee1765f9998fdce191dfda2011855b089ae0f3552618bb5599b1b9a1c73355d1d1e8fffd1100eb8e64365d140d1c5958127738536c72704  librist-v0.2.18.tar.gz
+3553d5db0cf67ab07ff85b55e4948958aa59251c236efa7b6605fce5c8e9552bce967cbfabdb1430cb21c1343b9eeebb582aaeb64bdb569b4cbe7493b8f3844a  librist-v0.2.20.tar.gz


=====================================
contrib/src/librist/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # librist
 
-LIBRIST_VERSION := v0.2.18
+LIBRIST_VERSION := v0.2.20
 LIBRIST_URL := $(VIDEOLAN_GIT)/rist/librist/-/archive/$(LIBRIST_VERSION)/librist-$(LIBRIST_VERSION).tar.gz
 
 ifdef BUILD_NETWORK
@@ -21,6 +21,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)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/546f8cc7e739b103fa37d4e7e447b5047edbbe25...ab61255de94f9f5920958704f51202f7f22ea40f

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/546f8cc7e739b103fa37d4e7e447b5047edbbe25...ab61255de94f9f5920958704f51202f7f22ea40f
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help