[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: harfbuff: build internal ragel if not found
Steve Lhomme (@robUx4)
gitlab at videolan.org
Sun Apr 21 09:27:36 UTC 2024
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
071a7581 by Steve Lhomme at 2024-04-21T08:17:40+00:00
contrib: harfbuff: build internal ragel if not found
- - - - -
c0470455 by Steve Lhomme at 2024-04-21T08:17:40+00:00
tools: don't build ragel
It's only used by harfbuzz which has its own internal version.
- - - - -
8 changed files:
- Makefile.am
- contrib/src/harfbuzz/rules.mak
- doc/BUILD-win32.md
- extras/tools/SHA512SUMS
- extras/tools/bootstrap
- extras/tools/packages.mak
- − extras/tools/ragel-6.8-javacodegen.patch
- extras/tools/tools.mak
Changes:
=====================================
Makefile.am
=====================================
@@ -68,8 +68,7 @@ EXTRA_DIST += \
extras/tools/libtool-2.4.7-clang-libs.patch \
extras/tools/libtool-2.4.7-response-files.patch \
extras/tools/libtool-2.4.7-lpthread.patch \
- extras/tools/libtool-2.4.7-embed-bitcode.patch \
- extras/tools/ragel-6.8-javacodegen.patch
+ extras/tools/libtool-2.4.7-embed-bitcode.patch
###############################################################################
# Various utilities ( editor syntax files, D-Bus controller ... )
=====================================
contrib/src/harfbuzz/rules.mak
=====================================
@@ -25,7 +25,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
=====================================
doc/BUILD-win32.md
=====================================
@@ -21,7 +21,7 @@ needs to build itself and its contribs.
sudo apt-get update -qq
sudo apt-get install -qqy \
git wget bzip2 file libwine-dev unzip libtool libtool-bin libltdl-dev pkg-config ant \
- build-essential automake texinfo ragel yasm p7zip-full autopoint \
+ build-essential automake texinfo yasm p7zip-full autopoint \
gettext cmake zip wine nsis g++-mingw-w64-i686 curl gperf flex bison \
libcurl4-gnutls-dev python3 python3-setuptools python3-mako python3-requests \
gcc make procps ca-certificates \
@@ -37,7 +37,7 @@ pacman -S --needed git wget bzip2 file unzip libtool pkg-config \
gettext cmake zip curl gperf flex bison \
python3 python3-setuptools python3-mako \
gcc make ca-certificates nasm gnupg patch help2man \
- ragel python3 meson
+ python3 meson
```
<!-- pacman -S ant autopoint nsis python3-requests jq openjdk-11-jdk-headless -->
@@ -71,8 +71,8 @@ should go with the `msvcrt` version. The official VLC builds use `msvcrt` for de
wget https://github.com/mstorsjo/llvm-mingw/releases/download/20220906/llvm-mingw-20220906-msvcrt-ubuntu-18.04-x86_64.tar.xz
tar xvf llvm-mingw-20220906-msvcrt-ubuntu-18.04-x86_64.tar.xz -C /opt
```
-Every time you build VLC, you will need to have the toolchain in your PATH.
-We recommend creating a script file to do this, so that you can call
+Every time you build VLC, you will need to have the toolchain in your PATH.
+We recommend creating a script file to do this, so that you can call
it when you start your build sesson:
```sh
@@ -91,8 +91,8 @@ wget https://github.com/mstorsjo/llvm-mingw/releases/download/20220906/llvm-ming
unzip llvm-mingw-20220906-msvcrt-x86_64.zip -d /opt
```
-Every time you build VLC, you will need to have the toolchain in your PATH.
-We recommend creating a script file to do this, so that you can call
+Every time you build VLC, you will need to have the toolchain in your PATH.
+We recommend creating a script file to do this, so that you can call
it when you start your build sesson:
```sh
=====================================
extras/tools/SHA512SUMS
=====================================
@@ -4,7 +4,6 @@
6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674 cmake-3.24.2.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
31865930401b1d9497421fa79cfb41a1a47f3bf59fcdde86b28ed4f53d7a3ceaf88d57c1dba0332d3cd76e82a3aeb31b1e4e3af54fc0d0c0ad17c9f239e8d45d tar-1.34.tar.bz2
5a98d40c94ce496047f4dae7844252e91018c5259e7d3bd4bab0f7c8772c82ff137b0a8a263b9a6038bab893af4500009a6f14787aa1f969156fcdceb365203e xz-5.4.1.tar.bz2
=====================================
extras/tools/bootstrap
=====================================
@@ -141,7 +141,6 @@ check libtool 2.4
check pkg-config
check cmake 3.21.0
check_tar
-check ragel
check_sed
check ant
check xz
=====================================
extras/tools/packages.mak
=====================================
@@ -30,9 +30,6 @@ TAR_URL=$(GNU)/tar/tar-$(TAR_VERSION).tar.bz2
XZ_VERSION=5.4.1
XZ_URL=http://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2
-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
=====================================
@@ -237,24 +237,6 @@ CLEAN_FILE += .buildpkg-config
CLEAN_PKG += pkgconfig
DISTCLEAN_PKG += pkg-config-$(PKGCFG_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 --disable-dependency-tracking && $(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/b53cc653ea0287a61ce8284536c8f689dacbe4cd...c0470455a92077db5b840d5bd31f3dc45e95e7d4
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b53cc653ea0287a61ce8284536c8f689dacbe4cd...c0470455a92077db5b840d5bd31f3dc45e95e7d4
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