added updated chafa as a submodule

Author: mmulet

.gitignore

@@ -19,6 +19,7 @@ dist
 resources/npm_licenses.txt
 .podman
 .podman-run
+third_party/chafa_source/build
 
 resources/out/bunterm
 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "third_party/chafa_source"]
+	path = third_party/chafa_source
+	url = https://github.com/hpjansson/chafa.git

Contributing.md

@@ -27,7 +27,6 @@ the dependencies
 - [Taskfile https://taskfile.dev/installation/](https://taskfile.dev/installation/) Installed by npm, or install globally for building and running the project, If you want to install globally and used uv in the last step, you can install it with ` uv tool install go-task-bin`
 - [ninja https://github.com/ninja-build/ninja/releases] (https://github.com/ninja-build/ninja/releases) as a build system used by meson
 - Pkg-config, gcc, and cmake with `sudo apt install pkg-config build-essential cmake` on ubuntu
-- [chafa](https://github.com/hpjansson/chafa) for terminal graphics, on ubuntu: `sudo apt install glib-2.0 chafa libchafa-dev`
 - Optional: [vscode](https://code.visualstudio.com/) with these recommended extensions:
     - "mesonbuild.mesonbuild",
     - "ms-vscode.cpptools-extension-pack",
@@ -37,6 +36,10 @@ the dependencies
     - "task.vscode-task",
     - "redhat.vscode-yaml"
 
+```sh
+git submodule update --init --recursive
+``
+
 ### Version map
 These are the versions of the tools used to build and run the project:
 - Bun 1.2.21
@@ -45,10 +48,11 @@ These are the versions of the tools used to build and run the project:
 - pkg-cofig 1.8.1
 - gcc 13.3.0
 - cmake 3.28.3
-- chafa 1.14.0
 - see third_party/Readme.md for the versions of the bundled dependencies
 
 
+
+
 # Running and building
 
 This project uses [task](https://taskfile.dev/) to manage tasks,

Taskfile.dist.yml

@@ -60,6 +60,7 @@ tasks:
     desc: Build everything need to run term.everything!mmulet.com
 
 
+
    # Shared publish flow (handles both local and podman)
   publish:_common:
     internal: true
@@ -205,7 +206,7 @@ tasks:
 includes:
   c-interop:
     taskfile: ./c_interop
-    internal: true
+    internal: false
   third-party:
     taskfile: ./third_party
     internal: true

c_interop/Taskfile.dist.yml

@@ -16,30 +16,59 @@ tasks:
         meson install -C build --no-rebuild
     silent: true
     env:
-      PKG_CONFIG_PATH:: '{{.chafa_PKG_CONFIG_PATH}}'
+      PKG_CONFIG_PATH: '{{.ROOT_DIR}}/{{.chafa_PKG_CONFIG_PATH}}'
   clean:
     dir: ..
     deps:
       - clean-setup
+      - clean-chafa
     cmds:
       - rm -rf {{.ROOT_DIR}}/{{.libinterop_OUT_DIR}}
 
 
-  build-setup:
+  build-chafa:
+    internal: true
+    silent: true
+    cmds:
+      - |
+        cd {{.ROOT_DIR}}/third_party/chafa_source
+        mkdir -p build
+        cd build
+        ../autogen.sh --prefix={{.ROOT_DIR}}/{{.chafa_OUT_DIR}}
+        make -j$(nproc)
+        make install
+    status:
+      - test -d {{.ROOT_DIR}}/{{.chafa_LIB_DIR}}
+
+  clean-chafa:
+    cmds:
+      - | 
+          cd {{.ROOT_DIR}}/third_party/chafa_source
+          make distclean || true
+      - rm -rf {{.ROOT_DIR}}/{{.chafa_OUT_DIR}}
+      - rm -rf {{.ROOT_DIR}}/third_party/chafa_source/build
+      
+
 
+
+  build-setup:
+    deps:
+      - build-chafa
     internal: true
     silent: true
     cmds:
       - |
         cd {{.TASKFILE_DIR}}
+        echo "Package config path is {{.PKG_CONFIG_PATH}}   {{.chafa_PKG_CONFIG_PATH}}"
         meson setup build --prefix={{.ROOT_DIR}}/{{.libinterop_OUT_DIR}}
     env:
-      PKG_CONFIG_PATH: '{{.chafa_PKG_CONFIG_PATH}}'
+      PKG_CONFIG_PATH: '{{.ROOT_DIR}}/{{.chafa_PKG_CONFIG_PATH}}'
     status:
       - test -d {{.TASKFILE_DIR}}/build
 
   clean-setup:
-
+    deps:
+      - clean-chafa
     cmds:
       - rm -rf {{.TASKFILE_DIR}}/build
 

c_interop/meson.build

@@ -7,7 +7,9 @@ project('libinterop', 'cpp', version: '1.2', default_options: [
 
 include = include_directories('include')
 
-chafa = dependency('chafa', version: '>=01.8.0')
+chafa = dependency('chafa', version: '>=1.8.0')
+# chafa_libdir = chafa.get_pkgconfig_variable('libdir')
+chafa_libdir = chafa.get_variable(pkgconfig: 'libdir')
 
 libinterop = shared_library('interop', 
     'src/listen_to_wayland.cpp',
@@ -45,7 +47,21 @@ libinterop = shared_library('interop',
         override_options: 'b_lundef=false',
         dependencies: [
             chafa
-            ])
+            ],
+        # Ensure the loader can find libchafa at runtime
+        # - Use the system libdir reported by pkg-config
+        # - Also allow looking relative to the .node location via $ORIGIN
+          install_rpath: chafa_libdir + ':$ORIGIN',
+          build_rpath: chafa_libdir + ':$ORIGIN',
+        # install_rpath: [ chafa_libdir, '$ORIGIN' ],
+        # Make it runnable from the build dir too
+        # link_args: [
+        #     '-Wl,-rpath,' + chafa_libdir,
+        #     '-Wl,-rpath,$ORIGIN'
+        # ]
+            
+            
+            )
 
 
 

resources/ContainerFile

@@ -12,7 +12,8 @@ RUN apt-get update && \
       pkg-config build-essential cmake ninja-build \
       libglib2.0-dev chafa libchafa-dev \
       software-properties-common \
-      file unzip
+      file unzip autoconf automake libtool \
+      libfreetype-dev
 
 
 # Ensure Bun's global bin is on PATH