Update Chafa to v1.14.0

hectorm · Jan 14, 2024 · 86bf605 · 86bf605
1 parent 6a448d4
commit 86bf605
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 38 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -141,7 +141,7 @@ RUN emmake ninja -C ./build/ install
 RUN pkg-config --static --exists --print-errors libwebp
 
 # Build Chafa
-ARG CHAFA_TREEISH=5e77e15ebe916f529f075aa9d30c25dd9ea5b245
+ARG CHAFA_TREEISH=1.14.0
 ARG CHAFA_REMOTE=https://github.com/hpjansson/chafa.git
 WORKDIR ${BUILDDIR}/dep/chafa/
 RUN git clone "${CHAFA_REMOTE:?}" ./ \

diff --git a/Dockerfile.native b/Dockerfile.native
@@ -156,7 +156,7 @@ RUN ninja -C ./build/ install
 RUN pkg-config --static --exists --print-errors freetype2
 
 # Build Chafa
-ARG CHAFA_TREEISH=5e77e15ebe916f529f075aa9d30c25dd9ea5b245
+ARG CHAFA_TREEISH=1.14.0
 ARG CHAFA_REMOTE=https://github.com/hpjansson/chafa.git
 WORKDIR ${BUILDDIR}/dep/chafa/
 RUN git clone "${CHAFA_REMOTE:?}" ./ \

diff --git a/src/chafa-bindings.hpp b/src/chafa-bindings.hpp
@@ -59,6 +59,16 @@ EMSCRIPTEN_BINDINGS(Chafa) {
       .value("CHAFA_PIXEL_RGB8", CHAFA_PIXEL_RGB8)
       .value("CHAFA_PIXEL_BGR8", CHAFA_PIXEL_BGR8)
       .value("CHAFA_PIXEL_MAX", CHAFA_PIXEL_MAX);
+  emscripten::enum_<ChafaAlign>("ChafaAlign")
+      .value("CHAFA_ALIGN_START", CHAFA_ALIGN_START)
+      .value("CHAFA_ALIGN_END", CHAFA_ALIGN_END)
+      .value("CHAFA_ALIGN_CENTER", CHAFA_ALIGN_CENTER)
+      .value("CHAFA_ALIGN_MAX", CHAFA_ALIGN_MAX);
+  emscripten::enum_<ChafaTuck>("ChafaTuck")
+      .value("CHAFA_TUCK_STRETCH", CHAFA_TUCK_STRETCH)
+      .value("CHAFA_TUCK_FIT", CHAFA_TUCK_FIT)
+      .value("CHAFA_TUCK_SHRINK_TO_FIT", CHAFA_TUCK_SHRINK_TO_FIT)
+      .value("CHAFA_TUCK_MAX", CHAFA_TUCK_MAX);
   emscripten::enum_<ChafaFeatures>("ChafaFeatures")
       .value("CHAFA_FEATURE_MMX", CHAFA_FEATURE_MMX)
       .value("CHAFA_FEATURE_SSE41", CHAFA_FEATURE_SSE41)

diff --git a/src/exported_functions.txt b/src/exported_functions.txt
@@ -7,7 +7,7 @@ _chafa_canvas_new_similar
 _chafa_canvas_ref
 _chafa_canvas_unref
 _chafa_canvas_peek_config
-_chafa_canvas_set_image
+_chafa_canvas_set_placement
 _chafa_canvas_draw_all_pixels
 _chafa_canvas_set_contents_rgba8
 _chafa_canvas_build_ansi
@@ -77,6 +77,15 @@ _chafa_image_new
 _chafa_image_ref
 _chafa_image_unref
 _chafa_image_set_frame
+_chafa_placement_new
+_chafa_placement_ref
+_chafa_placement_unref
+_chafa_placement_get_tuck
+_chafa_placement_set_tuck
+_chafa_placement_get_halign
+_chafa_placement_set_halign
+_chafa_placement_get_valign
+_chafa_placement_set_valign
 _chafa_symbol_map_new
 _chafa_symbol_map_copy
 _chafa_symbol_map_ref