Skip to content
Snippets Groups Projects
Commit 61094448 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf Committed by Steve Lhomme
Browse files

Contribs: update fribidi to 1.0.11

parent d59532b0
No related branches found
No related tags found
3 merge requests!46ci: generate a contrib package if Windows prebuilt were used but failed,!45WIP emcmake,!44WIP flac 14.0
cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360 fribidi-1.0.10.tar.xz
6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c fribidi-1.0.11.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())
# FRIBIDI
FRIBIDI_VERSION := 1.0.10
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/fix_static_linking.patch
$(MOVE)
# FIXME: DEPS_fribidi = iconv $(DEPS_iconv)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment