[vlc-commits] [Git][videolan/vlc][3.0.x] 8 commits: Contribs: update fribidi to 1.0.12
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Mon May 30 19:18:06 UTC 2022
Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits:
1dbd4411 by Jean-Baptiste Kempf at 2022-05-30T18:30:37+00:00
Contribs: update fribidi to 1.0.12
Fuzzing fixes...
(cherry picked from commit d6294b20cfafb070fcfa9663c3d3184d44994f50)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
821ab225 by Jean-Baptiste Kempf at 2022-05-30T18:30:37+00:00
Contribs: update Freetype to 2.12.1
(cherry picked from commit 8b041de7ddf03f7342f159b4333fae48272d9aa4)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
0a56d083 by Jean-Baptiste Kempf at 2022-05-30T18:30:37+00:00
Contribs: update harfbuzz to 2.7.4
(cherry picked from commit 233747ab4c59338b48a986f174a0555b7923cd57)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
4042eb23 by Martin Storsjö at 2022-05-30T18:30:37+00:00
contrib: harfbuzz: Reapply fix for building with Clang 13
The previous fix was dropped in 233747ab4c59338b48a986f174a0555b7923cd57
when updating harfbuzz. The previous (local) patch for fixing the matter
didn't fit without conflicts - instead of updating that patch, backport
the upstream fix (removing the unused variable - our previous fix was to
remove -Werror for -Wunused).
(cherry picked from commit 3d38357a4bc65bb7b234866af4a93dda51b8d7e2)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
5305f19d by Hugo Beauzée-Luyssen at 2022-05-30T18:30:37+00:00
contrib: Bump harfbuzz to 3.2.0
(cherry picked from commit fa081b46cd8d0db0e8b784f4999d75fab90b0559)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
18b76d89 by Hugo Beauzée-Luyssen at 2022-05-30T18:30:37+00:00
contribs: harfbuzz: Switch to meson
(cherry picked from commit 6d6330303d198b46b9344b87ad9d899610a9f199)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
d4239318 by Hugo Beauzée-Luyssen at 2022-05-30T18:30:37+00:00
contribs: harfbuzz: Disable some unneeded components
(cherry picked from commit 02eb6943cb8c8b548fcb93be050be07925b5b960)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
e281e5ac by Jean-Baptiste Kempf at 2022-05-30T18:30:37+00:00
Contribs: update harfbuzz to 3.4.0
The next release, 4.0, is a massive API change
(cherry picked from commit 6e3bfdbf1157133dc41ebcdb65d9d7b56e182ec2)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
11 changed files:
- contrib/src/freetype2/SHA512SUMS
- contrib/src/freetype2/rules.mak
- contrib/src/fribidi/SHA512SUMS
- contrib/src/fribidi/rules.mak
- − contrib/src/harfbuzz/0001-fix-OSAtomic-calls-for-AArch64.patch
- + contrib/src/harfbuzz/0001-meson-Enable-big-objects-support-when-building-for-w.patch
- − contrib/src/harfbuzz/0002-Update-the-bundled-ax_pthread.m4.patch
- − contrib/src/harfbuzz/0003-Fix-winstore-app-detection-with-mingw64.patch
- − contrib/src/harfbuzz/0004-Don-t-treat-Wunused-as-an-error.patch
- contrib/src/harfbuzz/SHA512SUMS
- contrib/src/harfbuzz/rules.mak
Changes:
=====================================
contrib/src/freetype2/SHA512SUMS
=====================================
@@ -1 +1 @@
-d2426b46ef56268f5030951840a73be9a626129c6fc6ad2ab06e572c9325d0192f47b007798c2ffa3608fe50e296ad129ac41312b1fd3f8864d7e55e8c237c54 freetype-2.12.0.tar.xz
+6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f freetype-2.12.1.tar.xz
=====================================
contrib/src/freetype2/rules.mak
=====================================
@@ -1,6 +1,6 @@
# freetype2
-FREETYPE2_VERSION := 2.12.0
+FREETYPE2_VERSION := 2.12.1
FREETYPE2_URL := $(SF)/freetype/freetype2/$(FREETYPE2_VERSION)/freetype-$(FREETYPE2_VERSION).tar.xz
PKGS += freetype2
=====================================
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/0001-fix-OSAtomic-calls-for-AArch64.patch deleted
=====================================
@@ -1,40 +0,0 @@
-From f110dc32b2a0f3fccfc80007916efcc9f62c56fa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix at feepk.net>
-Date: Fri, 15 May 2020 09:14:15 +0200
-Subject: [PATCH 1/3] fix OSAtomic calls for AArch64
-
----
- src/hb-atomic.hh | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/hb-atomic.hh b/src/hb-atomic.hh
-index b3fb296b..20dae7e3 100644
---- a/src/hb-atomic.hh
-+++ b/src/hb-atomic.hh
-@@ -164,10 +164,8 @@ static inline bool _hb_compare_and_swap_ptr (void **P, void *O, void *N)
- #elif !defined(HB_NO_MT) && defined(__APPLE__)
-
- #include <libkern/OSAtomic.h>
--#ifdef __MAC_OS_X_MIN_REQUIRED
-+#ifdef __APPLE__
- #include <AvailabilityMacros.h>
--#elif defined(__IPHONE_OS_MIN_REQUIRED)
--#include <Availability.h>
- #endif
-
- #define _hb_memory_barrier() OSMemoryBarrier ()
-@@ -175,7 +173,11 @@ static inline bool _hb_compare_and_swap_ptr (void **P, void *O, void *N)
- #define hb_atomic_int_impl_add(AI, V) (OSAtomicAdd32Barrier ((V), (AI)) - (V))
-
- #if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100)
-+#if __aarch64__
-+#define hb_atomic_ptr_impl_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
-+#else
- #define hb_atomic_ptr_impl_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((O), (N), (P))
-+#endif
- #else
- #if __ppc64__ || __x86_64__ || __aarch64__
- #define hb_atomic_ptr_impl_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
---
-2.26.0.windows.1
-
=====================================
contrib/src/harfbuzz/0001-meson-Enable-big-objects-support-when-building-for-w.patch
=====================================
@@ -0,0 +1,30 @@
+From 38c155bd1edc9773fea287fcc80659f25d1b21eb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
+Date: Wed, 19 Jan 2022 11:53:02 +0100
+Subject: [PATCH] meson: Enable big objects support when building for windows
+
+Fix cross compilation when targetting win64
+---
+ meson.build | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 41344b3a3..8fb68f296 100644
+--- a/meson.build
++++ b/meson.build
+@@ -57,6 +57,12 @@ if host_machine.cpu_family() == 'arm' and cpp.alignment('struct { char c; }') !=
+ endif
+ endif
+
++if host_machine.system() == 'windows'
++ add_project_arguments(cpp.get_supported_arguments([
++ '-Wa,-mbig-obj'
++ ]), language : 'cpp')
++endif
++
+ check_headers = [
+ ['unistd.h'],
+ ['sys/mman.h'],
+--
+2.34.1
+
=====================================
contrib/src/harfbuzz/0002-Update-the-bundled-ax_pthread.m4.patch deleted
=====================================
@@ -1,309 +0,0 @@
-From dc5815a2cc756a29c01a85081e16e43131f18411 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Fri, 15 May 2020 09:16:42 +0200
-Subject: [PATCH 2/3] Update the bundled ax_pthread.m4
-
-This fixes building for Windows with clang, where the bundled
-version of ax_pthread.m4 assumes that Clang doesn't need the
-pthread option in LDFLAGS (assuming that a system that Clang
-supports doesn't need an external library for pthreads).
----
- m4/ax_pthread.m4 | 224 ++++++++++++++++++++++++++---------------------
- 1 file changed, 123 insertions(+), 101 deletions(-)
-
-diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
-index 5fbf9fe0..1598d077 100644
---- a/m4/ax_pthread.m4
-+++ b/m4/ax_pthread.m4
-@@ -55,6 +55,7 @@
- #
- # Copyright (c) 2008 Steven G. Johnson <stevenj at alum.mit.edu>
- # Copyright (c) 2011 Daniel Richard G. <skunk at iSKUNK.ORG>
-+# Copyright (c) 2019 Marc Stevens <marc.stevens at cwi.nl>
- #
- # This program is free software: you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by the
-@@ -82,7 +83,7 @@
- # modified version of the Autoconf Macro, you may extend this special
- # exception to the GPL to apply to your modified version as well.
-
--#serial 24
-+#serial 27
-
- AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
- AC_DEFUN([AX_PTHREAD], [
-@@ -123,10 +124,12 @@ fi
- # (e.g. DEC) have both -lpthread and -lpthreads, where one of the
- # libraries is broken (non-POSIX).
-
--# Create a list of thread flags to try. Items starting with a "-" are
--# C compiler flags, and other items are library names, except for "none"
--# which indicates that we try without any flags at all, and "pthread-config"
--# which is a program returning the flags for the Pth emulation library.
-+# Create a list of thread flags to try. Items with a "," contain both
-+# C compiler flags (before ",") and linker flags (after ","). Other items
-+# starting with a "-" are C compiler flags, and remaining items are
-+# library names, except for "none" which indicates that we try without
-+# any flags at all, and "pthread-config" which is a program returning
-+# the flags for the Pth emulation library.
-
- ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-@@ -194,14 +197,47 @@ case $host_os in
- # that too in a future libc.) So we'll check first for the
- # standard Solaris way of linking pthreads (-mt -lpthread).
-
-- ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
-+ ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
- ;;
- esac
-
-+# Are we compiling with Clang?
-+
-+AC_CACHE_CHECK([whether $CC is Clang],
-+ [ax_cv_PTHREAD_CLANG],
-+ [ax_cv_PTHREAD_CLANG=no
-+ # Note that Autoconf sets GCC=yes for Clang as well as GCC
-+ if test "x$GCC" = "xyes"; then
-+ AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
-+ [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-+# if defined(__clang__) && defined(__llvm__)
-+ AX_PTHREAD_CC_IS_CLANG
-+# endif
-+ ],
-+ [ax_cv_PTHREAD_CLANG=yes])
-+ fi
-+ ])
-+ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
-+
-+
- # GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
-
-+# Note that for GCC and Clang -pthread generally implies -lpthread,
-+# except when -nostdlib is passed.
-+# This is problematic using libtool to build C++ shared libraries with pthread:
-+# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
-+# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333
-+# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555
-+# To solve this, first try -pthread together with -lpthread for GCC
-+
- AS_IF([test "x$GCC" = "xyes"],
-- [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
-+ [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"])
-+
-+# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first
-+
-+AS_IF([test "x$ax_pthread_clang" = "xyes"],
-+ [ax_pthread_flags="-pthread,-lpthread -pthread"])
-+
-
- # The presence of a feature test macro requesting re-entrant function
- # definitions is, on some systems, a strong hint that pthreads support is
-@@ -224,25 +260,86 @@ AS_IF([test "x$ax_pthread_check_macro" = "x--"],
- [ax_pthread_check_cond=0],
- [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
-
--# Are we compiling with Clang?
-
--AC_CACHE_CHECK([whether $CC is Clang],
-- [ax_cv_PTHREAD_CLANG],
-- [ax_cv_PTHREAD_CLANG=no
-- # Note that Autoconf sets GCC=yes for Clang as well as GCC
-- if test "x$GCC" = "xyes"; then
-- AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
-- [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
--# if defined(__clang__) && defined(__llvm__)
-- AX_PTHREAD_CC_IS_CLANG
--# endif
-- ],
-- [ax_cv_PTHREAD_CLANG=yes])
-- fi
-- ])
--ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
-+if test "x$ax_pthread_ok" = "xno"; then
-+for ax_pthread_try_flag in $ax_pthread_flags; do
-+
-+ case $ax_pthread_try_flag in
-+ none)
-+ AC_MSG_CHECKING([whether pthreads work without any flags])
-+ ;;
-+
-+ *,*)
-+ PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"`
-+ PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"`
-+ AC_MSG_CHECKING([whether pthreads work with "$PTHREAD_CFLAGS" and "$PTHREAD_LIBS"])
-+ ;;
-+
-+ -*)
-+ AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
-+ PTHREAD_CFLAGS="$ax_pthread_try_flag"
-+ ;;
-+
-+ pthread-config)
-+ AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-+ AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
-+ PTHREAD_CFLAGS="`pthread-config --cflags`"
-+ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-+ ;;
-+
-+ *)
-+ AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
-+ PTHREAD_LIBS="-l$ax_pthread_try_flag"
-+ ;;
-+ esac
-+
-+ ax_pthread_save_CFLAGS="$CFLAGS"
-+ ax_pthread_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+ LIBS="$PTHREAD_LIBS $LIBS"
-+
-+ # Check for various functions. We must include pthread.h,
-+ # since some functions may be macros. (On the Sequent, we
-+ # need a special flag -Kthread to make this header compile.)
-+ # We check for pthread_join because it is in -lpthread on IRIX
-+ # while pthread_create is in libc. We check for pthread_attr_init
-+ # due to DEC craziness with -lpthreads. We check for
-+ # pthread_cleanup_push because it is one of the few pthread
-+ # functions on Solaris that doesn't have a non-functional libc stub.
-+ # We try pthread_create on general principles.
-+
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-+# if $ax_pthread_check_cond
-+# error "$ax_pthread_check_macro must be defined"
-+# endif
-+ static void *some_global = NULL;
-+ static void routine(void *a)
-+ {
-+ /* To avoid any unused-parameter or
-+ unused-but-set-parameter warning. */
-+ some_global = a;
-+ }
-+ static void *start_routine(void *a) { return a; }],
-+ [pthread_t th; pthread_attr_t attr;
-+ pthread_create(&th, 0, start_routine, 0);
-+ pthread_join(th, 0);
-+ pthread_attr_init(&attr);
-+ pthread_cleanup_push(routine, 0);
-+ pthread_cleanup_pop(0) /* ; */])],
-+ [ax_pthread_ok=yes],
-+ [])
-+
-+ CFLAGS="$ax_pthread_save_CFLAGS"
-+ LIBS="$ax_pthread_save_LIBS"
-+
-+ AC_MSG_RESULT([$ax_pthread_ok])
-+ AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
-+
-+ PTHREAD_LIBS=""
-+ PTHREAD_CFLAGS=""
-+done
-+fi
-
--ax_pthread_clang_warning=no
-
- # Clang needs special handling, because older versions handle the -pthread
- # option in a rather... idiosyncratic way
-@@ -261,11 +358,6 @@ if test "x$ax_pthread_clang" = "xyes"; then
- # -pthread does define _REENTRANT, and while the Darwin headers
- # ignore this macro, third-party headers might not.)
-
-- PTHREAD_CFLAGS="-pthread"
-- PTHREAD_LIBS=
--
-- ax_pthread_ok=yes
--
- # However, older versions of Clang make a point of warning the user
- # that, in an invocation where only linking and no compilation is
- # taking place, the -pthread option has no effect ("argument unused
-@@ -320,78 +412,7 @@ if test "x$ax_pthread_clang" = "xyes"; then
-
- fi # $ax_pthread_clang = yes
-
--if test "x$ax_pthread_ok" = "xno"; then
--for ax_pthread_try_flag in $ax_pthread_flags; do
--
-- case $ax_pthread_try_flag in
-- none)
-- AC_MSG_CHECKING([whether pthreads work without any flags])
-- ;;
--
-- -mt,pthread)
-- AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
-- PTHREAD_CFLAGS="-mt"
-- PTHREAD_LIBS="-lpthread"
-- ;;
--
-- -*)
-- AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
-- PTHREAD_CFLAGS="$ax_pthread_try_flag"
-- ;;
--
-- pthread-config)
-- AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-- AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
-- PTHREAD_CFLAGS="`pthread-config --cflags`"
-- PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-- ;;
-
-- *)
-- AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
-- PTHREAD_LIBS="-l$ax_pthread_try_flag"
-- ;;
-- esac
--
-- ax_pthread_save_CFLAGS="$CFLAGS"
-- ax_pthread_save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-- LIBS="$PTHREAD_LIBS $LIBS"
--
-- # Check for various functions. We must include pthread.h,
-- # since some functions may be macros. (On the Sequent, we
-- # need a special flag -Kthread to make this header compile.)
-- # We check for pthread_join because it is in -lpthread on IRIX
-- # while pthread_create is in libc. We check for pthread_attr_init
-- # due to DEC craziness with -lpthreads. We check for
-- # pthread_cleanup_push because it is one of the few pthread
-- # functions on Solaris that doesn't have a non-functional libc stub.
-- # We try pthread_create on general principles.
--
-- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
--# if $ax_pthread_check_cond
--# error "$ax_pthread_check_macro must be defined"
--# endif
-- static void routine(void *a) { a = 0; }
-- static void *start_routine(void *a) { return a; }],
-- [pthread_t th; pthread_attr_t attr;
-- pthread_create(&th, 0, start_routine, 0);
-- pthread_join(th, 0);
-- pthread_attr_init(&attr);
-- pthread_cleanup_push(routine, 0);
-- pthread_cleanup_pop(0) /* ; */])],
-- [ax_pthread_ok=yes],
-- [])
--
-- CFLAGS="$ax_pthread_save_CFLAGS"
-- LIBS="$ax_pthread_save_LIBS"
--
-- AC_MSG_RESULT([$ax_pthread_ok])
-- AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
--
-- PTHREAD_LIBS=""
-- PTHREAD_CFLAGS=""
--done
--fi
-
- # Various other checks:
- if test "x$ax_pthread_ok" = "xyes"; then
-@@ -438,7 +459,8 @@ if test "x$ax_pthread_ok" = "xyes"; then
- AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
- [ax_cv_PTHREAD_PRIO_INHERIT],
- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-- [[int i = PTHREAD_PRIO_INHERIT;]])],
-+ [[int i = PTHREAD_PRIO_INHERIT;
-+ return i;]])],
- [ax_cv_PTHREAD_PRIO_INHERIT=yes],
- [ax_cv_PTHREAD_PRIO_INHERIT=no])
- ])
---
-2.26.0.windows.1
-
=====================================
contrib/src/harfbuzz/0003-Fix-winstore-app-detection-with-mingw64.patch deleted
=====================================
@@ -1,84 +0,0 @@
-From 6b1c0cb9a88424f4d1af769067acf1f6fea66ece Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Fri, 3 Apr 2020 13:05:14 +0200
-Subject: [PATCH 3/3] Fix winstore app detection with mingw64
-
-mingw64 doesn't have WINAPI_FAMILY_PC_APP and WINAPI_FAMILY_PHONE_APP but the
-same detection can be achieved by testing WINAPI_PARTITION_DESKTOP.
----
- src/hb-blob.cc | 6 +++---
- src/hb-mutex.hh | 2 +-
- src/hb.hh | 5 +++--
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/hb-blob.cc b/src/hb-blob.cc
-index 2e72683c..609b87d8 100644
---- a/src/hb-blob.cc
-+++ b/src/hb-blob.cc
-@@ -581,7 +581,7 @@ fail_without_close:
- wchar_t * wchar_file_name = (wchar_t *) malloc (sizeof (wchar_t) * size);
- if (unlikely (wchar_file_name == nullptr)) goto fail_without_close;
- mbstowcs (wchar_file_name, file_name, size);
--#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
-+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
- {
- CREATEFILE2_EXTENDED_PARAMETERS ceparams = { 0 };
- ceparams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
-@@ -602,7 +602,7 @@ fail_without_close:
-
- if (unlikely (fd == INVALID_HANDLE_VALUE)) goto fail_without_close;
-
--#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
-+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
- {
- LARGE_INTEGER length;
- GetFileSizeEx (fd, &length);
-@@ -615,7 +615,7 @@ fail_without_close:
- #endif
- if (unlikely (file->mapping == nullptr)) goto fail;
-
--#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
-+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
- file->contents = (char *) MapViewOfFileFromApp (file->mapping, FILE_MAP_READ, 0, 0);
- #else
- file->contents = (char *) MapViewOfFile (file->mapping, FILE_MAP_READ, 0, 0, 0);
-diff --git a/src/hb-mutex.hh b/src/hb-mutex.hh
-index e7f8b1c4..f48d6b29 100644
---- a/src/hb-mutex.hh
-+++ b/src/hb-mutex.hh
-@@ -64,7 +64,7 @@ typedef pthread_mutex_t hb_mutex_impl_t;
- #include <windows.h>
- typedef CRITICAL_SECTION hb_mutex_impl_t;
- #define HB_MUTEX_IMPL_INIT {0}
--#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
-+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
- #define hb_mutex_impl_init(M) InitializeCriticalSectionEx (M, 0, 0)
- #else
- #define hb_mutex_impl_init(M) InitializeCriticalSection (M)
-diff --git a/src/hb.hh b/src/hb.hh
-index fcbd3305..492b9848 100644
---- a/src/hb.hh
-+++ b/src/hb.hh
-@@ -334,8 +334,9 @@ extern "C" void hb_free_impl(void *ptr);
- # if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600
- # undef _WIN32_WINNT
- # endif
-+# include <winapifamily.h>
- # ifndef _WIN32_WINNT
--# if !defined(WINAPI_FAMILY) || !(WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
-+# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
- # define _WIN32_WINNT 0x0600
- # endif
- # endif
-@@ -356,7 +357,7 @@ extern "C" void hb_free_impl(void *ptr);
- # define HB_NO_SETLOCALE
- # define HB_NO_ERRNO
- # endif
--# elif defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
-+# elif !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
- # ifndef HB_NO_GETENV
- # define HB_NO_GETENV
- # endif
---
-2.26.0.windows.1
-
=====================================
contrib/src/harfbuzz/0004-Don-t-treat-Wunused-as-an-error.patch deleted
=====================================
@@ -1,47 +0,0 @@
-From 130296d079a65b26b15acb9d0a69ef9497fad701 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Wed, 2 Jun 2021 09:49:24 +0300
-Subject: [PATCH 4/4] Don't treat -Wunused as an error
-
-This is a fragile warning - newer compilers can add warnings to cases
-that weren't there before.
-
-Clang 13 got support for the -Wunused-but-set-variable warning, which
-gets enabled implicitly via -Wunused, and it warns on one variable
-like this:
-
-hb-subset-cff1.cc:405:33: error: variable 'supp_size' set but not used [-Werror,
--Wunused-but-set-variable]
- unsigned int size0, size1, supp_size;
- ^
----
- src/hb.hh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/hb.hh b/src/hb.hh
-index e46aa0b6e..b0beaaa81 100644
---- a/src/hb.hh
-+++ b/src/hb.hh
-@@ -86,10 +86,8 @@
- #pragma GCC diagnostic error "-Wswitch-enum"
- #pragma GCC diagnostic error "-Wtautological-overlap-compare"
- #pragma GCC diagnostic error "-Wunneeded-internal-declaration"
--#pragma GCC diagnostic error "-Wunused"
- #pragma GCC diagnostic error "-Wunused-local-typedefs"
- #pragma GCC diagnostic error "-Wunused-value"
--#pragma GCC diagnostic error "-Wunused-variable"
- #pragma GCC diagnostic error "-Wvla"
- #pragma GCC diagnostic error "-Wwrite-strings"
- #endif
-@@ -107,6 +105,8 @@
- #pragma GCC diagnostic warning "-Wmaybe-uninitialized"
- #pragma GCC diagnostic warning "-Wmissing-format-attribute"
- #pragma GCC diagnostic warning "-Wundef"
-+#pragma GCC diagnostic warning "-Wunused"
-+#pragma GCC diagnostic warning "-Wunused-variable"
- #endif
-
- /* Ignored currently, but should be fixed at some point. */
---
-2.25.1
-
=====================================
contrib/src/harfbuzz/SHA512SUMS
=====================================
@@ -1 +1 @@
-651b23d7d4fab6fef472ee57db39bbaebc31c2f40ea3a482c1499ad1a7b549b86a2bccbe9da191c8e9ecdf464191dd3c9a7485546b51695ad8ab3c0329732d9d harfbuzz-2.6.8.tar.xz
+f300d041aa4af8f7957d5b352af399b9e411804a33ac710b3728247e23a02b867514537cc2b6fcf00746e71ac7a5a2a4b1392253bb5a888baa39b8a0193144c0 harfbuzz-3.4.0.tar.xz
=====================================
contrib/src/harfbuzz/rules.mak
=====================================
@@ -1,6 +1,6 @@
# HARFBUZZ
-HARFBUZZ_VERSION := 2.6.8
+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"),)
@@ -14,23 +14,23 @@ $(TARBALLS)/harfbuzz-$(HARFBUZZ_VERSION).tar.xz:
harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.xz .sum-harfbuzz
$(UNPACK)
- $(APPLY) $(SRC)/harfbuzz/0001-fix-OSAtomic-calls-for-AArch64.patch
- $(APPLY) $(SRC)/harfbuzz/0002-Update-the-bundled-ax_pthread.m4.patch
- $(APPLY) $(SRC)/harfbuzz/0003-Fix-winstore-app-detection-with-mingw64.patch
- $(APPLY) $(SRC)/harfbuzz/0004-Don-t-treat-Wunused-as-an-error.patch
+ $(APPLY) $(SRC)/harfbuzz/0001-meson-Enable-big-objects-support-when-building-for-w.patch
$(MOVE)
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
-HARFBUZZ_CONF := --with-freetype \
- --without-glib
+HARFBUZZ_CONF := -Dfreetype=enabled \
+ -Dglib=disabled \
+ -Dgobject=disabled \
+ -Ddocs=disabled \
+ -Dtests=disabled
ifdef HAVE_DARWIN_OS
-HARFBUZZ_CONF += --with-coretext
+HARFBUZZ_CONF += -Dcoretext=enabled
endif
-.harfbuzz: harfbuzz
- $(RECONF)
- cd $< && $(HOSTVARS_PIC) ./configure $(HOSTCONF) $(HARFBUZZ_CONF) ICU_CONFIG=false
- cd $< && $(MAKE) install
+.harfbuzz: harfbuzz crossfile.meson
+ cd $< && rm -rf ./build
+ cd $< && $(HOSTVARS_MESON) $(MESON) $(HARFBUZZ_CONF) build
+ cd $< && cd build && ninja install
touch $@
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/47776b7ff15195915eddf52fd28e4f0d25a987d1...e281e5ac20c72c4b336e58fd7a1b478db1306b44
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/47776b7ff15195915eddf52fd28e4f0d25a987d1...e281e5ac20c72c4b336e58fd7a1b478db1306b44
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