[vlc-commits] [Git][videolan/vlc][master] 4 commits: Contribs: update fontconfig to 2.12.6
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Sat May 28 21:09:32 UTC 2022
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
3b4b2da8 by Jean-Baptiste Kempf at 2022-05-28T19:00:54+00:00
Contribs: update fontconfig to 2.12.6
- - - - -
8b041de7 by Jean-Baptiste Kempf at 2022-05-28T19:00:54+00:00
Contribs: update Freetype to 2.12.1
- - - - -
d6294b20 by Jean-Baptiste Kempf at 2022-05-28T19:00:54+00:00
Contribs: update fribidi to 1.0.12
Fuzzing fixes...
- - - - -
6e3bfdbf by Jean-Baptiste Kempf at 2022-05-28T19:00:54+00:00
Contribs: update harfbuzz to 3.4.0
The next release, 4.0, is a massive API change
- - - - -
10 changed files:
- contrib/src/fontconfig/SHA512SUMS
- contrib/src/fontconfig/rules.mak
- − contrib/src/freetype2/0001-builds-windows-Add-support-for-legacy-UWP-builds.patch
- − contrib/src/freetype2/0001-builds-windows-Guard-some-non-ancient-API.patch
- contrib/src/freetype2/SHA512SUMS
- contrib/src/freetype2/rules.mak
- contrib/src/fribidi/SHA512SUMS
- contrib/src/fribidi/rules.mak
- contrib/src/harfbuzz/SHA512SUMS
- contrib/src/harfbuzz/rules.mak
Changes:
=====================================
contrib/src/fontconfig/SHA512SUMS
=====================================
@@ -1 +1 @@
-b17725c028be1c5e6f76c136b0ed7db1be7694cbbf217310083512708e05cdc1a824427f89082e6ef259c10297900f26cbe899f7c5762e7662855739f3eff5ea fontconfig-2.12.3.tar.gz
+7c8a4039b4139fefddb3f73881a72e6c9ca940824d9315a1f111f0bf00f3604e15dd06b88cdc597332791820daf57d95f0ac6e7e9f6d3c3127cd0fffef9ce079 fontconfig-2.12.6.tar.gz
=====================================
contrib/src/fontconfig/rules.mak
=====================================
@@ -1,6 +1,6 @@
# fontconfig
-FONTCONFIG_VERSION := 2.12.3
+FONTCONFIG_VERSION := 2.12.6
FONTCONFIG_URL := https://www.freedesktop.org/software/fontconfig/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz
ifndef HAVE_WIN32
=====================================
contrib/src/freetype2/0001-builds-windows-Add-support-for-legacy-UWP-builds.patch deleted
=====================================
@@ -1,49 +0,0 @@
-From 20ec99be7ecfd1a07e1ff7a7ef3e510203ea33bd Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Thu, 17 Feb 2022 13:35:52 -0500
-Subject: [PATCH] [builds/windows] Add support for legacy UWP builds.
-
-* builds/windows/ftsystem.c: Add neccessary macro substitutions to
-enable strict UWP builds.
-
-See !141.
-
-Co-authored-by: Alexei Podtelezhnikov <apodtele at gmail.com>
----
- builds/windows/ftsystem.c | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/builds/windows/ftsystem.c b/builds/windows/ftsystem.c
-index 1c49f30db..d4fc95675 100644
---- a/builds/windows/ftsystem.c
-+++ b/builds/windows/ftsystem.c
-@@ -196,7 +196,25 @@
- }
-
-
--#ifdef _WIN32_WCE
-+#if defined( NTDDI_VERSION ) && NTDDI_VERSION < 0x0A000007 && \
-+ defined( WINAPI_FAMILY_PARTITION ) && \
-+ !WINAPI_FAMILY_PARTITION( WINAPI_PARTITION_DESKTOP )
-+
-+#define PACK_DWORD64( hi, lo ) ( ( (DWORD64)(hi) << 32 ) | (DWORD)(lo) )
-+
-+#define CreateFileW( a, b, c, d, e, f, g ) \
-+ CreateFileFromAppW( a, b, c, d, e, f, g )
-+#define CreateFileMapping( a, b, c, d, e, f ) \
-+ CreateFileMappingFromApp( a, b, c, PACK_DWORD64( d, e ), f )
-+#define MapViewOfFile( a, b, c, d, e ) \
-+ MapViewOfFileFromApp( a, b, PACK_DWORD64( c, d ), e )
-+
-+#define UWP_LEGACY
-+
-+#endif
-+
-+
-+#if defined( _WIN32_WCE ) || defined( UWP_LEGACY )
-
- FT_LOCAL_DEF( HANDLE )
- CreateFileA( LPCSTR lpFileName,
---
-2.27.0.windows.1
-
=====================================
contrib/src/freetype2/0001-builds-windows-Guard-some-non-ancient-API.patch deleted
=====================================
@@ -1,79 +0,0 @@
-From 1f951898751365e9bd2a920ce76652f2a59c3305 Mon Sep 17 00:00:00 2001
-From: Cameron Cawley <ccawley2011 at gmail.com>
-Date: Mon, 6 Dec 2021 23:08:46 -0500
-Subject: [PATCH] [builds/windows] Guard some non-ancient API.
-
-We can support Windows 98 and NT 4.0 in principle...
-
-* builds/windows/ftdebug.c, builds/windows/ftsystem.c: Check for the
-ancient SDK using _WIN32_WINDOWS, _WIN32_WCE, or _WIN32_WINNT.
----
- builds/windows/ftdebug.c | 6 ++++++
- builds/windows/ftsystem.c | 6 +++++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/builds/windows/ftdebug.c b/builds/windows/ftdebug.c
-index 94c22da75..ff5d4b481 100644
---- a/builds/windows/ftdebug.c
-+++ b/builds/windows/ftdebug.c
-@@ -136,6 +136,8 @@
-
- va_start( ap, fmt );
- vfprintf( stderr, fmt, ap );
-+#if ( defined( _WIN32_WINNT ) && _WIN32_WINNT >= 0x0400 ) || \
-+ ( defined( _WIN32_WCE ) && _WIN32_WCE >= 0x0600 )
- if ( IsDebuggerPresent() )
- {
- static char buf[1024];
-@@ -144,6 +146,7 @@
- vsnprintf( buf, sizeof buf, fmt, ap );
- OutputDebugStringA( buf );
- }
-+#endif
- va_end( ap );
- }
-
-@@ -159,6 +162,8 @@
-
- va_start( ap, fmt );
- vfprintf( stderr, fmt, ap );
-+#if ( defined( _WIN32_WINNT ) && _WIN32_WINNT >= 0x0400 ) || \
-+ ( defined( _WIN32_WCE ) && _WIN32_WCE >= 0x0600 )
- if ( IsDebuggerPresent() )
- {
- static char buf[1024];
-@@ -167,6 +172,7 @@
- vsnprintf( buf, sizeof buf, fmt, ap );
- OutputDebugStringA( buf );
- }
-+#endif
- va_end( ap );
-
- exit( EXIT_FAILURE );
-diff --git a/builds/windows/ftsystem.c b/builds/windows/ftsystem.c
-index 1ebadd49f..0433d6151 100644
---- a/builds/windows/ftsystem.c
-+++ b/builds/windows/ftsystem.c
-@@ -233,6 +233,10 @@
- dwFlagsAndAttributes, hTemplateFile );
- }
-
-+#endif
-+
-+#if defined( _WIN32_WCE ) || defined ( _WIN32_WINDOWS ) || \
-+ !defined( _WIN32_WINNT ) || _WIN32_WINNT <= 0x0400
-
- FT_LOCAL_DEF( BOOL )
- GetFileSizeEx( HANDLE hFile,
-@@ -248,7 +252,7 @@
- return TRUE;
- }
-
--#endif /* _WIN32_WCE */
-+#endif
-
-
- /* documentation is in ftobjs.h */
---
-2.27.0.windows.1
-
=====================================
contrib/src/freetype2/SHA512SUMS
=====================================
@@ -1 +1 @@
-0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08 freetype-2.11.1.tar.xz
+6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f freetype-2.12.1.tar.xz
=====================================
contrib/src/freetype2/rules.mak
=====================================
@@ -1,6 +1,6 @@
# freetype2
-FREETYPE2_VERSION := 2.11.1
+FREETYPE2_VERSION := 2.12.1
FREETYPE2_URL := $(SF)/freetype/freetype2/$(FREETYPE2_VERSION)/freetype-$(FREETYPE2_VERSION).tar.xz
PKGS += freetype2
@@ -15,8 +15,6 @@ $(TARBALLS)/freetype-$(FREETYPE2_VERSION).tar.xz:
freetype: freetype-$(FREETYPE2_VERSION).tar.xz .sum-freetype2
$(UNPACK)
- $(APPLY) $(SRC)/freetype2/0001-builds-windows-Guard-some-non-ancient-API.patch
- $(APPLY) $(SRC)/freetype2/0001-builds-windows-Add-support-for-legacy-UWP-builds.patch
$(call pkg_static, "builds/unix/freetype2.in")
$(MOVE)
=====================================
contrib/src/fribidi/SHA512SUMS
=====================================
@@ -1 +1 @@
-6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c fribidi-1.0.11.tar.xz
+cd624f519b270303e89139ced4020115abe3b6a0d774ba57f17fa69c6036edebd76c635a42c468786e76c6ffb0c7d63b435cd2663bc2fba08dec405840dd8e49 fribidi-1.0.12.tar.xz
=====================================
contrib/src/fribidi/rules.mak
=====================================
@@ -1,5 +1,5 @@
# FRIBIDI
-FRIBIDI_VERSION := 1.0.11
+FRIBIDI_VERSION := 1.0.12
FRIBIDI_URL := https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VERSION)/fribidi-$(FRIBIDI_VERSION).tar.xz
PKGS += fribidi
=====================================
contrib/src/harfbuzz/SHA512SUMS
=====================================
@@ -1 +1 @@
-c9d88068d8017046842f444f02f31dbae109026ede943aaf265db5508de8b4b2be84203950f274a237f515bf7cbd361629d2032c6e8ee8f50354b430bba3a8ca harfbuzz-3.2.0.tar.xz
+f300d041aa4af8f7957d5b352af399b9e411804a33ac710b3728247e23a02b867514537cc2b6fcf00746e71ac7a5a2a4b1392253bb5a888baa39b8a0193144c0 harfbuzz-3.4.0.tar.xz
=====================================
contrib/src/harfbuzz/rules.mak
=====================================
@@ -1,6 +1,6 @@
# HARFBUZZ
-HARFBUZZ_VERSION := 3.2.0
+HARFBUZZ_VERSION := 3.4.0
HARFBUZZ_URL := https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION)/harfbuzz-$(HARFBUZZ_VERSION).tar.xz
PKGS += harfbuzz
ifeq ($(call need_pkg,"harfbuzz"),)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/471fd489f3f38c04b131689933d3e7129e5d274a...6e3bfdbf1157133dc41ebcdb65d9d7b56e182ec2
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/471fd489f3f38c04b131689933d3e7129e5d274a...6e3bfdbf1157133dc41ebcdb65d9d7b56e182ec2
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