[vlc-commits] [Git][videolan/vlc][3.0.x] 8 commits: contrib: harfbuzz: build ragel as a native tool
Steve Lhomme (@robUx4)
gitlab at videolan.org
Mon Sep 8 14:33:49 UTC 2025
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
10b100d4 by Steve Lhomme at 2025-09-08T13:01:54+00:00
contrib: harfbuzz: build ragel as a native tool
Fixes #28634
(cherry picked from commit 8c9891d4bb7f7c146abb17606e7528f6d0209ea3)
- - - - -
21ca61bd by Steve Lhomme at 2025-09-08T13:01:54+00:00
contrib: harfbuff: build internal ragel if not found
(cherry picked from commit 071a7581ff4e7366972218e340abfe6e6c2c1686)
- - - - -
7dedd030 by Steve Lhomme at 2025-09-08T13:01:54+00:00
tools: don't build ragel
It's only used by harfbuzz which has its own internal version.
(cherry picked from commit c0470455a92077db5b840d5bd31f3dc45e95e7d4) (edited)
edited:
- the code around is slightly different
- - - - -
b9865af9 by Steve Lhomme at 2025-09-08T13:01:54+00:00
contrib: harfbuzz: update to 11.4.4
In the 3.4.0 update commit 6e3bfdbf1157133dc41ebcdb65d9d7b56e182ec2,
the 4.0 version was described as having massive API changes. However
libass, our plugin and Qt all build fine with this version.
Debian trixie uses 10.2.0 [^1].
[^1]: https://packages.debian.org/trixie/libharfbuzz-dev
(cherry picked from commit 775a1047bf29aefbc24ca4594ef4874cd963b1ba)
- - - - -
4997358d by Steve Lhomme at 2025-09-08T13:01:54+00:00
contrib: gmp: build all code before installing for autotools contribs
If the contrib install sub-directories it may install some and fail later. We
should only install when we know everything built correctly.
Do each build step in a separate make line.
Similar to 8a2109a3947ef513e64e9ccae4f85e9399a7d243 for gmp without the macros.
- - - - -
adea2f6a by Steve Lhomme at 2025-09-08T13:01:54+00:00
contrib:gmp: do not try to detect assembler format when assembler is disabled
(cherry picked from commit 0feb493b2146493b32e74bc4f49cd768d25562e5)
- - - - -
17e0a294 by Marvin Scholz at 2025-09-08T13:01:54+00:00
contrib: update gmp to 6.2.1
(cherry picked from commit baf4be7ca6080aad8bffc3f03e5b7f821ca2b6b0)
- - - - -
a8411f9c by Steve Lhomme at 2025-09-08T13:01:54+00:00
contrib: gmp: update to 6.3.0
It should be handling arm64 much better.
(cherry picked from commit 9a078736ce748c4cf2935c4c3b9368922ea5a0a3)
- - - - -
18 changed files:
- Makefile.am
- 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/gmp-fix-asm-detection.patch
- − contrib/src/gmp/ppc64.patch
- contrib/src/gmp/rules.mak
- − contrib/src/gmp/win-arm64.patch
- − contrib/src/harfbuzz/0001-freetype-Fix-function-signatures-to-match-without-ca.patch
- − contrib/src/harfbuzz/0001-meson-Enable-big-objects-support-when-building-for-w.patch
- − contrib/src/harfbuzz/0002-Disable-Wcast-function-type-strict.patch
- contrib/src/harfbuzz/SHA512SUMS
- contrib/src/harfbuzz/rules.mak
- extras/tools/SHA512SUMS
- extras/tools/bootstrap
- extras/tools/packages.mak
- − extras/tools/ragel-6.8-javacodegen.patch
- extras/tools/tools.mak
Changes:
=====================================
Makefile.am
=====================================
@@ -64,8 +64,7 @@ EXTRA_DIST += \
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/libtool-2.4.7-response-files.patch \
- extras/tools/ragel-6.8-javacodegen.patch
+ extras/tools/libtool-2.4.7-response-files.patch
###############################################################################
# Various utilities ( editor syntax files, D-Bus controller ... )
=====================================
contrib/src/gmp/SHA512SUMS
=====================================
@@ -1 +1 @@
-268db88447174617f5746d9a6ba2b105940cc1a5e73155eb23b6eedf55f8e7724eda05d161b2de19aca9e794956d226ba9ed6f23124c7c82f7e1872e32b003cf gmp-6.1.2.tar.bz2
+e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2 gmp-6.3.0.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/gmp-fix-asm-detection.patch
=====================================
@@ -0,0 +1,11 @@
+--- gmp/configure.ac.asm 2018-06-25 13:50:38.561396100 +0200
++++ gmp/configure.ac 2018-06-25 14:02:43.731673800 +0200
+@@ -3592,7 +3592,7 @@ if test $found_asm = yes; then
+ fi
+
+ # Only do the GMP_ASM checks if there's a .S or .asm wanting them.
+-if test $found_asm = no && test $found_S = no; then
++if test $found_asm = no || test $enable_assembly = no ; then
+ gmp_asm_syntax_testing=no
+ fi
+
=====================================
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.3.0
+GMP_URL := https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.xz
GMP_CONF :=
@@ -20,20 +20,15 @@ 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)
$(UPDATE_AUTOCONFIG)
- $(APPLY) $(SRC)/gmp/ppc64.patch
- $(APPLY) $(SRC)/gmp/win-arm64.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
+ $(APPLY) $(SRC)/gmp/gmp-fix-asm-detection.patch
# do not try the cross compiler to detect the build compiler
sed -i.orig 's/"$$CC" "$$CC $$CFLAGS $$CPPFLAGS" cc gcc c89 c99/cc gcc c89 c99/' $(UNPACK_DIR)/acinclude.m4
$(MOVE)
@@ -45,5 +40,6 @@ ifndef GPL
endif
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GMP_CONF)
+ $(MAKE) -C $<
$(MAKE) -C $< install
touch $@
=====================================
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/harfbuzz/0001-freetype-Fix-function-signatures-to-match-without-ca.patch deleted
=====================================
@@ -1,67 +0,0 @@
-From 1a4fd470808067717e6b9b228ec1cb0eab26039e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Fri, 28 Oct 2022 22:17:15 +0300
-Subject: [PATCH 1/2] freetype: Fix function signatures to match without casts
-
-Clang 16 has got a new stricter warning for casts of function types
-(see https://github.com/llvm/llvm-project/commit/1aad641c793090b4d036c03e737df2ebe2c32c57).
-
-This new warning gets included as part of the existing error
-diagnostic setting of -Wcast-function-type.
-
-This fixes errors like these:
-
-../src/hb-ft.cc:1011:34: error: cast from 'void (*)(FT_Face)' (aka 'void (*)(FT_FaceRec_ *)') to 'FT_Generic_Finalizer' (aka 'void (*)(void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
- ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
----
- src/hb-ft.cc | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/hb-ft.cc b/src/hb-ft.cc
-index 67691e3ff..37f9f7f84 100644
---- a/src/hb-ft.cc
-+++ b/src/hb-ft.cc
-@@ -732,8 +732,9 @@ hb_ft_face_create_referenced (FT_Face ft_face)
- }
-
- static void
--hb_ft_face_finalize (FT_Face ft_face)
-+hb_ft_face_finalize (void *arg)
- {
-+ FT_Face ft_face = (FT_Face) arg;
- hb_face_destroy ((hb_face_t *) ft_face->generic.data);
- }
-
-@@ -765,7 +766,7 @@ hb_ft_face_create_cached (FT_Face ft_face)
- ft_face->generic.finalizer (ft_face);
-
- ft_face->generic.data = hb_ft_face_create (ft_face, nullptr);
-- ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
-+ ft_face->generic.finalizer = hb_ft_face_finalize;
- }
-
- return hb_face_reference ((hb_face_t *) ft_face->generic.data);
-@@ -946,8 +947,9 @@ get_ft_library ()
- }
-
- static void
--_release_blob (FT_Face ft_face)
-+_release_blob (void *arg)
- {
-+ FT_Face ft_face = (FT_Face) arg;
- hb_blob_destroy ((hb_blob_t *) ft_face->generic.data);
- }
-
-@@ -1029,7 +1031,7 @@ hb_ft_font_set_funcs (hb_font_t *font)
- #endif
-
- ft_face->generic.data = blob;
-- ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob;
-+ ft_face->generic.finalizer = _release_blob;
-
- _hb_ft_font_set_funcs (font, ft_face, true);
- hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
---
-2.25.1
-
=====================================
contrib/src/harfbuzz/0001-meson-Enable-big-objects-support-when-building-for-w.patch deleted
=====================================
@@ -1,30 +0,0 @@
-From 38c155bd1edc9773fea287fcc80659f25d1b21eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
-Date: Wed, 19 Jan 2022 11:53:02 +0100
-Subject: [PATCH] meson: Enable big objects support when building for windows
-
-Fix cross compilation when targetting win64
----
- meson.build | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 41344b3a3..8fb68f296 100644
---- a/meson.build
-+++ b/meson.build
-@@ -57,6 +57,12 @@ if host_machine.cpu_family() == 'arm' and cpp.alignment('struct { char c; }') !=
- endif
- endif
-
-+if host_machine.system() == 'windows'
-+ add_project_arguments(cpp.get_supported_arguments([
-+ '-Wa,-mbig-obj'
-+ ]), language : 'cpp')
-+endif
-+
- check_headers = [
- ['unistd.h'],
- ['sys/mman.h'],
---
-2.34.1
-
=====================================
contrib/src/harfbuzz/0002-Disable-Wcast-function-type-strict.patch deleted
=====================================
@@ -1,25 +0,0 @@
-From b1f1c6e3951f7e28ce1c57248f8141cde40d2002 Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad at behdad.org>
-Date: Fri, 28 Oct 2022 14:19:39 -0600
-Subject: [PATCH 2/2] Disable -Wcast-function-type-strict
-
-https://github.com/harfbuzz/harfbuzz/pull/3859#issuecomment-1295409126
----
- src/hb.hh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/hb.hh b/src/hb.hh
-index b9f5f7141..32838ff9b 100644
---- a/src/hb.hh
-+++ b/src/hb.hh
-@@ -126,6 +126,7 @@
- /* Ignored intentionally. */
- #ifndef HB_NO_PRAGMA_GCC_DIAGNOSTIC_IGNORED
- #pragma GCC diagnostic ignored "-Wclass-memaccess"
-+#pragma GCC diagnostic ignored "-Wcast-function-type-strict" // https://github.com/harfbuzz/harfbuzz/pull/3859#issuecomment-1295409126
- #pragma GCC diagnostic ignored "-Wformat-nonliteral"
- #pragma GCC diagnostic ignored "-Wformat-zero-length"
- #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
---
-2.25.1
-
=====================================
contrib/src/harfbuzz/SHA512SUMS
=====================================
@@ -1 +1 @@
-f300d041aa4af8f7957d5b352af399b9e411804a33ac710b3728247e23a02b867514537cc2b6fcf00746e71ac7a5a2a4b1392253bb5a888baa39b8a0193144c0 harfbuzz-3.4.0.tar.xz
+9163ac83d8444ff12aecf83aa90a4bdf43ccf4663874e482ef39c7377d7ad3a624e4abfd701b2e95cd24a75ede60be23739c28b6d8a65359cdf9e9c9a27ef163 harfbuzz-11.4.4.tar.xz
=====================================
contrib/src/harfbuzz/rules.mak
=====================================
@@ -1,6 +1,6 @@
# HARFBUZZ
-HARFBUZZ_VERSION := 3.4.0
+HARFBUZZ_VERSION := 11.4.4
HARFBUZZ_URL := $(GITHUB)/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION)/harfbuzz-$(HARFBUZZ_VERSION).tar.xz
PKGS += harfbuzz
ifeq ($(call need_pkg,"harfbuzz"),)
@@ -14,9 +14,6 @@ $(TARBALLS)/harfbuzz-$(HARFBUZZ_VERSION).tar.xz:
harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.xz .sum-harfbuzz
$(UNPACK)
- $(APPLY) $(SRC)/harfbuzz/0001-meson-Enable-big-objects-support-when-building-for-w.patch
- $(APPLY) $(SRC)/harfbuzz/0001-freetype-Fix-function-signatures-to-match-without-ca.patch
- $(APPLY) $(SRC)/harfbuzz/0002-Disable-Wcast-function-type-strict.patch
$(MOVE)
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
@@ -25,7 +22,8 @@ HARFBUZZ_CONF := -Dfreetype=enabled \
-Dglib=disabled \
-Dgobject=disabled \
-Ddocs=disabled \
- -Dtests=disabled
+ -Dtests=disabled \
+ -Dragel_subproject=true
ifdef HAVE_DARWIN_OS
HARFBUZZ_CONF += -Dcoretext=enabled
=====================================
extras/tools/SHA512SUMS
=====================================
@@ -6,7 +6,6 @@ f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c4
f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2 m4-1.4.19.tar.gz
56a9656539448972bc3080357ccc987bd4cbca3847758fe41251eb8af1a5e403a75f38d1344fa2c0bd56de880f37f3eaafbe7116c506f33331e7a8dd8a53cf2a pkg-config-0.28-1.tar.gz
9f85a98e55cbc9f245a3079d5a597f778454bc945f0942cb10fbdfbde5fe12b17d6dda93d6a8d5281459ad30a3840be7e0712feb33a824226884e7e4da54a061 protobuf-3.1.0.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
=====================================
extras/tools/bootstrap
=====================================
@@ -136,7 +136,6 @@ check pkg-config
check cmake 3.17.0
check yasm
check_tar
-check ragel
check_sed
check protoc 2.6.0
check ant
=====================================
extras/tools/packages.mak
=====================================
@@ -36,9 +36,6 @@ XZ_URL=http://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2
GAS_VERSION=72887b9
GAS_URL=http://git.libav.org/?p=gas-preprocessor.git;a=snapshot;h=$(GAS_VERSION);sf=tgz
-RAGEL_VERSION=6.10
-RAGEL_URL=http://www.colm.net/files/ragel/ragel-$(RAGEL_VERSION).tar.gz
-
SED_VERSION=4.2.2
SED_URL=$(GNU)/sed/sed-$(SED_VERSION).tar.bz2
=====================================
extras/tools/ragel-6.8-javacodegen.patch deleted
=====================================
@@ -1,11 +0,0 @@
-diff -urN ragel-6.8.orig/ragel/javacodegen.cpp ragel-6.8/ragel/javacodegen.cpp
---- ragel-6.8.orig/ragel/javacodegen.cpp 2013-02-11 05:57:45.000000000 +0400
-+++ ragel-6.8/ragel/javacodegen.cpp.new 2013-09-01 14:42:27.000000000 +0400
-@@ -50,6 +50,7 @@
- using std::ifstream;
- using std::ostream;
- using std::ios;
-+using std::setiosflags;
- using std::cin;
- using std::cout;
- using std::cerr;
=====================================
extras/tools/tools.mak
=====================================
@@ -266,24 +266,6 @@ CLEAN_FILE += .buildgas
CLEAN_PKG += gas
DISTCLEAN_PKG += gas-preprocessor-$(GAS_VERSION).tar.gz
-# Ragel State Machine Compiler
-ragel-$(RAGEL_VERSION).tar.gz:
- $(call download_pkg,$(RAGEL_URL),ragel)
-
-ragel: ragel-$(RAGEL_VERSION).tar.gz
- $(UNPACK)
- $(APPLY) $(TOOLS)/ragel-6.8-javacodegen.patch
- $(MOVE)
-
-
-.buildragel: ragel
- (cd ragel; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && $(MAKE) && $(MAKE) install)
- touch $@
-
-CLEAN_FILE += .buildragel
-CLEAN_PKG += ragel
-DISTCLEAN_PKG += ragel-$(RAGEL_VERSION).tar.gz
-
# GNU sed
sed-$(SED_VERSION).tar.bz2:
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/dc67166f3ff9dec236f1296a993005217e63a52c...a8411f9c2be402eb0004c88f552c553ddfbdc067
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/dc67166f3ff9dec236f1296a993005217e63a52c...a8411f9c2be402eb0004c88f552c553ddfbdc067
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