Commit a2490b74 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf Committed by Hugo Beauzée-Luyssen
Browse files

Contribs: update fribidi to 1.0.10

parent a6fb42a2
e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed fribidi-1.0.9.tar.xz
cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360 fribidi-1.0.10.tar.xz
From 05e42a4d782ce14e648fd4c489e65eaff4609de2 Mon Sep 17 00:00:00 2001
From: Christopher Degawa <ccom@randomderp.com>
Date: Mon, 6 Jul 2020 20:55:11 +0000
Subject: [PATCH] meson: add fribidi_static_cargs to extra_cflags
meson seemingly doesn't have a section for cflags.private, so the flags will have to go to the regular cflags for now
it can be replaced by manual sed or similar to append that line if wanted
Fixes https://github.com/m-ab-s/media-autobuild_suite/issues/1735
Signed-off-by: Christopher Degawa <ccom@randomderp.com>
---
meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 6c69ed9..9ba9dab 100644
--- a/meson.build
+++ b/meson.build
@@ -103,6 +103,7 @@ pkg = import('pkgconfig')
pkg.generate(name: 'GNU FriBidi',
filebase: 'fribidi',
description: 'Unicode Bidirectional Algorithm Library',
- libraries: libfribidi,
+ libraries: libfribidi,
+ extra_cflags: fribidi_static_cargs,
subdirs: 'fribidi',
version: meson.project_version())
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.10
FRIBIDI_URL := https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VERSION)/fribidi-$(FRIBIDI_VERSION).tar.xz
PKGS += fribidi
......@@ -14,7 +14,7 @@ $(TARBALLS)/fribidi-$(FRIBIDI_VERSION).tar.xz:
fribidi: fribidi-$(FRIBIDI_VERSION).tar.xz .sum-fribidi
$(UNPACK)
$(APPLY) $(SRC)/fribidi/meson_no_bins.patch
$(APPLY) $(SRC)/fribidi/fix_static_linking.patch
$(MOVE)
# FIXME: DEPS_fribidi = iconv $(DEPS_iconv)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment