kiss-community/repo
2
0
Fork 1
mirror of https://codeberg.org/kiss-community/repo synced 2024-12-21 23:00:06 -07:00
Code Issues Wiki

libass: 0.17.3

Browse Source
This commit is contained in:
Owen Rafferty 2024-07-02 21:12:36 -05:00
parent d8a4cbe7c5
commit 6742bc552a
No known key found for this signature in database
6 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
extra/libass/build
View File

@ -1,17 +1,13 @@
#!/bin/sh -e #!/bin/sh -e
export DESTDIR="$1"
patch -p1 < no-fribidi.patch patch -p1 < no-fribidi.patch
# Remove fribidi configure checks. meson setup \
sed -e 's/as_fn_error.*fribidi/: 0 "/' \ -Dprefix=/usr \
-e '/pkg_requires="fribidi >= .*/d' \ -Dfontconfig=enabled \
configure > _ output
mv -f _ configure
sh ./configure \ ninja -C output
FRIBIDI_LIBS=" " \ ninja -C output install
--prefix=/usr \
--enable-fontconfig
make
make DESTDIR="$1" install

4
extra/libass/checksums
View File

@ -1,2 +1,2 @@
05ef68aea047dd2313eec7b6ce81cabf48b04860832a6076406d085626f9b31972 bfbcc2a97193eb5c2a6c54d07c508d42ff62387a8a9d8b3959d15b6115bca8b68b
ccfe236270c0792a0dbb264a10f657b8e49a7623f5e4307e8e4d790c8a4f94b77d db4971dc5318683b027406fd647b2e72e71055445d83a8010f491fdbaf4c855ae1

1
extra/libass/depends
View File

@ -1,5 +1,6 @@
expat expat
fontconfig fontconfig
freetype-harfbuzz freetype-harfbuzz
meson make
nasm make nasm make
pkgconf make pkgconf make

45
extra/libass/patches/no-fribidi.patch
View File

@ -1,5 +1,5 @@
diff --git a/libass/ass_render.h b/libass/ass_render.h diff --git a/libass/ass_render.h b/libass/ass_render.h
index a3de04a..27a7929 100644 index 7a157ab..c8adf1d 100644
--- a/libass/ass_render.h --- a/libass/ass_render.h
+++ b/libass/ass_render.h +++ b/libass/ass_render.h
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
@ -20,7 +20,7 @@ index a3de04a..27a7929 100644
ASS_Image result; ASS_Image result;
CompositeHashValue *source; CompositeHashValue *source;
diff --git a/libass/ass_shaper.c b/libass/ass_shaper.c diff --git a/libass/ass_shaper.c b/libass/ass_shaper.c
index fa445da..f4ed761 100644 index 86f2c66..e72a7d5 100644
--- a/libass/ass_shaper.c --- a/libass/ass_shaper.c
+++ b/libass/ass_shaper.c +++ b/libass/ass_shaper.c
@@ -87,8 +87,7 @@ struct ass_shaper_metrics_data { @@ -87,8 +87,7 @@ struct ass_shaper_metrics_data {
@ -33,7 +33,7 @@ index fa445da..f4ed761 100644
" HarfBuzz-ng %s (COMPLEX)", hb_version_string() " HarfBuzz-ng %s (COMPLEX)", hb_version_string()
); );
} }
@@ -687,8 +686,7 @@ static bool shape_harfbuzz(ASS_Shaper *shaper, GlyphInfo *glyphs, size_t len) @@ -705,8 +704,7 @@ static bool shape_harfbuzz(ASS_Shaper *shaper, GlyphInfo *glyphs, size_t len)
lead_context, i - offset + 1); lead_context, i - offset + 1);
} }
@ -43,7 +43,7 @@ index fa445da..f4ed761 100644
props.script = glyphs[offset].script; props.script = glyphs[offset].script;
props.language = hb_shaper_get_run_language(shaper, props.script); props.language = hb_shaper_get_run_language(shaper, props.script);
hb_buffer_set_segment_properties(buf, &props); hb_buffer_set_segment_properties(buf, &props);
@@ -754,35 +752,6 @@ void ass_shaper_determine_script(ASS_Shaper *shaper, GlyphInfo *glyphs, @@ -774,35 +772,6 @@ void ass_shaper_determine_script(ASS_Shaper *shaper, GlyphInfo *glyphs,
} }
} }
@ -55,7 +55,7 @@ index fa445da..f4ed761 100644
-static void shape_fribidi(ASS_Shaper *shaper, GlyphInfo *glyphs, size_t len) -static void shape_fribidi(ASS_Shaper *shaper, GlyphInfo *glyphs, size_t len)
-{ -{
- int i; - int i;
- FriBidiJoiningType *joins = calloc(sizeof(*joins), len); - FriBidiJoiningType *joins = calloc(len, sizeof(*joins));
- -
- // shape on codepoint level - // shape on codepoint level
- fribidi_get_joining_types(shaper->event_text, len, joins); - fribidi_get_joining_types(shaper->event_text, len, joins);
@ -79,7 +79,7 @@ index fa445da..f4ed761 100644
/** /**
* \brief Toggle kerning for HarfBuzz shaping. * \brief Toggle kerning for HarfBuzz shaping.
* \param shaper shaper instance * \param shaper shaper instance
@@ -875,7 +844,7 @@ void ass_shaper_set_base_direction(ASS_Shaper *shaper, FriBidiParType dir) @@ -895,7 +864,7 @@ void ass_shaper_set_base_direction(ASS_Shaper *shaper, FriBidiParType dir)
shaper->base_direction = dir; shaper->base_direction = dir;
if (shaper->whole_text_layout != WHOLE_TEXT_LAYOUT_EXPLICIT) if (shaper->whole_text_layout != WHOLE_TEXT_LAYOUT_EXPLICIT)
@ -88,7 +88,7 @@ index fa445da..f4ed761 100644
WHOLE_TEXT_LAYOUT_IMPLICIT : WHOLE_TEXT_LAYOUT_OFF; WHOLE_TEXT_LAYOUT_IMPLICIT : WHOLE_TEXT_LAYOUT_OFF;
} }
@@ -915,7 +884,7 @@ void ass_shaper_set_whole_text_layout(ASS_Shaper *shaper, bool enable) @@ -935,7 +904,7 @@ void ass_shaper_set_whole_text_layout(ASS_Shaper *shaper, bool enable)
{ {
shaper->whole_text_layout = enable ? shaper->whole_text_layout = enable ?
WHOLE_TEXT_LAYOUT_EXPLICIT : WHOLE_TEXT_LAYOUT_EXPLICIT :
@ -97,7 +97,7 @@ index fa445da..f4ed761 100644
WHOLE_TEXT_LAYOUT_IMPLICIT : WHOLE_TEXT_LAYOUT_OFF; WHOLE_TEXT_LAYOUT_IMPLICIT : WHOLE_TEXT_LAYOUT_OFF;
} }
@@ -926,8 +895,7 @@ void ass_shaper_set_whole_text_layout(ASS_Shaper *shaper, bool enable) @@ -946,8 +915,7 @@ void ass_shaper_set_whole_text_layout(ASS_Shaper *shaper, bool enable)
*/ */
bool ass_shaper_shape(ASS_Shaper *shaper, TextInfo *text_info) bool ass_shaper_shape(ASS_Shaper *shaper, TextInfo *text_info)
{ {
@ -107,7 +107,7 @@ index fa445da..f4ed761 100644
GlyphInfo *glyphs = text_info->glyphs; GlyphInfo *glyphs = text_info->glyphs;
shaper->event_text = text_info->event_text; shaper->event_text = text_info->event_text;
@@ -937,61 +905,7 @@ bool ass_shaper_shape(ASS_Shaper *shaper, TextInfo *text_info) @@ -957,61 +925,7 @@ bool ass_shaper_shape(ASS_Shaper *shaper, TextInfo *text_info)
for (i = 0; i < text_info->length; i++) for (i = 0; i < text_info->length; i++)
shaper->event_text[i] = glyphs[i].symbol; shaper->event_text[i] = glyphs[i].symbol;
@ -170,7 +170,7 @@ index fa445da..f4ed761 100644
} }
/** /**
@@ -1005,7 +919,7 @@ ASS_Shaper *ass_shaper_new(Cache *metrics_cache) @@ -1025,7 +939,7 @@ ASS_Shaper *ass_shaper_new(Cache *metrics_cache, Cache *face_size_metrics_cache)
if (!shaper) if (!shaper)
return NULL; return NULL;
@ -179,7 +179,7 @@ index fa445da..f4ed761 100644
if (!init_features(shaper)) if (!init_features(shaper))
goto error; goto error;
@@ -1066,38 +980,12 @@ void ass_shaper_cleanup(ASS_Shaper *shaper, TextInfo *text_info) @@ -1087,38 +1001,12 @@ void ass_shaper_cleanup(ASS_Shaper *shaper, TextInfo *text_info)
*/ */
FriBidiStrIndex *ass_shaper_reorder(ASS_Shaper *shaper, TextInfo *text_info) FriBidiStrIndex *ass_shaper_reorder(ASS_Shaper *shaper, TextInfo *text_info)
{ {
@ -219,7 +219,7 @@ index fa445da..f4ed761 100644
return shaper->cmap; return shaper->cmap;
} }
@@ -1115,10 +1003,5 @@ FriBidiStrIndex *ass_shaper_get_reorder_map(ASS_Shaper *shaper) @@ -1136,10 +1024,5 @@ FriBidiStrIndex *ass_shaper_get_reorder_map(ASS_Shaper *shaper)
*/ */
FriBidiParType ass_resolve_base_direction(int enc) FriBidiParType ass_resolve_base_direction(int enc)
{ {
@ -232,7 +232,7 @@ index fa445da..f4ed761 100644
+ return 0; + return 0;
} }
diff --git a/libass/ass_shaper.h b/libass/ass_shaper.h diff --git a/libass/ass_shaper.h b/libass/ass_shaper.h
index b4694b0..4d396e1 100644 index 06f868d..333252b 100644
--- a/libass/ass_shaper.h --- a/libass/ass_shaper.h
+++ b/libass/ass_shaper.h +++ b/libass/ass_shaper.h
@@ -21,14 +21,15 @@ @@ -21,14 +21,15 @@
@ -254,4 +254,21 @@ index b4694b0..4d396e1 100644
+typedef signed char FriBidiLevel; +typedef signed char FriBidiLevel;
void ass_shaper_info(ASS_Library *lib); void ass_shaper_info(ASS_Library *lib);
ASS_Shaper *ass_shaper_new(Cache *metrics_cache); ASS_Shaper *ass_shaper_new(Cache *metrics_cache, Cache *face_size_metrics_cache);
diff --git a/meson.build b/meson.build
index 9eb7969..bc40a57 100644
--- a/meson.build
+++ b/meson.build
@@ -87,12 +87,6 @@ deps += dependency(
default_options: ['harfbuzz=disabled'],
)
-deps += dependency(
- 'fribidi',
- version: '>= 0.19.1',
- default_options: ['docs=false', 'tests=false'],
-)
-
harfbuzz_options = [
'tests=disabled',
'cairo=disabled',

2
extra/libass/sources
View File

@ -1,2 +1,2 @@
https://github.com/libass/libass/releases/download/0.17.2/libass-0.17.2.tar.xz https://github.com/libass/libass/releases/download/0.17.3/libass-0.17.3.tar.xz
patches/no-fribidi.patch patches/no-fribidi.patch

2
extra/libass/version
View File

@ -1 +1 @@
0.17.2 1 0.17.3 1