[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: update freetype to 2.12.0
Hugo Beauzée-Luyssen (@chouquette)
gitlab at videolan.org
Thu Apr 14 12:28:56 UTC 2022
Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC
Commits:
810ce14d by Martin Finkel at 2022-04-11T12:46:02+00:00
contrib: update freetype to 2.12.0
- - - - -
4 changed files:
- − 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
Changes:
=====================================
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
+d2426b46ef56268f5030951840a73be9a626129c6fc6ad2ab06e572c9325d0192f47b007798c2ffa3608fe50e296ad129ac41312b1fd3f8864d7e55e8c237c54 freetype-2.12.0.tar.xz
=====================================
contrib/src/freetype2/rules.mak
=====================================
@@ -1,6 +1,6 @@
# freetype2
-FREETYPE2_VERSION := 2.11.1
+FREETYPE2_VERSION := 2.12.0
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)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/810ce14d989f2da1819ee7f74176f5110d0547aa
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/810ce14d989f2da1819ee7f74176f5110d0547aa
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