commit 1db19eb

hovercats  ·  2024-05-03 16:20:28 +0000 UTC
parent fa84d8f 
libass: make patch more consistent | merge the sed into the patch
4 files changed,  +40, -10
M repo/libass/build
M repo/libass/checksums
R repo/libass/patches/0001-remove-fribidi-dependency.patch
M repo/libass/sources
M repo/libass/build
+2, -8 
 1@@ -1,14 +1,8 @@
 2 #!/bin/sh -e
 3 
 4-patch -p1 < no-fribidi.patch
 5+patch -p1 < 0001-remove-fribidi-dependency.patch
 6 
 7-# Remove fribidi configure checks.
 8-sed -e 's/as_fn_error.*fribidi/: 0 "/' \
 9-    -e '/pkg_requires="fribidi >= .*/d' \
10-    configure > _
11-mv -f _ configure
12-
13-sh ./configure \
14+./configure \
15     FRIBIDI_LIBS="  " \
16     --prefix=/usr \
17     --enable-fontconfig
M repo/libass/checksums
+1, -1 
1@@ -1,2 +1,2 @@
2 049a2b9b2ca7a34eff8bdadcd7485e6a75fcbfbafb04ac6aeefb77923b7b69c2b0
3-344eb46475a7a19019c3b86184f415dc1e737f81e577770b6b0b051d9451969240
4+8fa8e4142d92d945f22a1bf0f1301840add2edd4447e0e944fd794db8593a15311
R repo/libass/patches/no-fribidi.patch => repo/libass/patches/0001-remove-fribidi-dependency.patch
+36, -0 
 1@@ -1,3 +1,36 @@
 2+From a1f12e45424d4f6fce1e22a7f294c608f291ed1b Mon Sep 17 00:00:00 2001
 3+From: hovercats <hovercatswithlasereyes@protonmail.com>
 4+Date: Fri, 3 May 2024 18:16:44 +0200
 5+Subject: [PATCH] remove fribidi dependency
 6+
 7+---
 8+ configure           |   3 +-
 9+ libass/ass_render.h |   3 +-
10+ libass/ass_shaper.c | 122 ++++----------------------------------------
11+ libass/ass_shaper.h |   9 ++--
12+ 4 files changed, 17 insertions(+), 120 deletions(-)
13+
14+diff --git a/configure b/configure
15+index 643f74e..a5ac16a 100755
16+--- a/configure
17++++ b/configure
18+@@ -14185,7 +14185,7 @@ fi
19+ 	# Put the nasty error message in config.log where it belongs
20+ 	echo "$FRIBIDI_PKG_ERRORS" >&5
21+ 
22+-	as_fn_error $? "Package requirements (fribidi >= 0.19.1) were not met:
23++	: 0 " >= 0.19.1) were not met:
24+ 
25+ $FRIBIDI_PKG_ERRORS
26+ 
27+@@ -14216,7 +14216,6 @@ else
28+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
29+ printf "%s\n" "yes" >&6; }
30+ 
31+-    pkg_requires="fribidi >= 0.19.1, ${pkg_requires}"
32+     CFLAGS="$CFLAGS $FRIBIDI_CFLAGS"
33+     LIBS="$LIBS $FRIBIDI_LIBS"
34+ 
35 diff --git a/libass/ass_render.h b/libass/ass_render.h
36 index 581c131..0cb5458 100644
37 --- a/libass/ass_render.h
38@@ -242,3 +275,6 @@ index 819a3fd..3eef8d7 100644
39  
40  void ass_shaper_info(ASS_Library *lib);
41  ASS_Shaper *ass_shaper_new(Cache *metrics_cache);
42+-- 
43+2.44.0
44+
M repo/libass/sources
+1, -1 
1@@ -1,2 +1,2 @@
2 https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz
3-patches/no-fribidi.patch
4+patches/0001-remove-fribidi-dependency.patch