Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (4)
Showing with 119 additions and 141 deletions
From 643829edd8408ec37182a04040fe5a7bf54dccc3 Mon Sep 17 00:00:00 2001
From: Oleg Oshmyan <chortos@inbox.lv>
Date: Sat, 18 Sep 2021 03:04:15 +0300
Subject: [PATCH] configure: add Core Text and DirectWrite to Libs.private
Fixes https://github.com/libass/libass/issues/211.
---
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configure.ac b/configure.ac
index 89d5eb0..6ae78a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,6 +126,7 @@ AS_IF([test "x$enable_coretext" != xno], [
[[CTFontDescriptorCopyAttribute(NULL, kCTFontURLAttribute);]]
)
], [
+ pkg_libs="$pkg_libs -framework ApplicationServices -framework CoreFoundation"
LIBS="$LIBS -framework ApplicationServices -framework CoreFoundation"
AC_DEFINE(CONFIG_CORETEXT, 1, [found CoreText in ApplicationServices framework])
coretext=true
@@ -137,6 +138,7 @@ AS_IF([test "x$enable_coretext" != xno], [
[[CTFontDescriptorCopyAttribute(NULL, kCTFontURLAttribute);]]
)
], [
+ pkg_libs="$pkg_libs -framework CoreText -framework CoreFoundation"
LIBS="$LIBS -framework CoreText -framework CoreFoundation"
AC_DEFINE(CONFIG_CORETEXT, 1, [found CoreText framework])
coretext=true
@@ -171,12 +173,14 @@ AS_IF([test "x$enable_directwrite" != xno], [
], [
# WinRT/UWP/app build: GDI and LoadLibrary are
# unavailable, but DirectWrite is always present
+ pkg_libs="$pkg_libs -ldwrite"
LIBS="$LIBS -ldwrite"
AC_DEFINE(CONFIG_DIRECTWRITE, 1, [found DirectWrite (WinRT/UWP)])
AC_MSG_RESULT([no])
], [
# Win32/desktop build: GDI is always present;
# DirectWrite is optional but can be loaded via LoadLibrary
+ pkg_libs="$pkg_libs -lgdi32"
LIBS="$LIBS -lgdi32"
AC_DEFINE(CONFIG_DIRECTWRITE, 1, [found DirectWrite and GDI (Win32)])
AC_MSG_RESULT([yes])
--
2.34.1
ed1824c4195ef08e6314ee2184b20e6898be6bb922e0fa26ab64bc03b065d16e68ef92c012ab09d2103dbbd9a1348e3722aa0812ea2533cd14ad1ad467f58b0f libass-0.14.0.tar.gz
3b8022ca500d4a9e19e9b7106e29d23d4bca20012619c829bc3e77437bcb3c7bd8364800f7daeb3f2d8400afc7bbcaab487c7b30c429d9aed70e37ce4cb265a2 libass-0.15.2.tar.gz
diff --git a/libass/ass_coretext.c b/libass/ass_coretext.c
index 59a8a2d..7371f7c 100644
--- a/libass/ass_coretext.c
+++ b/libass/ass_coretext.c
@@ -96,7 +96,13 @@ static bool check_glyph(void *priv, uint32_t code)
static char *get_font_file(CTFontDescriptorRef fontd)
{
CFURLRef url = CTFontDescriptorCopyAttribute(fontd, kCTFontURLAttribute);
+ if (!url)
+ return NULL;
CFStringRef path = CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);
+ if (!path) {
+ SAFE_CFRelease(url);
+ return NULL;
+ }
char *buffer = cfstr2buf(path);
SAFE_CFRelease(path);
SAFE_CFRelease(url);
@@ -133,7 +139,7 @@ static void process_descriptors(ASS_Library *lib, ASS_FontProvider *provider,
int index = -1;
char *path = get_font_file(fontd);
- if (strcmp("", path) == 0) {
+ if (!path || strcmp("", path) == 0) {
// skip the font if the URL field in the font descriptor is empty
free(path);
continue;
--- libass/libass/ass_directwrite.c.orig 2016-12-14 12:09:24.569899227 +0100
+++ libass/libass/ass_directwrite.c 2016-12-14 12:21:28.429203219 +0100
@@ -23,6 +23,7 @@
#include <initguid.h>
#include <ole2.h>
#include <shobjidl.h>
+#include <winapifamily.h>
#include "dwrite_c.h"
@@ -742,8 +743,9 @@
ASS_FontProvider *provider = NULL;
DWriteCreateFactoryFn DWriteCreateFactoryPtr = NULL;
ProviderPrivate *priv = NULL;
-
- HMODULE directwrite_lib = LoadLibraryW(L"Dwrite.dll");
+ HMODULE directwrite_lib = NULL;
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+ directwrite_lib = LoadLibraryW(L"Dwrite.dll");
if (!directwrite_lib)
goto cleanup;
@@ -751,6 +753,9 @@
"DWriteCreateFactory");
if (!DWriteCreateFactoryPtr)
goto cleanup;
+#else
+ DWriteCreateFactoryPtr = DWriteCreateFactory;
+#endif
hr = DWriteCreateFactoryPtr(DWRITE_FACTORY_TYPE_SHARED,
&IID_IDWriteFactory,
--- libass/libass/dwrite_c.h.orig 2016-12-14 12:36:59.215968100 +0100
+++ libass/libass/dwrite_c.h 2016-12-14 12:38:42.359500667 +0100
@@ -142,6 +142,13 @@
typedef struct DWRITE_TRIMMING DWRITE_TRIMMING;
typedef struct DWRITE_UNDERLINE DWRITE_UNDERLINE;
+DWRITEAPI HRESULT WINAPI DWriteCreateFactory(
+ DWRITE_FACTORY_TYPE factoryType,
+ REFIID iid,
+ IUnknown **factory
+);
+
+
#ifndef __MINGW_DEF_ARG_VAL
#ifdef __cplusplus
#define __MINGW_DEF_ARG_VAL(x) = x
# ASS
ASS_VERSION := 0.14.0
ASS_VERSION := 0.15.2
ASS_URL := https://github.com/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz
PKGS += ass
......@@ -9,7 +9,7 @@ endif
ifdef HAVE_ANDROID
WITH_FONTCONFIG = 0
WITH_HARFBUZZ = 0
WITH_HARFBUZZ = 1
ifeq ($(ANDROID_ABI), x86)
WITH_ASS_ASM = 0
endif
......@@ -42,13 +42,7 @@ $(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
libass: libass-$(ASS_VERSION).tar.gz .sum-ass
$(UNPACK)
$(APPLY) $(SRC)/ass/ass-macosx.patch
$(APPLY) $(SRC)/ass/coretext-errorhandling.patch
ifdef HAVE_WIN32
$(APPLY) $(SRC)/ass/use-topendir.patch
ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/ass/dwrite.patch
endif
endif
$(APPLY) $(SRC)/ass/0001-configure-add-Core-Text-and-DirectWrite-to-Libs.priv.patch
$(UPDATE_AUTOCONFIG)
$(MOVE)
......@@ -83,5 +77,7 @@ endif
.ass: libass
$(RECONF)
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(ASS_CFLAGS)" ./configure $(HOSTCONF) $(ASS_CONF)
cd $< && $(MAKE)
$(call pkg_static,"libass.pc")
cd $< && $(MAKE) install
touch $@
--- libass-0.13.4/libass/ass_fontselect.c.orig 2016-07-11 23:29:00.000000000 +0200
+++ libass-0.13.4/libass/ass_fontselect.c 2016-10-11 11:14:24.387661958 +0200
--- a/libass/ass_fontselect.c.orig 2021-09-11 23:27:04.000000000 +0200
+++ b/libass/ass_fontselect.c 2021-12-29 17:18:47.535670604 +0100
@@ -47,6 +47,9 @@
#include "ass_font.h"
#include "ass_string.h"
......@@ -10,7 +10,7 @@
#define ABS(x) ((x) < 0 ? -(x) : (x))
#define MAX_FULLNAME 100
@@ -161,28 +164,63 @@
@@ -166,21 +169,55 @@
.destroy_font = destroy_font_ft,
};
......@@ -50,6 +50,9 @@
+ free(dirw);
if (!d)
return;
size_t dirlen = strlen(dir);
size_t namemax = 0;
char *namebuf = NULL;
while (1) {
- struct dirent *entry = readdir(d);
+ struct _tdirent *entry = _treaddir(d);
......@@ -60,13 +63,21 @@
+ {
+ free(d_name);
continue;
- size_t namelen = dirlen + strlen(entry->d_name) + 2u;
+ }
char fullname[4096];
- snprintf(fullname, sizeof(fullname), "%s/%s", dir, entry->d_name);
+ _snprintf(fullname, sizeof(fullname), "%s/%s", dir, d_name);
+ size_t namelen = dirlen + strlen(d_name) + 2u;
if (namelen < 2 || namelen - 2 < dirlen)
continue;
if (namelen > namemax) {
@@ -190,17 +227,18 @@
else
continue;
}
- snprintf(namebuf, namemax, "%s/%s", dir, entry->d_name);
+ _snprintf(namebuf, namemax, "%s/%s", dir, d_name);
size_t bufsize = 0;
ass_msg(library, MSGL_INFO, "Loading font file '%s'", fullname);
void *data = read_file(library, fullname, &bufsize);
ass_msg(library, MSGL_INFO, "Loading font file '%s'", namebuf);
void *data = read_file(library, namebuf, &bufsize);
if (data) {
- ass_add_font(library, entry->d_name, data, bufsize);
+ ass_add_font(library, d_name, data, bufsize);
......@@ -74,6 +85,7 @@
}
+ free(d_name);
}
free(namebuf);
- closedir(d);
+ _tclosedir(d);
}
......
672708b07c389f21968b3d91be4547483f8c0d3b5d41e916503798896ab88212bafa3ca8c229624cbbbe5fdcfcb4f26f19ed8ce9ce1c9f8a217174fe397b6a35 dav1d-0.9.1.tar.xz
\ No newline at end of file
87026f8b14e408ff50fc8f137ec2ede4b14c5f69687e615d2359d0f718ae5cb5176522490786d9ae1f7838182f82615c2674f7c2961b6dcec83f1ee587c3af7c dav1d-0.9.2.tar.xz
# libdav1d
DAV1D_VERSION := 0.9.1
DAV1D_VERSION := 0.9.2
DAV1D_URL := $(VIDEOLAN)/dav1d/$(DAV1D_VERSION)/dav1d-$(DAV1D_VERSION).tar.xz
PKGS += dav1d
......
827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f freetype-2.10.4.tar.xz
0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08 freetype-2.11.1.tar.xz
# freetype2
FREETYPE2_VERSION := 2.10.4
FREETYPE2_VERSION := 2.11.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)
......
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 );
e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed fribidi-1.0.9.tar.xz
6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c fribidi-1.0.11.tar.xz
From 84d7caf52322a33deed868655d19ed2b41c226a9 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@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')
# FRIBIDI
FRIBIDI_VERSION := 1.0.9
FRIBIDI_VERSION := 1.0.11
FRIBIDI_URL := https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VERSION)/fribidi-$(FRIBIDI_VERSION).tar.xz
PKGS += fribidi
......@@ -14,7 +14,6 @@ $(TARBALLS)/fribidi-$(FRIBIDI_VERSION).tar.xz:
fribidi: fribidi-$(FRIBIDI_VERSION).tar.xz .sum-fribidi
$(UNPACK)
$(APPLY) $(SRC)/fribidi/meson_no_bins.patch
$(MOVE)
# FIXME: DEPS_fribidi = iconv $(DEPS_iconv)
......