[vlc-commits] [Git][videolan/vlc][master] 3 commits: Contribs: update Freetype2 to 2.10.4
Jean-Baptiste Kempf
gitlab at videolan.org
Tue May 18 21:56:08 UTC 2021
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
a6fb42a2 by Jean-Baptiste Kempf at 2021-05-18T18:39:15+02:00
Contribs: update Freetype2 to 2.10.4
CVE-2020-15999 (but we shouldn't be impacted)
- - - - -
a2490b74 by Jean-Baptiste Kempf at 2021-05-18T19:15:55+02:00
Contribs: update fribidi to 1.0.10
- - - - -
c4cc7329 by Jean-Baptiste Kempf at 2021-05-18T19:15:55+02:00
Contribs: update harfbuzz to 2.6.8
Last of the 2.6.x series
- - - - -
8 changed files:
- contrib/src/freetype2/SHA512SUMS
- contrib/src/freetype2/rules.mak
- contrib/src/fribidi/SHA512SUMS
- + contrib/src/fribidi/fix_static_linking.patch
- − contrib/src/fribidi/meson_no_bins.patch
- contrib/src/fribidi/rules.mak
- contrib/src/harfbuzz/SHA512SUMS
- contrib/src/harfbuzz/rules.mak
Changes:
=====================================
contrib/src/freetype2/SHA512SUMS
=====================================
@@ -1 +1 @@
-c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650 freetype-2.10.1.tar.xz
+827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f freetype-2.10.4.tar.xz
=====================================
contrib/src/freetype2/rules.mak
=====================================
@@ -1,6 +1,6 @@
# freetype2
-FREETYPE2_VERSION := 2.10.1
+FREETYPE2_VERSION := 2.10.4
FREETYPE2_URL := $(SF)/freetype/freetype2/$(FREETYPE2_VERSION)/freetype-$(FREETYPE2_VERSION).tar.xz
PKGS += freetype2
=====================================
contrib/src/fribidi/SHA512SUMS
=====================================
@@ -1 +1 @@
-e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed fribidi-1.0.9.tar.xz
+cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360 fribidi-1.0.10.tar.xz
=====================================
contrib/src/fribidi/fix_static_linking.patch
=====================================
@@ -0,0 +1,28 @@
+From 05e42a4d782ce14e648fd4c489e65eaff4609de2 Mon Sep 17 00:00:00 2001
+From: Christopher Degawa <ccom at randomderp.com>
+Date: Mon, 6 Jul 2020 20:55:11 +0000
+Subject: [PATCH] meson: add fribidi_static_cargs to extra_cflags
+
+meson seemingly doesn't have a section for cflags.private, so the flags will have to go to the regular cflags for now
+it can be replaced by manual sed or similar to append that line if wanted
+
+Fixes https://github.com/m-ab-s/media-autobuild_suite/issues/1735
+
+Signed-off-by: Christopher Degawa <ccom at randomderp.com>
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6c69ed9..9ba9dab 100644
+--- a/meson.build
++++ b/meson.build
+@@ -103,6 +103,7 @@ pkg = import('pkgconfig')
+ pkg.generate(name: 'GNU FriBidi',
+ filebase: 'fribidi',
+ description: 'Unicode Bidirectional Algorithm Library',
+- libraries: libfribidi,
++ libraries: libfribidi,
++ extra_cflags: fribidi_static_cargs,
+ subdirs: 'fribidi',
+ version: meson.project_version())
=====================================
contrib/src/fribidi/meson_no_bins.patch deleted
=====================================
@@ -1,41 +0,0 @@
-From 84d7caf52322a33deed868655d19ed2b41c226a9 Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb at videolan.org>
-Date: Sun, 29 Mar 2020 18:57:39 +0200
-Subject: [PATCH] meson: allow to disable building tests and binaries
-
----
- meson.build | 8 ++++++--
- meson_options.txt | 4 ++++
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 75e796e..03e9388 100644
---- a/meson.build
-+++ b/meson.build
-@@ -84,8 +84,12 @@ incs = include_directories('.', 'lib', 'gen.tab')
-
- subdir('gen.tab')
- subdir('lib')
--subdir('bin')
--subdir('test')
-+if get_option('bin')
-+ subdir('bin')
-+endif
-+if get_option('tests')
-+ subdir('test')
-+endif
- if get_option('docs')
- subdir('doc')
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index c312fe8..11cae8d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -2,3 +2,7 @@ option('deprecated', type : 'boolean', value : true,
- description: 'Build deprecated functionality')
- option('docs', type : 'boolean', value : true,
- description: 'Build documentation')
-+option('bin', type : 'boolean', value : true,
-+ description: 'Build binaries')
-+option('tests', type : 'boolean', value : true,
-+ description: 'Build tests')
=====================================
contrib/src/fribidi/rules.mak
=====================================
@@ -1,5 +1,5 @@
# FRIBIDI
-FRIBIDI_VERSION := 1.0.9
+FRIBIDI_VERSION := 1.0.10
FRIBIDI_URL := https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VERSION)/fribidi-$(FRIBIDI_VERSION).tar.xz
PKGS += fribidi
@@ -14,7 +14,7 @@ $(TARBALLS)/fribidi-$(FRIBIDI_VERSION).tar.xz:
fribidi: fribidi-$(FRIBIDI_VERSION).tar.xz .sum-fribidi
$(UNPACK)
- $(APPLY) $(SRC)/fribidi/meson_no_bins.patch
+ $(APPLY) $(SRC)/fribidi/fix_static_linking.patch
$(MOVE)
# FIXME: DEPS_fribidi = iconv $(DEPS_iconv)
=====================================
contrib/src/harfbuzz/SHA512SUMS
=====================================
@@ -1 +1 @@
-d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f harfbuzz-2.6.4.tar.xz
+651b23d7d4fab6fef472ee57db39bbaebc31c2f40ea3a482c1499ad1a7b549b86a2bccbe9da191c8e9ecdf464191dd3c9a7485546b51695ad8ab3c0329732d9d harfbuzz-2.6.8.tar.xz
=====================================
contrib/src/harfbuzz/rules.mak
=====================================
@@ -1,7 +1,7 @@
# HARFBUZZ
-HARFBUZZ_VERSION := 2.6.4
-HARFBUZZ_URL := http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$(HARFBUZZ_VERSION).tar.xz
+HARFBUZZ_VERSION := 2.6.8
+HARFBUZZ_URL := https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION)/harfbuzz-$(HARFBUZZ_VERSION).tar.xz
PKGS += harfbuzz
ifeq ($(call need_pkg,"harfbuzz"),)
PKGS_FOUND += harfbuzz
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d0de31d47f553877c5c30c322230ee902e9e3432...c4cc73299c6531b060a758725a4668ec73aa207c
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d0de31d47f553877c5c30c322230ee902e9e3432...c4cc73299c6531b060a758725a4668ec73aa207c
You're receiving this email because of your account on code.videolan.org.
More information about the vlc-commits
mailing list