From 588b6d8bfa1b2efdebf8c424c86f6069cceafa41 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Sun, 17 Nov 2024 15:26:17 -0500 Subject: Rough subtitles implementation, improve buffers Signed-off-by: Andrew Opalach --- subprojects/fontconfig.wrap | 7 +++++++ subprojects/freetype2.wrap | 4 ++++ subprojects/fribidi.wrap | 4 ++++ subprojects/harfbuzz.wrap | 4 ++++ subprojects/libass.wrap | 1 - subprojects/packagefiles/libass/meson.build | 21 --------------------- .../packagefiles/notcurses/notcurses_tmux.diff | 12 ++++++++++++ 7 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 subprojects/fontconfig.wrap create mode 100644 subprojects/freetype2.wrap create mode 100644 subprojects/fribidi.wrap create mode 100644 subprojects/harfbuzz.wrap delete mode 100644 subprojects/packagefiles/libass/meson.build create mode 100644 subprojects/packagefiles/notcurses/notcurses_tmux.diff (limited to 'subprojects') diff --git a/subprojects/fontconfig.wrap b/subprojects/fontconfig.wrap new file mode 100644 index 0000000..e562096 --- /dev/null +++ b/subprojects/fontconfig.wrap @@ -0,0 +1,7 @@ +[wrap-git] +url = https://gitlab.freedesktop.org/fontconfig/fontconfig.git +revision = main +depth = 1 + +[provide] +fontconfig = fontconfig_dep diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap new file mode 100644 index 0000000..19ee383 --- /dev/null +++ b/subprojects/freetype2.wrap @@ -0,0 +1,4 @@ +[wrap-git] +url = https://github.com/freetype/freetype.git +revision = master +depth = 1 diff --git a/subprojects/fribidi.wrap b/subprojects/fribidi.wrap new file mode 100644 index 0000000..9633214 --- /dev/null +++ b/subprojects/fribidi.wrap @@ -0,0 +1,4 @@ +[wrap-git] +url = https://github.com/fribidi/fribidi.git +revision = master +depth = 1 diff --git a/subprojects/harfbuzz.wrap b/subprojects/harfbuzz.wrap new file mode 100644 index 0000000..e58aed4 --- /dev/null +++ b/subprojects/harfbuzz.wrap @@ -0,0 +1,4 @@ +[wrap-git] +url = https://github.com/harfbuzz/harfbuzz.git +revision = main +depth = 1 diff --git a/subprojects/libass.wrap b/subprojects/libass.wrap index a253fd8..df69923 100644 --- a/subprojects/libass.wrap +++ b/subprojects/libass.wrap @@ -3,4 +3,3 @@ url = https://github.com/libass/libass.git revision = 0.17.3 clone-recursive = true depth = 1 -patch_directory = libass diff --git a/subprojects/packagefiles/libass/meson.build b/subprojects/packagefiles/libass/meson.build deleted file mode 100644 index 915a942..0000000 --- a/subprojects/packagefiles/libass/meson.build +++ /dev/null @@ -1,21 +0,0 @@ -project('libass', 'c', version: '0.17.3', meson_version : '>=0.57.0') - -ext_proj = import('unstable-external_project') - -compiler = meson.get_compiler('c') - -run_command('./autogen.sh', check: true) - -proj = ext_proj.add_project('configure', - configure_options: [ - '--prefix=@PREFIX@', - '--libdir=@PREFIX@/@LIBDIR@', - '--includedir=@PREFIX@/@INCLUDEDIR@', - ], verbose: true) - -ass = proj.dependency('ass') - -libass = declare_dependency(dependencies: ass, - include_directories: include_directories('.')) - -meson.override_dependency('libass', libass) diff --git a/subprojects/packagefiles/notcurses/notcurses_tmux.diff b/subprojects/packagefiles/notcurses/notcurses_tmux.diff new file mode 100644 index 0000000..49ca85b --- /dev/null +++ b/subprojects/packagefiles/notcurses/notcurses_tmux.diff @@ -0,0 +1,12 @@ +diff --git a/src/lib/in.c b/src/lib/in.c +index b6d4c79ef..cb128678c 100644 +--- a/src/lib/in.c ++++ b/src/lib/in.c +@@ -1823,6 +1823,7 @@ build_cflow_automaton(inputctx* ictx){ + { "[?7c", da1_cb, }, // CSI ? 7 c ("VT131") + { "[?1;0c", da1_cb, }, // CSI ? 1 ; 0 c ("VT101 with No Options") + { "[?1;2c", da1_cb, }, // CSI ? 1 ; 2 c ("VT100 with Advanced Video Option") ++ { "[?1;2;\\Dc", da1_attrs_cb, }, + { "[?4;6c", da1_cb, }, // CSI ? 4 ; 6 c ("VT132 with Advanced Video and Graphics") + // CSI ? 1 2 ; Ps c ("VT125") + // CSI ? 6 0 ; Ps c (kmscon) -- cgit v1.2.3-101-g0448