[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: update nettle to 3.7.3
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Mon May 30 10:41:40 UTC 2022
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
263b3cbb by Marvin Scholz at 2022-05-30T09:56:23+00:00
contrib: update nettle to 3.7.3
- - - - -
baf4be7c by Marvin Scholz at 2022-05-30T09:56:23+00:00
contrib: update gmp to 6.2.1
- - - - -
10 changed files:
- contrib/src/gmp/SHA512SUMS
- − contrib/src/gmp/arm64-Add-GSYM_PREFIX-to-function-calls-in-assembly.patch
- − contrib/src/gmp/arm64-Change-adrp-add-relocations-to-darwin-style.patch
- − contrib/src/gmp/ppc64.patch
- contrib/src/gmp/rules.mak
- − contrib/src/gmp/tests-mpn-t-sqrlo.c-Initialise-scratch-area.patch
- − contrib/src/gmp/win-arm64.patch
- contrib/src/nettle/SHA512SUMS
- − contrib/src/nettle/fix-cc-for-build.patch
- contrib/src/nettle/rules.mak
Changes:
=====================================
contrib/src/gmp/SHA512SUMS
=====================================
@@ -1 +1 @@
-268db88447174617f5746d9a6ba2b105940cc1a5e73155eb23b6eedf55f8e7724eda05d161b2de19aca9e794956d226ba9ed6f23124c7c82f7e1872e32b003cf gmp-6.1.2.tar.bz2
+c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 gmp-6.2.1.tar.xz
=====================================
contrib/src/gmp/arm64-Add-GSYM_PREFIX-to-function-calls-in-assembly.patch deleted
=====================================
@@ -1,32 +0,0 @@
-From 2612d34f216ec3e60b3f1b1165dc9935e4c2e2a5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Tue, 4 Aug 2020 13:45:54 +0300
-Subject: [PATCH 3/4] arm64: Add GSYM_PREFIX to function calls in assembly
-
----
- mpn/arm64/gcd_1.asm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mpn/arm64/gcd_1.asm b/mpn/arm64/gcd_1.asm
-index bc03d80dd..9c267cb07 100644
---- a/mpn/arm64/gcd_1.asm
-+++ b/mpn/arm64/gcd_1.asm
-@@ -82,13 +82,13 @@ C Both U and V are single limbs, reduce with bmod if u0 >> v0.
- b.hi L(red1)
-
- L(bmod):mov x3, #0 C carry argument
-- bl mpn_modexact_1c_odd
-+ bl GSYM_PREFIX`'mpn_modexact_1c_odd
- b L(red0)
-
- L(nby1):cmp n, #BMOD_1_TO_MOD_1_THRESHOLD
- b.lo L(bmod)
-
-- bl mpn_mod_1
-+ bl GSYM_PREFIX`'mpn_mod_1
-
- L(red0):mov x3, x0
- L(red1):cmp x3, #0
---
-2.24.3 (Apple Git-128)
-
=====================================
contrib/src/gmp/arm64-Change-adrp-add-relocations-to-darwin-style.patch deleted
=====================================
@@ -1,28 +0,0 @@
-From 056fbee0d76491b5f19f5741e9bf9178c03de7dc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Tue, 4 Aug 2020 13:12:49 +0300
-Subject: [PATCH 2/4] arm64: Change adrp/add relocations to darwin style
-
----
- mpn/arm64/invert_limb.asm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mpn/arm64/invert_limb.asm b/mpn/arm64/invert_limb.asm
-index a94b0e961..bb876d97c 100644
---- a/mpn/arm64/invert_limb.asm
-+++ b/mpn/arm64/invert_limb.asm
-@@ -41,9 +41,9 @@ C Compiler generated, mildly edited. Could surely be further optimised.
- ASM_START()
- PROLOGUE(mpn_invert_limb)
- lsr x2, x0, #54
-- adrp x1, approx_tab
-+ adrp x1, approx_tab at PAGE
- and x2, x2, #0x1fe
-- add x1, x1, :lo12:approx_tab
-+ add x1, x1, approx_tab at PAGEOFF
- ldrh w3, [x1,x2]
- lsr x4, x0, #24
- add x4, x4, #1
---
-2.24.3 (Apple Git-128)
-
=====================================
contrib/src/gmp/ppc64.patch deleted
=====================================
@@ -1,26 +0,0 @@
-
-Signed-off-by: Armin Kuster <akuster808 at gmail.com>
-
-This patch with pulled from gmp.
-https://gmplib.org/repo/gmp/rev/4a6d258b467f
-Upstream-Status: Backport
-
-# HG changeset patch
-# User Torbjorn Granlund <tege at gmplib.org>
-# Date 1395835068 -3600
-# Node ID 4a6d258b467f661da0894cc60ecd060f2e3c67c7
-# Parent 301ce2788826a2d4d2725bd5cf01e998638db37a
-Provide default for BMOD_1_TO_MOD_1_THRESHOLD.
-
-diff -r 301ce2788826 -r 4a6d258b467f mpn/powerpc64/mode64/gcd_1.asm
---- a/mpn/powerpc64/mode64/gcd_1.asm Tue Mar 25 15:34:52 2014 +0100
-+++ b/mpn/powerpc64/mode64/gcd_1.asm Wed Mar 26 12:57:48 2014 +0100
-@@ -43,6 +43,9 @@
- define(`n', `r4')
- define(`v0', `r5')
-
-+ifdef(`BMOD_1_TO_MOD_1_THRESHOLD',,
-+ `define(`BMOD_1_TO_MOD_1_THRESHOLD',30)')
-+
- EXTERN_FUNC(mpn_mod_1)
- EXTERN_FUNC(mpn_modexact_1c_odd)
=====================================
contrib/src/gmp/rules.mak
=====================================
@@ -1,7 +1,7 @@
# GNU Multiple Precision Arithmetic
-GMP_VERSION := 6.1.2
-GMP_URL := https://gmplib.org/download/gmp-$(GMP_VERSION)/gmp-$(GMP_VERSION).tar.bz2
+GMP_VERSION := 6.2.1
+GMP_URL := https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.xz
GMP_CONF :=
@@ -20,21 +20,14 @@ GMP_CONF += --disable-assembly
endif
endif
-$(TARBALLS)/gmp-$(GMP_VERSION).tar.bz2:
+$(TARBALLS)/gmp-$(GMP_VERSION).tar.xz:
$(call download_pkg,$(GMP_URL),gmp)
-.sum-gmp: gmp-$(GMP_VERSION).tar.bz2
+.sum-gmp: gmp-$(GMP_VERSION).tar.xz
-gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp
+gmp: gmp-$(GMP_VERSION).tar.xz .sum-gmp
$(UNPACK)
- $(APPLY) $(SRC)/gmp/ppc64.patch
- $(APPLY) $(SRC)/gmp/win-arm64.patch
$(APPLY) $(SRC)/gmp/gmp-fix-asm-detection.patch
- $(APPLY) $(SRC)/gmp/tests-mpn-t-sqrlo.c-Initialise-scratch-area.patch
- $(APPLY) $(SRC)/gmp/arm64-Add-GSYM_PREFIX-to-function-calls-in-assembly.patch
-ifdef HAVE_DARWIN_OS
- $(APPLY) $(SRC)/gmp/arm64-Change-adrp-add-relocations-to-darwin-style.patch
-endif
# do not try the cross compiler to detect the build compiler
cd $(UNPACK_DIR) && sed -i.orig 's/"$$CC" "$$CC $$CFLAGS $$CPPFLAGS" cc gcc c89 c99/cc gcc c89 c99/' acinclude.m4
$(MOVE)
=====================================
contrib/src/gmp/tests-mpn-t-sqrlo.c-Initialise-scratch-area.patch deleted
=====================================
@@ -1,27 +0,0 @@
-From 02ee915921172c416fe0ccf7c6322b77196cdaa1 Mon Sep 17 00:00:00 2001
-From: Marco Bodrato <bodrato at mail.dm.unipi.it>
-Date: Fri, 20 Sep 2019 20:35:11 +0200
-Subject: [PATCH 4/4] tests/mpn/t-sqrlo.c: Initialise scratch area.
-
----
- tests/mpn/t-sqrlo.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/mpn/t-sqrlo.c b/tests/mpn/t-sqrlo.c
-index 96caddc6f..be2b1eeac 100644
---- a/tests/mpn/t-sqrlo.c
-+++ b/tests/mpn/t-sqrlo.c
-@@ -93,10 +93,8 @@ main (int argc, char **argv)
- p_after = pp[n];
-
- itch = mpn_sqrlo_itch (n);
--#if 0
- ASSERT_ALWAYS (itch <= mpn_sqrlo_itch (MAX_N));
- mpn_random2 (scratch-1, itch+2);
--#endif
- s_before = scratch[-1];
- s_after = scratch[itch];
-
---
-2.24.3 (Apple Git-128)
-
=====================================
contrib/src/gmp/win-arm64.patch deleted
=====================================
@@ -1,55 +0,0 @@
-From 7b969bbb2e3a0ec9a173a7ddf276b2a03e14452b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Mon, 19 Mar 2018 23:46:02 +0200
-Subject: [PATCH] Add support for building for windows on aarch64
-
-Just as on windows/x86_64, "long" still is 32 bit; tweak the
-arm/aarch64 ABI check to test sizeof(void*) instead of sizeof(long),
-and use long long for mp_limb_t for mingw targets.
----
- acinclude.m4 | 4 ++--
- configure.ac | 6 ++++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 2ea5f5a..6eb7343 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -907,8 +907,8 @@ dnl a workaround for a HP compiler bug.
-
- AC_DEFUN([GMP_C_TEST_SIZEOF],
- [echo "configure: testlist $2" >&AC_FD_CC
--[gmp_sizeof_type=`echo "$2" | sed 's/sizeof-\([a-z]*\).*/\1/'`]
--[gmp_sizeof_want=`echo "$2" | sed 's/sizeof-[a-z]*-\([0-9]*\).*/\1/'`]
-+[gmp_sizeof_type=`echo "$2" | sed 's/sizeof-\([a-z\*]*\).*/\1/'`]
-+[gmp_sizeof_want=`echo "$2" | sed 's/sizeof-[a-z\*]*-\([0-9]*\).*/\1/'`]
- AC_MSG_CHECKING([compiler $1 has sizeof($gmp_sizeof_type)==$gmp_sizeof_want])
- cat >conftest.c <<EOF
- [int
-diff --git a/configure.ac b/configure.ac
-index e42599b..071fff0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -602,8 +602,8 @@ case $host in
- CALLING_CONVENTIONS_OBJS='arm32call.lo arm32check.lo'
- CALLING_CONVENTIONS_OBJS_64=""
- cclist_64="gcc cc"
-- any_32_testlist="sizeof-long-4"
-- any_64_testlist="sizeof-long-8"
-+ any_32_testlist="sizeof-void*-4"
-+ any_64_testlist="sizeof-void*-8"
-
- # This is needed for clang, which is not content with flags like -mfpu=neon
- # alone.
-@@ -612,6 +612,8 @@ case $host in
- gcc_cflags_fpmode="-mfloat-abi=softfp" ;;
- *-*-*eabihf)
- gcc_cflags_fpmode="-mfloat-abi=hard" ;;
-+ *-*-mingw*)
-+ limb_64=longlong ;;
- esac
-
- # FIXME: We make mandatory compiler options optional here. We should
---
-2.7.4
-
=====================================
contrib/src/nettle/SHA512SUMS
=====================================
@@ -1 +1 @@
-26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f nettle-3.4.1.tar.gz
+9901eba305421adff6d551ac7f478dff3f68a339d444c776724ab0b977fe6be792b1d2950c8705acbe76bd924fd6d898a65eded546777884be3b436d0e052437 nettle-3.7.3.tar.gz
=====================================
contrib/src/nettle/fix-cc-for-build.patch deleted
=====================================
@@ -1,34 +0,0 @@
-From 91df68136ad1562cf9217599254706d8cfa970ea Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud at savoirfairelinux.com>
-Date: Sun, 20 Sep 2020 19:35:54 +0200
-Subject: [PATCH] m4: follow GMP changes for GMP_PROG_CC_FOR_BUILD
-
----
- aclocal.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 513b2df4..e81e0351 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -369,7 +369,7 @@ cat >conftest.c <<EOF
- int
- main ()
- {
-- exit(0);
-+ return 0;
- }
- EOF
- gmp_compile="$1 conftest.c"
-@@ -410,7 +410,7 @@ else
- int
- main ()
- {
-- exit (0);
-+ return 0;
- }
- EOF
- for i in .exe ,ff8 ""; do
---
-GitLab
-
=====================================
contrib/src/nettle/rules.mak
=====================================
@@ -1,6 +1,6 @@
# Nettle
-NETTLE_VERSION := 3.4.1
+NETTLE_VERSION := 3.7.3
NETTLE_URL := $(GNU)/nettle/nettle-$(NETTLE_VERSION).tar.gz
ifeq ($(call need_pkg,"nettle >= 3.4.1"),)
@@ -21,7 +21,6 @@ $(TARBALLS)/nettle-$(NETTLE_VERSION).tar.gz:
nettle: nettle-$(NETTLE_VERSION).tar.gz .sum-nettle
$(UNPACK)
- $(APPLY) $(SRC)/nettle/fix-cc-for-build.patch
$(MOVE)
DEPS_nettle = gmp $(DEPS_gmp)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6b9336b5dacde19d5d48672d3d666744729fc373...baf4be7ca6080aad8bffc3f03e5b7f821ca2b6b0
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6b9336b5dacde19d5d48672d3d666744729fc373...baf4be7ca6080aad8bffc3f03e5b7f821ca2b6b0
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list