Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
451
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
b3e9723f
Commit
b3e9723f
authored
3 years ago
by
Jean-Baptiste Kempf
Committed by
Steve Lhomme
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Contribs: update freetype to 2.11.1
parent
61094448
No related branches found
Branches containing commit
No related tags found
1 merge request
!1309
Contribs: update libass to 0.15.2, freetype to 2.11.1, fribidi to 1.0.11, dav1d to 0.9.2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
contrib/src/freetype2/SHA512SUMS
+1
-1
1 addition, 1 deletion
contrib/src/freetype2/SHA512SUMS
contrib/src/freetype2/rules.mak
+2
-1
2 additions, 1 deletion
contrib/src/freetype2/rules.mak
contrib/src/freetype2/uwpfixes.patch
+38
-0
38 additions, 0 deletions
contrib/src/freetype2/uwpfixes.patch
with
41 additions
and
2 deletions
contrib/src/freetype2/SHA512SUMS
+
1
−
1
View file @
b3e9723f
827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
freetype-2.1
0.4
.tar.xz
0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08
freetype-2.1
1.1
.tar.xz
This diff is collapsed.
Click to expand it.
contrib/src/freetype2/rules.mak
+
2
−
1
View file @
b3e9723f
# freetype2
FREETYPE2_VERSION
:=
2.1
0.4
FREETYPE2_VERSION
:=
2.1
1.1
FREETYPE2_URL
:=
$(
SF
)
/freetype/freetype2/
$(
FREETYPE2_VERSION
)
/freetype-
$(
FREETYPE2_VERSION
)
.tar.xz
PKGS
+=
freetype2
...
...
@@ -15,6 +15,7 @@ $(TARBALLS)/freetype-$(FREETYPE2_VERSION).tar.xz:
freetype
:
freetype-$(FREETYPE2_VERSION).tar.xz .sum-freetype2
$(
UNPACK
)
$(
APPLY
)
$(
SRC
)
/freetype2/uwpfixes.patch
$(
call pkg_static,
"builds/unix/freetype2.in"
)
$(
MOVE
)
...
...
This diff is collapsed.
Click to expand it.
contrib/src/freetype2/uwpfixes.patch
0 → 100644
+
38
−
0
View file @
b3e9723f
diff --git a/builds/windows/ftsystem.c b/builds/windows/ftsystem.c
index 1ebadd49f..ac8ff1f92 100644
--- a/builds/windows/ftsystem.c
+++ b/builds/windows/ftsystem.c
@@ -28,6 +28,7 @@
/* memory mapping and allocation includes and definitions */
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
+#include <winapifamily.h>
/**************************************************************************
@@ -296,7 +297,11 @@
goto Fail_Open;
}
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
fm = CreateFileMapping( file, NULL, PAGE_READONLY, 0, 0, NULL );
+#else
+ fm = CreateFileMappingFromApp( file, NULL, PAGE_READONLY, 0, NULL );
+#endif
if ( fm == NULL )
{
FT_ERROR(( "FT_Stream_Open: can not map file\n" ));
@@ -308,8 +313,13 @@
/* a size greater than LONG_MAX */
stream->size = size.LowPart;
stream->pos = 0;
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
stream->base = (unsigned char *)
MapViewOfFile( fm, FILE_MAP_READ, 0, 0, 0 );
+#else
+ stream->base = (unsigned char *)
+ MapViewOfFileFromApp( fm, FILE_MAP_READ, 0, 0 );
+#endif
CloseHandle( fm );
This diff is collapsed.
Click to expand it.
Jean-Baptiste Kempf
@jbk
mentioned in commit
8fbafa23
·
3 years ago
mentioned in commit
8fbafa23
mentioned in commit 8fbafa234fd2386303cb87c92a706c2922ea5375
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment