[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: ssh2: do not use libgcrypt on Windows

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
9a234251 by Steve Lhomme at 2026-03-14T14:35:04+00:00
contrib: ssh2: do not use libgcrypt on Windows

Use wincng (bcrypt) instead that is available since Windows Vista.

- - - - -
9e55e5ef by Steve Lhomme at 2026-03-14T14:35:04+00:00
contrib: ssh2: update to 1.11.1

Changelog: https://libssh2.org/changes.html

- - - - -
c78ab119 by Steve Lhomme at 2026-03-14T14:35:04+00:00
contrib: ssh2: build with cmake

- - - - -


2 changed files:

- contrib/src/ssh2/SHA512SUMS
- contrib/src/ssh2/rules.mak


Changes:

=====================================
contrib/src/ssh2/SHA512SUMS
=====================================
@@ -1 +1 @@
-ef85e152dc252bd9b1c05276972b9c22313f5d492743dde090235742746d67f634f2a419eff9162132e2274c8582113b75279b074e0c7b34b2526b92fd1a1e8e  libssh2-1.11.0.tar.gz
+8322b54a522b0cbbb07916d29ec045c08f8ed94bd8abb5e524038640e90a317667a25be46d95b62b101ed726ade0a51a90fb246cf34c045c38f927f4e439e431  libssh2-1.11.1.tar.xz


=====================================
contrib/src/ssh2/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # ssh2
 
-LIBSSH2_VERSION := 1.11.0
-LIBSSH2_URL := https://www.libssh2.org/download/libssh2-$(LIBSSH2_VERSION).tar.gz
+LIBSSH2_VERSION := 1.11.1
+LIBSSH2_URL := https://www.libssh2.org/download/libssh2-$(LIBSSH2_VERSION).tar.xz
 
 ifdef BUILD_NETWORK
 PKGS += ssh2
@@ -10,28 +10,35 @@ ifeq ($(call need_pkg,"libssh2"),)
 PKGS_FOUND += ssh2
 endif
 
-$(TARBALLS)/libssh2-$(LIBSSH2_VERSION).tar.gz:
+$(TARBALLS)/libssh2-$(LIBSSH2_VERSION).tar.xz:
 	$(call download_pkg,$(LIBSSH2_URL),ssh2)
 
-.sum-ssh2: libssh2-$(LIBSSH2_VERSION).tar.gz
+.sum-ssh2: libssh2-$(LIBSSH2_VERSION).tar.xz
 
-ssh2: libssh2-$(LIBSSH2_VERSION).tar.gz .sum-ssh2
+ssh2: libssh2-$(LIBSSH2_VERSION).tar.xz .sum-ssh2
 	$(UNPACK)
-	$(call update_autoconfig,.)
-	$(call pkg_static,"libssh2.pc.in")
 	$(MOVE)
 
-DEPS_ssh2 = gcrypt $(DEPS_gcrypt)
+DEPS_ssh2 =
+ifndef HAVE_WIN32
+DEPS_ssh2 += gcrypt $(DEPS_gcrypt)
+else
 ifdef HAVE_WINSTORE
 # uses SecureZeroMemory
 DEPS_ssh2 += alloweduwp $(DEPS_alloweduwp)
 endif
+endif
 
-SSH2_CONF := --disable-examples-build --disable-tests --with-crypto=libgcrypt
+SSH2_CONF := -DBUILD_EXAMPLES=OFF -DLIBSSH2_BUILD_DOCS=OFF
+ifndef HAVE_WIN32
+SSH2_CONF += -DCRYPTO_BACKEND:STRING=Libgcrypt
+else
+SSH2_CONF += -DCRYPTO_BACKEND:STRING=WinCNG
+endif
 
-.ssh2: ssh2
-	$(MAKEBUILDDIR)
-	$(MAKECONFIGURE) $(SSH2_CONF)
-	+$(MAKEBUILD)
-	+$(MAKEBUILD) install
+.ssh2: ssh2 toolchain.cmake
+	$(CMAKECLEAN)
+	$(HOSTVARS_CMAKE) $(CMAKE) $(SSH2_CONF)
+	+$(CMAKEBUILD)
+	$(CMAKEINSTALL)
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d77c72b0013421997fe292e83ffdb70b7502b019...c78ab119ae03152cf43b5a512f7076a566f98fa0

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d77c72b0013421997fe292e83ffdb70b7502b019...c78ab119ae03152cf43b5a512f7076a566f98fa0
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance