Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
7
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Steve Lhomme
VLC
Commits
61094448
Commit
61094448
authored
3 years ago
by
Jean-Baptiste Kempf
Committed by
Steve Lhomme
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Contribs: update fribidi to 1.0.11
parent
d59532b0
No related branches found
Branches containing commit
No related tags found
3 merge requests
!46
ci: generate a contrib package if Windows prebuilt were used but failed
,
!45
WIP emcmake
,
!44
WIP flac 14.0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
contrib/src/fribidi/SHA512SUMS
+1
-1
1 addition, 1 deletion
contrib/src/fribidi/SHA512SUMS
contrib/src/fribidi/fix_static_linking.patch
+0
-28
0 additions, 28 deletions
contrib/src/fribidi/fix_static_linking.patch
contrib/src/fribidi/rules.mak
+1
-2
1 addition, 2 deletions
contrib/src/fribidi/rules.mak
with
2 additions
and
31 deletions
contrib/src/fribidi/SHA512SUMS
+
1
−
1
View file @
61094448
cb51920012c3c
75
0
7c
17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360
fribidi-1.0.1
0
.tar.xz
6afde86784de06759f18235ccb44f23261a9
75
f
7c
ce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c
fribidi-1.0.1
1
.tar.xz
This diff is collapsed.
Click to expand it.
contrib/src/fribidi/fix_static_linking.patch
deleted
100644 → 0
+
0
−
28
View file @
d59532b0
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())
This diff is collapsed.
Click to expand it.
contrib/src/fribidi/rules.mak
+
1
−
2
View file @
61094448
# FRIBIDI
FRIBIDI_VERSION
:=
1.0.1
0
FRIBIDI_VERSION
:=
1.0.1
1
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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment