diff --git a/contrib/src/fribidi/SHA512SUMS b/contrib/src/fribidi/SHA512SUMS index 3bef6102ed26f903fb2ad726320fcb149111ca38..a55871db38313b44f9e96c3ddf892739b53254f2 100644 --- a/contrib/src/fribidi/SHA512SUMS +++ b/contrib/src/fribidi/SHA512SUMS @@ -1 +1 @@ -cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360 fribidi-1.0.10.tar.xz +6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c fribidi-1.0.11.tar.xz diff --git a/contrib/src/fribidi/fix_static_linking.patch b/contrib/src/fribidi/fix_static_linking.patch deleted file mode 100644 index 9eb4a9a27c415a4df81e202fc9684cd62a21e439..0000000000000000000000000000000000000000 --- a/contrib/src/fribidi/fix_static_linking.patch +++ /dev/null @@ -1,28 +0,0 @@ -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()) diff --git a/contrib/src/fribidi/rules.mak b/contrib/src/fribidi/rules.mak index adadc9dbcd09dfe1a9f0302f284ecd21e6c62fbc..34587b659f47a4d8d2a6b5d93ae8d361ec2da4f8 100644 --- a/contrib/src/fribidi/rules.mak +++ b/contrib/src/fribidi/rules.mak @@ -1,5 +1,5 @@ # 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)