[vlc-devel] [PATCH] contrib: wine-headers update to 5.5

Biswapriyo Nath nathbappai at gmail.com
Sat Mar 28 06:22:23 CET 2020


-------------- next part --------------
From 4f979890ca9a24569f230d559e919d74bc799878 Mon Sep 17 00:00:00 2001
From: Biswa96 <nathbappai at gmail.com>
Date: Wed, 25 Mar 2020 12:16:36 +0530
Subject: [PATCH] contrib: gcrypt update to 1.8.5

---
 ...-t-assume-that-_WIN64-implies-x86_64.patch | 43 -------------------
 contrib/src/gcrypt/SHA512SUMS                 |  2 +-
 contrib/src/gcrypt/clang-mips64.patch         | 12 ------
 .../gcrypt/disable-tests-compilation.patch    |  2 +-
 .../src/gcrypt/fix-pthread-detection.patch    |  6 +--
 contrib/src/gcrypt/rules.mak                  | 10 +----
 contrib/src/gcrypt/winrt.patch                | 42 +++++++++---------
 7 files changed, 29 insertions(+), 88 deletions(-)
 delete mode 100644 contrib/src/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch
 delete mode 100644 contrib/src/gcrypt/clang-mips64.patch

diff --git a/contrib/src/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch b/contrib/src/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch
deleted file mode 100644
index 7eb16ce..0000000
--- a/contrib/src/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ed41d6d6fb4551342b22ef763de1bd60e964e186 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Thu, 22 Mar 2018 23:32:36 +0200
-Subject: [PATCH 1/2] random: Don't assume that _WIN64 implies x86_64
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* random/rndw32.c: Change _WIN64 ifdef into __x86_64__.
---
-
-This fixes building this file for windows on aarch64.
-
-Signed-off-by: Martin Storsjö <martin at martin.st>
----
- random/rndw32.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/random/rndw32.c b/random/rndw32.c
-index 7e9ac50..08a8867 100644
---- a/random/rndw32.c
-+++ b/random/rndw32.c
-@@ -986,7 +986,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t,
- 
-      On AMD64, TSC is always available and intrinsic is provided for accessing
-      it.  */
--#ifdef __WIN64__
-+#ifdef __x86_64__
-     {
-       unsigned __int64 aint64;
- 
-@@ -1024,7 +1024,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t,
-           (*add) (&aword, sizeof (aword), origin );
-         }
-     }
--#endif /*__WIN64__*/
-+#endif /*__x86_64__*/
- 
- 
- }
--- 
-2.7.4
-
diff --git a/contrib/src/gcrypt/SHA512SUMS b/contrib/src/gcrypt/SHA512SUMS
index 13c0291..eb69517 100644
--- a/contrib/src/gcrypt/SHA512SUMS
+++ b/contrib/src/gcrypt/SHA512SUMS
@@ -1 +1 @@
-c76d9c9dfb2b831177848b0df7e41d05d1587d28af5322ab0518c9200cdcb1470413940a414036559e7bbed3e24d2e89340f7f06026697f65492c00761cc6385  libgcrypt-1.7.10.tar.bz2
+b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89  libgcrypt-1.8.5.tar.bz2
diff --git a/contrib/src/gcrypt/clang-mips64.patch b/contrib/src/gcrypt/clang-mips64.patch
deleted file mode 100644
index 7018cec..0000000
--- a/contrib/src/gcrypt/clang-mips64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libgcrypt.orig/mpi/longlong.h libgcrypt/mpi/longlong.h
---- libgcrypt.orig/mpi/longlong.h	2016-06-08 18:18:15.000000000 +0200
-+++ libgcrypt/mpi/longlong.h	2016-08-30 12:56:30.751262074 +0200
-@@ -890,7 +890,7 @@
-  **************  MIPS/64  **************
-  ***************************************/
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--# if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+# if defined (__clang__) || (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
- typedef unsigned int UTItype __attribute__ ((mode (TI)));
- #  define umul_ppmm(w1, w0, u, v) \
-   do {                                                                 \
diff --git a/contrib/src/gcrypt/disable-tests-compilation.patch b/contrib/src/gcrypt/disable-tests-compilation.patch
index 89672e4..f73095e 100644
--- a/contrib/src/gcrypt/disable-tests-compilation.patch
+++ b/contrib/src/gcrypt/disable-tests-compilation.patch
@@ -1,6 +1,6 @@
 --- libgcrypt-1.7.3/Makefile.am.orig	2016-08-24 15:10:23.181783280 +0200
 +++ libgcrypt-1.7.3/Makefile.am	2016-08-24 15:11:19.813780757 +0200
-@@ -31,8 +31,8 @@
+@@ -40,8 +40,8 @@
  endif
  
  
diff --git a/contrib/src/gcrypt/fix-pthread-detection.patch b/contrib/src/gcrypt/fix-pthread-detection.patch
index 8c69aba..e274e12 100644
--- a/contrib/src/gcrypt/fix-pthread-detection.patch
+++ b/contrib/src/gcrypt/fix-pthread-detection.patch
@@ -1,14 +1,14 @@
 --- libgcrypt/configure.ac.old	2017-04-20 16:49:00.239092950 +0200
 +++ libgcrypt/configure.ac	2017-04-20 16:57:18.205011934 +0200
-@@ -215,7 +215,6 @@
- print_egd_notice=no
+@@ -214,7 +214,6 @@
+ # Other definitions.
  have_w32_system=no
  have_w32ce_system=no
 -have_pthread=no
  
  
  # Setup some stuff depending on host.
-@@ -751,10 +750,9 @@
+@@ -749,10 +748,9 @@
  # Check whether pthreads is available
  #
  if test "$have_w32_system" != yes; then
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 0e57d1f..eb33460 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -1,6 +1,6 @@
 # GCRYPT
-GCRYPT_VERSION := 1.7.10
-GCRYPT_URL := http://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
+GCRYPT_VERSION := 1.8.5
+GCRYPT_URL := https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 
 PKGS += gcrypt
 ifeq ($(call need_pkg,"libgcrypt"),)
@@ -16,18 +16,12 @@ gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
 	$(UNPACK)
 	$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
 	$(APPLY) $(SRC)/gcrypt/fix-pthread-detection.patch
-	$(APPLY) $(SRC)/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch
 	$(APPLY) $(SRC)/gcrypt/0002-aarch64-mpi-Fix-building-the-mpi-aarch64-assembly-fo.patch
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/gcrypt/winrt.patch
 endif
 ifdef HAVE_WIN64
 	$(APPLY) $(SRC)/gcrypt/64bits-relocation.patch
-endif
-ifeq ($(CC), clang)
-ifeq ($(ARCH),mips64el)
-	$(APPLY) $(SRC)/gcrypt/clang-mips64.patch
-endif
 endif
 	$(MOVE)
 
diff --git a/contrib/src/gcrypt/winrt.patch b/contrib/src/gcrypt/winrt.patch
index fdceb26..70ae609 100644
--- a/contrib/src/gcrypt/winrt.patch
+++ b/contrib/src/gcrypt/winrt.patch
@@ -14,7 +14,7 @@
  
  
  /* When we query the performance counters, we allocate an initial buffer and
-@@ -234,7 +239,9 @@ static NTQUERYSYSTEMINFORMATION  pNtQuer
+@@ -234,7 +239,9 @@
  static NTQUERYINFORMATIONPROCESS pNtQueryInformationProcess;
  static NTPOWERINFORMATION        pNtPowerInformation;
  
@@ -24,7 +24,7 @@
  static CRYPTACQUIRECONTEXT pCryptAcquireContext;
  static CRYPTGENRANDOM      pCryptGenRandom;
  static CRYPTRELEASECONTEXT pCryptReleaseContext;
-@@ -259,6 +266,12 @@ init_system_rng (void)
+@@ -260,6 +267,12 @@
    system_rng_available = 0;
    hRNGProv = NULL;
  
@@ -37,7 +37,7 @@
    hAdvAPI32 = GetModuleHandle ("AdvAPI32.dll");
    if (!hAdvAPI32)
      return;
-@@ -274,6 +287,7 @@ init_system_rng (void)
+@@ -275,6 +288,7 @@
       This isn't exported by name, so we have to get it by ordinal.  */
    pRtlGenRandom = (RTLGENRANDOM)
      GetProcAddress (hAdvAPI32, "SystemFunction036");
@@ -45,7 +45,7 @@
  
    /* Try and connect to the PIII RNG CSP.  The AMD 768 southbridge (from
       the 760 MP chipset) also has a hardware RNG, but there doesn't appear
-@@ -286,7 +300,9 @@ init_system_rng (void)
+@@ -287,7 +301,9 @@
                                    PROV_INTEL_SEC, 0) )
         && !pRtlGenRandom)
      {
@@ -55,7 +55,7 @@
      }
    else
      system_rng_available = 1;
-@@ -312,11 +328,13 @@ read_system_rng (void (*add)(const void*
+@@ -313,11 +329,13 @@
        if (pCryptGenRandom (hRNGProv, SYSTEMRNG_BYTES, buffer))
          quality = 80;
      }
@@ -69,7 +69,7 @@
    if (quality > 0)
      {
        if (debug_me)
-@@ -337,6 +355,7 @@ read_mbm_data (void (*add)(const void*,
+@@ -338,6 +356,7 @@
    HANDLE hMBMData;
    SharedData *mbmDataPtr;
  
@@ -77,7 +77,7 @@
    hMBMData = OpenFileMapping (FILE_MAP_READ, FALSE, "$M$B$M$5$S$D$" );
    if (hMBMData)
      {
-@@ -351,6 +370,7 @@ read_mbm_data (void (*add)(const void*,
+@@ -352,6 +371,7 @@
          }
        CloseHandle (hMBMData);
      }
@@ -85,7 +85,7 @@
  }
  
  
-@@ -359,6 +379,7 @@ static void
+@@ -360,6 +380,7 @@
  registry_poll (void (*add)(const void*, size_t, enum random_origins),
                 enum random_origins requester)
  {
@@ -93,7 +93,7 @@
    static int cbPerfData = PERFORMANCE_BUFFER_SIZE;
    int iterations;
    DWORD dwSize, status;
-@@ -478,6 +499,7 @@ registry_poll (void (*add)(const void*,
+@@ -479,6 +500,7 @@
       isn't done then any system components which provide performance data
       can't be removed or changed while the handle remains active.  */
    RegCloseKey (HKEY_PERFORMANCE_DATA);
@@ -101,7 +101,7 @@
  }
  
  
-@@ -496,6 +518,7 @@ slow_gatherer ( void (*add)(const void*,
+@@ -497,6 +519,7 @@
  
    if ( !is_initialized )
      {
@@ -109,7 +109,7 @@
        HKEY hKey;
  
        if ( debug_me )
-@@ -565,6 +588,7 @@ slow_gatherer ( void (*add)(const void*,
+@@ -566,6 +589,7 @@
            if (!pNtQuerySystemInformation || !pNtQueryInformationProcess)
              hNTAPI = NULL;
          }
@@ -117,7 +117,7 @@
  
  
        is_initialized = 1;
-@@ -594,6 +618,7 @@ slow_gatherer ( void (*add)(const void*,
+@@ -595,6 +619,7 @@
        }
    }
  
@@ -125,7 +125,7 @@
    /* Get disk I/O statistics for all the hard drives.  100 is an
       arbitrary failsafe limit.  */
    for (drive_no = 0; drive_no < 100 ; drive_no++)
-@@ -628,6 +653,7 @@ slow_gatherer ( void (*add)(const void*,
+@@ -629,6 +654,7 @@
          }
        CloseHandle (hDevice);
      }
@@ -133,24 +133,26 @@
  
    /* In theory we should be using the Win32 performance query API to obtain
       unpredictable data from the system, however this is so unreliable (see
-@@ -786,12 +812,16 @@ _gcry_rndw32_gather_random (void (*add)(
+@@ -788,6 +814,7 @@
  
    if (!is_initialized)
      {
 +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
        OSVERSIONINFO osvi = { sizeof( osvi ) };
+       const char *s;
  
-       GetVersionEx( &osvi );
+@@ -798,7 +825,9 @@
        if (osvi.dwPlatformId != VER_PLATFORM_WIN32_NT)
          log_fatal ("can only run on a Windows NT platform\n" );
        system_is_w2000 = (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0);
+-
 +#else
 +      system_is_w2000 = 0;
 +#endif
        init_system_rng ();
        is_initialized = 1;
      }
-@@ -842,14 +872,11 @@ _gcry_rndw32_gather_random_fast (void (*
+@@ -856,14 +885,11 @@
                          ADDINT((SIZE_T)aptr);                      \
                        } while (0)
  
@@ -166,7 +168,7 @@
      ADDPTR ( GetDesktopWindow ());
      ADDPTR ( GetFocus ());
      ADDINT ( GetInputState ());
-@@ -858,6 +885,11 @@ _gcry_rndw32_gather_random_fast (void (*
+@@ -872,6 +898,11 @@
      ADDPTR ( GetOpenClipboardWindow ());
      ADDPTR ( GetProcessHeap ());
      ADDPTR ( GetProcessWindowStation ());
@@ -178,7 +180,7 @@
      /* Following function in some cases stops returning events, and cannot
         be used as an entropy source.  */
      /*ADDINT ( GetQueueStatus (QS_ALLEVENTS));*/
-@@ -871,6 +903,7 @@ _gcry_rndw32_gather_random_fast (void (*
+@@ -885,6 +916,7 @@
  
    /* Get multiword system information: Current caret position, current
       mouse cursor position.  */
@@ -186,7 +188,7 @@
    {
      POINT point;
  
-@@ -922,10 +955,12 @@ _gcry_rndw32_gather_random_fast (void (*
+@@ -936,10 +968,12 @@
      (*add) ( &minimumWorkingSetSize, sizeof (int), origin );
      (*add) ( &maximumWorkingSetSize, sizeof (int), origin );
    }
@@ -199,7 +201,7 @@
    if (!addedFixedItems)
      {
        STARTUPINFO startupInfo;
-@@ -938,6 +973,7 @@ _gcry_rndw32_gather_random_fast (void (*
+@@ -952,6 +986,7 @@
        (*add) ( &startupInfo, sizeof (STARTUPINFO), origin );
        addedFixedItems = 1;
      }
-- 
2.25.2



More information about the vlc-devel mailing list