Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
b74cc3c1 by Steve Lhomme at 2026-02-07T02:35:57+00:00
contrib: gcrypt: update to 1.12.0
- - - - -
5 changed files:
- −
contrib/src/gcrypt/0001-compat-provide-a-getpid-replacement-that-works-on-Wi.patch
- contrib/src/gcrypt/SHA512SUMS
- − contrib/src/gcrypt/fix-pthread-detection.patch
- contrib/src/gcrypt/gcrypt-uwp-getpid.patch
- contrib/src/gcrypt/rules.mak
Changes:
=====================================
contrib/src/gcrypt/0001-compat-provide-a-getpid-replacement-that-works-on-Wi.patch
deleted
=====================================
@@ -1,30 +0,0 @@
-From 838958b93cea04466bb4d745e62b54f9dad595b6 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <[email protected]>
-Date: Thu, 30 Apr 2020 15:15:51 +0200
-Subject: [PATCH] compat: provide a getpid replacement that works on Windows
- XP+
-
-GetCurrentProcessId() is available since Windows XP
-
-getpid() is not allowed in UCRT builds.
-https://docs.microsoft.com/en-us/cpp/cppcx/crt-functions-not-supported-in-universal-windows-platform-apps
----
- compat/getpid.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/compat/getpid.c b/compat/getpid.c
-index 032387c3..eb0a4899 100644
---- a/compat/getpid.c
-+++ b/compat/getpid.c
-@@ -14,7 +14,7 @@
- #include <config.h>
- #endif
-
--#ifdef HAVE_W32CE_SYSTEM
-+#ifdef _WIN32
- #include <windows.h>
- #include <sys/types.h>
-
---
-2.26.0.windows.1
-
=====================================
contrib/src/gcrypt/SHA512SUMS
=====================================
@@ -1 +1 @@
-e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13
libgcrypt-1.10.1.tar.bz2
\ No newline at end of file
+9421461297bd79b14f94d1ab275c3ed93b5d433531915c5cc7a718a94d32978a46feccb7a33fe63a60780ff00d465fbe1fe9ada5c250cf6d10a525c246c63d1c
libgcrypt-1.12.0.tar.bz2
\ No newline at end of file
=====================================
contrib/src/gcrypt/fix-pthread-detection.patch deleted
=====================================
@@ -1,38 +0,0 @@
-From 54a245738b12ad8985935de0ffea24980ce48db9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <[email protected]>
-Date: Thu, 20 Apr 2017 17:26:02 +0200
-Subject: [PATCH 2/5] Fix pthread detection
-
----
- configure.ac | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6ea38f53..781f3163 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -239,7 +239,6 @@ LIBGCRYPT_THREAD_MODULES=""
- # Other definitions.
- have_w32_system=no
- have_w32ce_system=no
--have_pthread=no
-
-
- # Setup some stuff depending on host.
-@@ -828,10 +827,9 @@ AC_SUBST(PTH_LIBS)
- # Check whether pthreads is available
- #
- if test "$have_w32_system" != yes; then
-- AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes)
-- if test "$have_pthread" = yes; then
-- AC_DEFINE(HAVE_PTHREAD, 1 ,[Define if we have pthread.])
-- fi
-+ AC_SEARCH_LIBS(pthread_create, pthread,[
-+ AC_DEFINE(HAVE_PTHREAD, 1 ,[Define if we have pthread.])
-+ ])
- fi
-
-
---
-2.37.3.windows.1
-
=====================================
contrib/src/gcrypt/gcrypt-uwp-getpid.patch
=====================================
@@ -1,16 +1,31 @@
---- gcrypt/compat/libcompat.h.orig 2019-06-23 17:35:08.000000000 +0200
-+++ gcrypt/compat/libcompat.h 2023-05-23 14:09:47.426668700 +0200
-@@ -26,6 +26,13 @@ const char *_gcry_compat_identification
- #ifndef HAVE_GETPID
- pid_t _gcry_getpid (void);
- #define getpid() _gcry_getpid ()
-+#elif defined(_WIN32)
+From 7e079a2afe445eb629157a89ab2a75c104cbe151 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <[email protected]>
+Date: Tue, 23 May 2023 14:32:17 +0200
+Subject: [PATCH 4/4] void getpid calls on Windows
+
+It's not available in UWP.
+---
+ compat/libcompat.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/compat/libcompat.h b/compat/libcompat.h
+index 411a27be..90f937c6 100644
+--- a/compat/libcompat.h
++++ b/compat/libcompat.h
+@@ -22,4 +22,13 @@
+
+ const char *_gcry_compat_identification (void);
+
++#if defined(_WIN32)
+#include <winapifamily.h>
+# if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+# include <windows.h>
+ /* getpid is incorrectly detected, it's not available in this case */
+# define getpid() GetCurrentProcessId ()
+# endif
- #endif
-
- #ifndef HAVE_CLOCK
++#endif
++
+ #endif /*GCRY_LIBCOMPAT_H*/
+--
+2.52.0.windows.1
+
=====================================
contrib/src/gcrypt/rules.mak
=====================================
@@ -1,5 +1,5 @@
# GCRYPT
-GCRYPT_VERSION := 1.10.1
+GCRYPT_VERSION := 1.12.0
GCRYPT_URL := $(GNUGPG)/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
PKGS += gcrypt
@@ -21,25 +21,18 @@ gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
$(call pkg_static,"src/libgcrypt.pc.in")
# $(call update_autoconfig,build-aux)
$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
- $(APPLY) $(SRC)/gcrypt/fix-pthread-detection.patch
- $(APPLY)
$(SRC)/gcrypt/0001-compat-provide-a-getpid-replacement-that-works-on-Wi.patch
$(APPLY)
$(SRC)/gcrypt/0007-random-don-t-use-API-s-that-are-forbidden-in-UWP-app.patch
$(APPLY)
$(SRC)/gcrypt/0008-random-only-use-wincrypt-in-UWP-builds-if-WINSTORECO.patch
# don't use getpid in UWP as it's not actually available
$(APPLY) $(SRC)/gcrypt/gcrypt-uwp-getpid.patch
-ifdef HAVE_CROSS_COMPILE
- # disable cross-compiled command line tools that can't be run
- sed -i.orig -e 's,^bin_PROGRAMS ,bin_PROGRAMS_disabled ,g'
$(UNPACK_DIR)/src/Makefile.am
-endif
-
$(MOVE)
DEPS_gcrypt = gpg-error $(DEPS_gpg-error)
GCRYPT_CONF = \
--enable-ciphers=aes,des,rfc2268,arcfour,chacha20 \
- --enable-digests=sha1,md5,rmd160,sha256,sha512,blake2 \
+ --enable-digests=sha1,md5,rmd160,sha256,sha512,blake2,sha3 \
--enable-pubkey-ciphers=dsa,rsa,ecc \
--disable-doc
@@ -71,6 +64,6 @@ endif
$(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(GCRYPT_CONF)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+ +$(MAKEBUILD) bin_PROGRAMS=
+ +$(MAKEBUILD) bin_PROGRAMS= install
touch $@
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/b74cc3c13dceca4a7016a35ac58a3e2033233849
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/b74cc3c13dceca4a7016a35ac58a3e2033233849
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
