From ad18ba4b5d61c09e8bd3f549c35911b0f2e18069 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Thu, 20 Nov 2025 15:42:18 -0300 Subject: [PATCH] Improve some recipes and enable dynamic linking on postgresql --- recipes/wip/db/mariadb-lts/recipe.toml | 7 +-- recipes/wip/db/mariadb/recipe.toml | 12 +++-- recipes/wip/db/postgresql16/recipe.toml | 19 ++++---- recipes/wip/db/sqlite3/recipe.toml | 7 +-- .../graphics/editors/blender-lts/recipe.toml | 44 +++++++++---------- .../wip/graphics/editors/blender/recipe.toml | 43 +++++++++--------- .../net/bittorrent/webtorrent-cli/recipe.toml | 11 ++--- recipes/wip/net/download/yt-dlp/recipe.toml | 10 ++--- recipes/wip/video/other/jerry/recipe.toml | 10 ++++- 9 files changed, 79 insertions(+), 84 deletions(-) diff --git a/recipes/wip/db/mariadb-lts/recipe.toml b/recipes/wip/db/mariadb-lts/recipe.toml index 3a2e48aef..0666ff401 100644 --- a/recipes/wip/db/mariadb-lts/recipe.toml +++ b/recipes/wip/db/mariadb-lts/recipe.toml @@ -1,10 +1,11 @@ #TODO not compiled or tested +# build instructions: # https://mariadb.com/kb/en/generic-build-instructions/ # https://mariadb.com/kb/en/cross-compiling-mariadb/ [source] tar = "https://archive.mariadb.org/mariadb-10.11.6/source/mariadb-10.11.6.tar.gz" [build] -template = "custom" +template = "cmake" dependencies = [ "ncurses", "zlib", @@ -15,7 +16,3 @@ dependencies = [ "boost", "libaio", ] -script = """ -export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" -cookbook_cmake -""" diff --git a/recipes/wip/db/mariadb/recipe.toml b/recipes/wip/db/mariadb/recipe.toml index 39038da89..1ebf6c886 100644 --- a/recipes/wip/db/mariadb/recipe.toml +++ b/recipes/wip/db/mariadb/recipe.toml @@ -1,21 +1,19 @@ #TODO not compiled or tested +# build instructions: # https://mariadb.com/kb/en/generic-build-instructions/ # https://mariadb.com/kb/en/cross-compiling-mariadb/ [source] -tar = "https://archive.mariadb.org/mariadb-11.2.2/source/mariadb-11.2.2.tar.gz" +tar = "https://dlm.mariadb.com/4509471/MariaDB/mariadb-12.1.2/source/mariadb-12.1.2.tar.gz" [build] -template = "custom" +template = "cmake" dependencies = [ "ncurses", "zlib", "libevent", - "openssl1", + "openssl3", "curl", "libxml2", "boost", "libaio", ] -script = """ -export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" -cookbook_cmake -""" + diff --git a/recipes/wip/db/postgresql16/recipe.toml b/recipes/wip/db/postgresql16/recipe.toml index b439b54b2..e247d0b6b 100644 --- a/recipes/wip/db/postgresql16/recipe.toml +++ b/recipes/wip/db/postgresql16/recipe.toml @@ -1,18 +1,17 @@ #TODO waiting on sigjmp_buf and related POSIX functions in relibc [source] tar = "https://ftp.postgresql.org/pub/source/v16.0/postgresql-16.0.tar.bz2" +script = """ +cp "${COOKBOOK_SOURCE}/src/backend/utils/errcodes.h" "${COOKBOOK_SOURCE}/src/include/utils/errcodes.h" +""" [build] -template = "custom" +template = "configure" +configureflags = [ + "--without-icu", + "--without-readline", + "--with-template=redox", +] dependencies = [ "readline", "zlib", ] -script = """ -cp "${COOKBOOK_SOURCE}/src/backend/utils/errcodes.h" "${COOKBOOK_SOURCE}/src/include/utils/errcodes.h" -COOKBOOK_CONFIGURE_FLAGS+=( - --without-icu - --without-readline - --with-template=redox -) -cookbook_configure -""" diff --git a/recipes/wip/db/sqlite3/recipe.toml b/recipes/wip/db/sqlite3/recipe.toml index ae2822730..5bc410b9c 100644 --- a/recipes/wip/db/sqlite3/recipe.toml +++ b/recipes/wip/db/sqlite3/recipe.toml @@ -11,10 +11,5 @@ script = """ DYNAMIC_INIT autotools_recursive_regenerate """ - [build] -template = "custom" -script = """ -DYNAMIC_INIT -cookbook_configure -""" +template = "configure" diff --git a/recipes/wip/graphics/editors/blender-lts/recipe.toml b/recipes/wip/graphics/editors/blender-lts/recipe.toml index 52b4308c9..6c0414383 100644 --- a/recipes/wip/graphics/editors/blender-lts/recipe.toml +++ b/recipes/wip/graphics/editors/blender-lts/recipe.toml @@ -1,26 +1,26 @@ #TODO not compiled or tested -# build instructions: https://wiki.blender.org/wiki/Building_Blender/Linux/Generic_Distro -# probably missing dependencies -# customization - https://wiki.blender.org/wiki/Building_Blender/Options +#TODO determine the minimum dependencies from cmake log +# build instructions: https://developer.blender.org/docs/handbook/building_blender/ [source] -tar = "https://download.blender.org/source/blender-3.6.5.tar.xz" +git = "https://projects.blender.org/blender/blender" +branch = "blender-v4.5-release" [build] template = "cmake" -dependencies = [ - "dbus", - "libdecor", - "libjpeg", - "libpng", - "freetype2", - "fontconfig", - "zstd", - "bzip2", - "xz", - "sdl2", - "libepoxy", - "shaderc", - "libxml2", - "libharu", - "mesa-x11", - "libxkbcommon", -] +# dependencies = [ +# "dbus", +# "libdecor", +# "libjpeg", +# "libpng", +# "freetype2", +# "fontconfig", +# "zstd", +# "bzip2", +# "xz", +# "sdl2", +# "libepoxy", +# "shaderc", +# "libxml2", +# "libharu", +# "mesa-x11", +# "libxkbcommon", +# ] diff --git a/recipes/wip/graphics/editors/blender/recipe.toml b/recipes/wip/graphics/editors/blender/recipe.toml index 0399b0e69..1f47792b7 100644 --- a/recipes/wip/graphics/editors/blender/recipe.toml +++ b/recipes/wip/graphics/editors/blender/recipe.toml @@ -1,26 +1,25 @@ #TODO not compiled or tested -# build instructions: https://wiki.blender.org/wiki/Building_Blender/Linux/Generic_Distro -# probably missing dependencies -# customization - https://wiki.blender.org/wiki/Building_Blender/Options +#TODO determine the minimum dependencies from cmake log +# build instructions: https://developer.blender.org/docs/handbook/building_blender/ [source] -tar = "https://download.blender.org/source/blender-4.1.0.tar.xz" +tar = "https://download.blender.org/source/blender-5.0.0.tar.xz" [build] template = "cmake" -dependencies = [ - "dbus", - "libdecor", - "libjpeg", - "libpng", - "freetype2", - "fontconfig", - "zstd", - "bzip2", - "xz", - "sdl2", - "libepoxy", - "shaderc", - "libxml2", - "libharu", - "mesa-x11", - "libxkbcommon", -] +# dependencies = [ +# "dbus", +# "libdecor", +# "libjpeg", +# "libpng", +# "freetype2", +# "fontconfig", +# "zstd", +# "bzip2", +# "xz", +# "sdl2", +# "libepoxy", +# "shaderc", +# "libxml2", +# "libharu", +# "mesa-x11", +# "libxkbcommon", +# ] diff --git a/recipes/wip/net/bittorrent/webtorrent-cli/recipe.toml b/recipes/wip/net/bittorrent/webtorrent-cli/recipe.toml index 00dd4f3cd..d0eaa70ec 100644 --- a/recipes/wip/net/bittorrent/webtorrent-cli/recipe.toml +++ b/recipes/wip/net/bittorrent/webtorrent-cli/recipe.toml @@ -1,13 +1,14 @@ #TODO not compiled or tested [source] git = "https://github.com/webtorrent/webtorrent-cli" -rev = "298ae70a7baeb1bfc836abe2821baf78b50c3af1" +rev = "v5.1.3" [build] template = "custom" script = """ -mkdir -pv "${COOKBOOK_STAGE}"/usr/share/webtorrent-cli -mkdir -pv "${COOKBOOK_STAGE}"/usr/bin -cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}"/usr/share/webtorrent-cli -echo "#!/usr/bin/env sh \n cd /usr/share/webtorrent-cli \n npx webtorrent-cli" > "${COOKBOOK_STAGE}"/usr/bin/webtorrent-cli +mkdir -pv "${COOKBOOK_STAGE}"/usr/bin/webtorrent-cli-dir +cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}"/usr/bin/webtorrent-cli-dir +echo "#!/usr/bin/env sh \n cd /usr/bin/webtorrent-cli-dir/webtorrent-cli \n npx webtorrent-cli" > "${COOKBOOK_STAGE}"/usr/bin/webtorrent-cli chmod a+x "${COOKBOOK_STAGE}"/usr/bin/webtorrent-cli """ +[package] +dependencies = ["nodejs24"] diff --git a/recipes/wip/net/download/yt-dlp/recipe.toml b/recipes/wip/net/download/yt-dlp/recipe.toml index cdeeecf17..fcf7cba36 100644 --- a/recipes/wip/net/download/yt-dlp/recipe.toml +++ b/recipes/wip/net/download/yt-dlp/recipe.toml @@ -1,14 +1,12 @@ #TODO not compiled or tested -# dependencies - https://github.com/yt-dlp/yt-dlp#dependencies [source] -git = "https://github.com/yt-dlp/yt-dlp" +tar = "https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp.tar.gz" [build] template = "custom" script = """ -mkdir -pv "${COOKBOOK_STAGE}"/usr/share/yt-dlp -mkdir -pv "${COOKBOOK_STAGE}"/usr/bin +mkdir -pv "${COOKBOOK_STAGE}"/usr/bin/yt-dlp-dir cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}"/usr/share/yt-dlp -echo "#!/usr/bin/env sh \n /usr/share/yt-dlp/yt-dlp.sh" > "${COOKBOOK_STAGE}"/usr/bin/yt-dlp -chmod a+x "${COOKBOOK_STAGE}"/usr/share/yt-dlp/yt-dlp.sh +echo "#!/usr/bin/env sh \n /usr/bin/yt-dlp-dir/yt-dlp.sh" > "${COOKBOOK_STAGE}"/usr/bin/yt-dlp +chmod a+x "${COOKBOOK_STAGE}"/usr/bin/yt-dlp-dir/yt-dlp.sh chmod a+x "${COOKBOOK_STAGE}"/usr/bin/yt-dlp """ diff --git a/recipes/wip/video/other/jerry/recipe.toml b/recipes/wip/video/other/jerry/recipe.toml index cbc6203e8..d5c65c755 100644 --- a/recipes/wip/video/other/jerry/recipe.toml +++ b/recipes/wip/video/other/jerry/recipe.toml @@ -1,4 +1,4 @@ -#TODO promote +#TODO missing fzf dependency: https://github.com/junegunn/fzf [source] git = "https://github.com/justchokingaround/jerry" [build] @@ -8,3 +8,11 @@ mkdir -pv "${COOKBOOK_STAGE}"/usr/bin cp "${COOKBOOK_SOURCE}"/jerry.sh "${COOKBOOK_STAGE}"/usr/bin/jerry chmod a+x "${COOKBOOK_STAGE}"/usr/bin/jerry """ +[package] +dependencies = [ + "gnu-grep", + "sed", + "curl", + #"fzf", + "mpv", +]