[vlc-commits] [Git][videolan/vlc][master] 7 commits: extras/tools: bump autoconf to 2.71
Steve Lhomme (@robUx4)
gitlab at videolan.org
Fri May 5 14:22:53 UTC 2023
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
4606cebf by Alexandre Janniaux at 2023-05-05T13:25:45+00:00
extras/tools: bump autoconf to 2.71
- - - - -
c72d8b14 by Alexandre Janniaux at 2023-05-05T13:25:45+00:00
extras/tools: bump automake to 1.16.5
- - - - -
131683f6 by Alexandre Janniaux at 2023-05-05T13:25:45+00:00
extras/tools: bump xz to 5.4.1
- - - - -
541e54df by Alexandre Janniaux at 2023-05-05T13:25:45+00:00
extras/tools: m4: remove bison patches
- - - - -
9c340873 by Alexandre Janniaux at 2023-05-05T13:25:45+00:00
extras/tools: bump m4 to 1.4.19
- - - - -
06969d77 by Alexandre Janniaux at 2023-05-05T13:25:45+00:00
extras/tools: bump tar to 1.34
- - - - -
3a7c80c1 by Alexandre Janniaux at 2023-05-05T13:25:45+00:00
extras/tools: bump bison to 3.8.2
Fixes #28048
Fixes videolan/vlc-android#2477
- - - - -
6 changed files:
- Makefile.am
- extras/tools/SHA512SUMS
- − extras/tools/bison-macOS-7df04f9.patch
- − extras/tools/bison-macOS-c41f233c.patch
- extras/tools/packages.mak
- extras/tools/tools.mak
Changes:
=====================================
Makefile.am
=====================================
@@ -63,8 +63,6 @@ EXTRA_DIST += \
extras/tools/tools.mak \
extras/tools/SHA512SUMS \
extras/tools/automake-clang.patch \
- extras/tools/bison-macOS-7df04f9.patch \
- extras/tools/bison-macOS-c41f233c.patch \
extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch \
extras/tools/libtool-2.4.7-bitcode.patch \
extras/tools/libtool-2.4.7-clang-libs.patch \
=====================================
extras/tools/SHA512SUMS
=====================================
@@ -1,14 +1,14 @@
3954a6ad3f522c135f327ba0d376eb16ae42103849c8cc5cd6c8c6e87b8c5433c95a0f2d4dfa3e6c2705ee0b8996e5b27d0b2248f64a05fc8c902116cc45a7b2 apache-ant-1.9.7.tar.bz2
-e34c7818bcde14d2cb13cdd293ed17d70740d4d1fd7c67a07b415491ef85d42f450d4fe5f8f80cc330bf75c40a62774c51a4336e06e8da07a4cbc49922d975ee autoconf-2.69.tar.gz
-47b0120a59e3e020529a6ce750297d7de1156fd2be38db5d101e50120f11b40c28741ecd5eacf2790a9e25386713dcf7717339cfa5d7943d0dbf47c417383448 automake-1.16.1.tar.gz
+2bc5331f9807da8754b2ee623a30299cc0d103d6f98068a4c22263aab67ff148b7ad3a1646bd274e604bc08a8ef0ac2601e6422e641ad0cfab2222d60a58c5a8 autoconf-2.71.tar.gz
+248cdcc9b3ee315f1508518a8edb02e891646d990ef4fc4e5444950c397f5c91e87ca3947269dc5e0de36b051914e118c66d293f2f3f0de24403d9f2ede0ece4 automake-1.16.5.tar.gz
6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674 cmake-3.24.2.tar.gz
-29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae m4-1.4.18.tar.gz
+f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2 m4-1.4.19.tar.gz
56a9656539448972bc3080357ccc987bd4cbca3847758fe41251eb8af1a5e403a75f38d1344fa2c0bd56de880f37f3eaafbe7116c506f33331e7a8dd8a53cf2a pkg-config-0.28-1.tar.gz
6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38 ragel-6.10.tar.gz
dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573 sed-4.2.2.tar.bz2
-3bc12441bebfc388017ad0632fb3e777ceaf62be82fb19ce771df8bbb765eb094dad336110189f49f5eaaebd4d6ced586098e1e3c8b9f7f775dc483d5513f209 tar-1.26.tar.bz2
-83c50b8949b7215ab650fc9bf335e684d4bb2738357e1d002f31cfe4c77f96072e45767a0126016363e0272db880c4a5bd35b280e6f5074a466882137a477c79 xz-5.2.2.tar.bz2
-bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412 bison-3.0.4.tar.xz
+31865930401b1d9497421fa79cfb41a1a47f3bf59fcdde86b28ed4f53d7a3ceaf88d57c1dba0332d3cd76e82a3aeb31b1e4e3af54fc0d0c0ad17c9f239e8d45d tar-1.34.tar.bz2
+5a98d40c94ce496047f4dae7844252e91018c5259e7d3bd4bab0f7c8772c82ff137b0a8a263b9a6038bab893af4500009a6f14787aa1f969156fcdceb365203e xz-5.4.1.tar.bz2
+d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444 bison-3.8.2.tar.xz
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e flex-2.6.4.tar.gz
611e573756e3e936ce16b456df9583eb9acae51a0fbd28212444ddc0c1c5ec21e893d7a666bd77ef53423024939291a31dcf86d129126fa707b729d80b24184d nasm-2.13.03.tar.gz
073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 gettext-0.19.8.1.tar.gz
=====================================
extras/tools/bison-macOS-7df04f9.patch deleted
=====================================
@@ -1,48 +0,0 @@
-From 7df04f9b8a0adb1575ca0555775ec10860143cbf Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno at clisp.org>
-Date: Fri, 7 Jul 2017 23:35:32 +0200
-Subject: vasnprintf: port to macOS 10.13
-
-Improve comments in last commit.
----
- lib/vasnprintf.c | 17 ++++++++++-------
- 2 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
-index fecaf27..2e4eb19 100644
---- a/lib/vasnprintf.c
-+++ b/lib/vasnprintf.c
-@@ -4869,10 +4869,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- #endif
- *fbp = dp->conversion;
- #if USE_SNPRINTF
--# if ! (((__GLIBC__ > 2 \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
-- && !defined __UCLIBC__) \
-- || (defined __APPLE__ && defined __MACH__) \
-+# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
-+ && !defined __UCLIBC__) \
-+ || (defined __APPLE__ && defined __MACH__) \
- || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
- fbp[1] = '%';
- fbp[2] = 'n';
-@@ -4887,9 +4886,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- in format strings in writable memory may crash the program
- (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
- in this situation. */
-- /* macOS 10.13 High Sierra behaves like glibc with
-- _FORTIFY_SOURCE=2, and older macOS releases
-- presumably do not need %n. */
-+ /* On Mac OS X 10.3 or newer, we know that snprintf's return
-+ value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99
-+ and gl_SNPRINTF_TRUNCATION_C99 pass.
-+ Therefore we can avoid using %n in this situation.
-+ On Mac OS X 10.13 or newer, the use of %n in format strings
-+ in writable memory by default crashes the program, so we
-+ should avoid it in this situation. */
- /* On native Windows systems (such as mingw), we can avoid using
- %n because:
- - Although the gl_SNPRINTF_TRUNCATION_C99 test fails,
---
-cgit v1.0-41-gc330
-
=====================================
extras/tools/bison-macOS-c41f233c.patch deleted
=====================================
@@ -1,45 +0,0 @@
-From c41f233c4c38e84023a16339782ee306f03e7f59 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert at cs.ucla.edu>
-Date: Fri, 7 Jul 2017 14:10:20 -0700
-Subject: vasnprintf: port to macOS 10.13
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by comex in:
-http://lists.gnu.org/archive/html/bug-gnulib/2017-07/msg00056.html
-* lib/vasnprintf.c (VASNPRINTF): Don’t use %n on macOS.
----
- lib/vasnprintf.c | 9 ++++++++-
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
-index 9c2af0e..fecaf27 100644
---- a/lib/vasnprintf.c
-+++ b/lib/vasnprintf.c
-@@ -4869,7 +4869,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- #endif
- *fbp = dp->conversion;
- #if USE_SNPRINTF
--# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
-+# if ! (((__GLIBC__ > 2 \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
-+ && !defined __UCLIBC__) \
-+ || (defined __APPLE__ && defined __MACH__) \
-+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
- fbp[1] = '%';
- fbp[2] = 'n';
- fbp[3] = '\0';
-@@ -4883,6 +4887,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- in format strings in writable memory may crash the program
- (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
- in this situation. */
-+ /* macOS 10.13 High Sierra behaves like glibc with
-+ _FORTIFY_SOURCE=2, and older macOS releases
-+ presumably do not need %n. */
- /* On native Windows systems (such as mingw), we can avoid using
- %n because:
- - Although the gl_SNPRINTF_TRUNCATION_C99 test fails,
---
-cgit v1.0-41-gc330
-
=====================================
extras/tools/packages.mak
=====================================
@@ -12,22 +12,22 @@ CMAKE_URL=http://www.cmake.org/files/v3.24/cmake-$(CMAKE_VERSION).tar.gz
LIBTOOL_VERSION=2.4.7
LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
-AUTOCONF_VERSION=2.69
+AUTOCONF_VERSION=2.71
AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.gz
-AUTOMAKE_VERSION=1.16.1
+AUTOMAKE_VERSION=1.16.5
AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
-M4_VERSION=1.4.18
+M4_VERSION=1.4.19
M4_URL=$(GNU)/m4/m4-$(M4_VERSION).tar.gz
PKGCFG_VERSION=0.28-1
PKGCFG_URL=$(SF)/pkgconfiglite/$(PKGCFG_VERSION)/pkg-config-lite-$(PKGCFG_VERSION).tar.gz
-TAR_VERSION=1.26
+TAR_VERSION=1.34
TAR_URL=$(GNU)/tar/tar-$(TAR_VERSION).tar.bz2
-XZ_VERSION=5.2.2
+XZ_VERSION=5.4.1
XZ_URL=http://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2
RAGEL_VERSION=6.10
@@ -39,7 +39,7 @@ SED_URL=$(GNU)/sed/sed-$(SED_VERSION).tar.bz2
ANT_VERSION=1.9.7
ANT_URL=$(APACHE)/ant/binaries/apache-ant-$(ANT_VERSION)-bin.tar.bz2
-BISON_VERSION=3.0.4
+BISON_VERSION=3.8.2
BISON_URL=$(GNU)/bison/bison-$(BISON_VERSION).tar.xz
FLEX_VERSION=2.6.4
=====================================
extras/tools/tools.mak
=====================================
@@ -206,8 +206,6 @@ m4-$(M4_VERSION).tar.gz:
m4: m4-$(M4_VERSION).tar.gz
$(UNPACK)
- $(APPLY) $(TOOLS)/bison-macOS-c41f233c.patch
- $(APPLY) $(TOOLS)/bison-macOS-7df04f9.patch
$(MOVE)
.buildm4: m4
@@ -299,8 +297,6 @@ bison-$(BISON_VERSION).tar.xz:
bison: bison-$(BISON_VERSION).tar.xz
$(UNPACK)
- $(APPLY) $(TOOLS)/bison-macOS-c41f233c.patch
- $(APPLY) $(TOOLS)/bison-macOS-7df04f9.patch
$(MOVE)
.buildbison: bison
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3ad34b0dec801186cac8a1aba5304ce9359f3b3d...3a7c80c1fb7167f4ee94d50e76ec8a1545151ef8
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3ad34b0dec801186cac8a1aba5304ce9359f3b3d...3a7c80c1fb7167f4ee94d50e76ec8a1545151ef8
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