From dcc49081a260bd9ed98474e7fc5635feea89e1b0 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Sun, 12 Oct 2025 18:26:25 -0300 Subject: [PATCH] Try to fix more CMake-based recipes --- .../wip/libs/other/libseexpr-kde/recipe.toml | 20 +++----------- recipes/wip/libs/other/libsoundio/recipe.toml | 20 +++----------- recipes/wip/libs/other/libspdlog/recipe.toml | 19 ++------------ recipes/wip/libs/other/libsrt/recipe.toml | 3 ++- recipes/wip/libs/other/libssh/recipe.toml | 20 +++----------- .../wip/libs/other/liburiparser/recipe.toml | 19 ++------------ .../wip/libs/other/libvncserver/recipe.toml | 26 +++++-------------- recipes/wip/libs/other/libvulkan/recipe.toml | 21 +++------------ .../wip/libs/other/libwebsockets/recipe.toml | 19 ++------------ recipes/wip/libs/other/libxsimd/recipe.toml | 20 +++----------- 10 files changed, 30 insertions(+), 157 deletions(-) diff --git a/recipes/wip/libs/other/libseexpr-kde/recipe.toml b/recipes/wip/libs/other/libseexpr-kde/recipe.toml index 39d010df..6c7b11b6 100644 --- a/recipes/wip/libs/other/libseexpr-kde/recipe.toml +++ b/recipes/wip/libs/other/libseexpr-kde/recipe.toml @@ -1,24 +1,10 @@ -#TODO maybe incomplete script, see https://invent.kde.org/graphics/kseexpr#super-impatient-cmake-building-and-installing-guide +#TODO not compiled or tested +# build instructions: https://invent.kde.org/graphics/kseexpr#super-impatient-cmake-building-and-installing-guide [source] git = "https://invent.kde.org/graphics/kseexpr" rev = "d834b2dc6a7f452ffca4602f90b709db86a3a630" [build] -template = "custom" +template = "cmake" dependencies = [ "qt5-base", ] -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" diff --git a/recipes/wip/libs/other/libsoundio/recipe.toml b/recipes/wip/libs/other/libsoundio/recipe.toml index 80a4e0fc..31c835d4 100644 --- a/recipes/wip/libs/other/libsoundio/recipe.toml +++ b/recipes/wip/libs/other/libsoundio/recipe.toml @@ -1,21 +1,7 @@ -#TODO probably wrong script, see https://github.com/andrewrk/libsoundio#building +#TODO not compiled or tested +# build instructions: https://github.com/andrewrk/libsoundio#building [source] git = "https://github.com/andrewrk/libsoundio" rev = "dc4f84339039ac518b6cd1c0e7683e88e25be470" [build] -template = "custom" -script = """ - COOKBOOK_CONFIGURE="cmake" - COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" +template = "cmake" diff --git a/recipes/wip/libs/other/libspdlog/recipe.toml b/recipes/wip/libs/other/libspdlog/recipe.toml index 79400034..295574a8 100644 --- a/recipes/wip/libs/other/libspdlog/recipe.toml +++ b/recipes/wip/libs/other/libspdlog/recipe.toml @@ -1,20 +1,5 @@ -#TODO maybe incomplete script +#TODO not compiled or tested [source] git = "https://github.com/gabime/spdlog" [build] -template = "custom" -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" +template = "cmake" diff --git a/recipes/wip/libs/other/libsrt/recipe.toml b/recipes/wip/libs/other/libsrt/recipe.toml index d163fd07..cd8b2a74 100644 --- a/recipes/wip/libs/other/libsrt/recipe.toml +++ b/recipes/wip/libs/other/libsrt/recipe.toml @@ -1,4 +1,5 @@ -#TODO CMake error, see https://github.com/Haivision/srt/blob/master/docs/build/build-linux.md +#TODO CMake error +# build instructions: https://github.com/Haivision/srt/blob/master/docs/build/build-linux.md [source] git = "https://github.com/Haivision/srt" rev = "09f35c0f1743e23f514cb41444504a7faeacf89e" diff --git a/recipes/wip/libs/other/libssh/recipe.toml b/recipes/wip/libs/other/libssh/recipe.toml index b75d3a27..013570f2 100644 --- a/recipes/wip/libs/other/libssh/recipe.toml +++ b/recipes/wip/libs/other/libssh/recipe.toml @@ -1,24 +1,10 @@ -#TODO maybe incomplete script, see https://git.libssh.org/projects/libssh.git/tree/INSTALL#n36 +#TODO not compiled or tested +# build instructions: https://git.libssh.org/projects/libssh.git/tree/INSTALL#n36 [source] tar = "https://www.libssh.org/files/0.10/libssh-0.10.6.tar.xz" [build] -template = "custom" +template = "cmake" dependencies = [ "zlib", "openssl1", ] -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" diff --git a/recipes/wip/libs/other/liburiparser/recipe.toml b/recipes/wip/libs/other/liburiparser/recipe.toml index 73f68e7d..c95d227d 100644 --- a/recipes/wip/libs/other/liburiparser/recipe.toml +++ b/recipes/wip/libs/other/liburiparser/recipe.toml @@ -1,20 +1,5 @@ -#TODO compilation error +#TODO not compiled or tested [source] tar = "https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.8/uriparser-0.9.8.tar.bz2" [build] -template = "custom" -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" +template = "cmake" diff --git a/recipes/wip/libs/other/libvncserver/recipe.toml b/recipes/wip/libs/other/libvncserver/recipe.toml index b56fcdce..058ff6cb 100644 --- a/recipes/wip/libs/other/libvncserver/recipe.toml +++ b/recipes/wip/libs/other/libvncserver/recipe.toml @@ -1,28 +1,16 @@ -#TODO probably wrong script, see https://github.com/LibVNC/libvncserver#how-to-build +#TODO not compiled or tested +# build instructions: https://github.com/LibVNC/libvncserver#how-to-build [source] git = "https://github.com/LibVNC/libvncserver" rev = "10e9eb75f73e973725dc75c373de5d89807af028" [build] -template = "custom" +template = "cmake" +cmakeflags = [ + "-DWITH_OPENSSL=ON", + "-DWITH_GCRYPT=OFF", +] dependencies = [ "openssl1", "ffmpeg6", "libssh2", ] -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On - -DWITH_OPENSSL=ON - -DWITH_GCRYPT=OFF -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" diff --git a/recipes/wip/libs/other/libvulkan/recipe.toml b/recipes/wip/libs/other/libvulkan/recipe.toml index 23a72a2d..b7630f7d 100644 --- a/recipes/wip/libs/other/libvulkan/recipe.toml +++ b/recipes/wip/libs/other/libvulkan/recipe.toml @@ -1,25 +1,10 @@ -#TODO probably wrong script, see https://github.com/KhronosGroup/Vulkan-Loader/blob/main/BUILD.md -#TODO port to orbital +#TODO not compiled or tested +# build instructions: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/BUILD.md [source] git = "https://github.com/KhronosGroup/Vulkan-Loader" rev = "cf1a1eff115465b2425d287bef1e94ca62b0de1b" [build] -template = "custom" +template = "cmake" dependencies = [ "libxkbcommon", ] -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" diff --git a/recipes/wip/libs/other/libwebsockets/recipe.toml b/recipes/wip/libs/other/libwebsockets/recipe.toml index a878f665..c99518a2 100644 --- a/recipes/wip/libs/other/libwebsockets/recipe.toml +++ b/recipes/wip/libs/other/libwebsockets/recipe.toml @@ -1,24 +1,9 @@ -#TODO maybe wrong script +#TODO not compiled or tested [source] git = "https://github.com/warmcat/libwebsockets" rev = "4415e84c095857629863804e941b9e1c2e9347ef" [build] -template = "custom" +template = "cmake" dependencies = [ "openssl1", ] -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" diff --git a/recipes/wip/libs/other/libxsimd/recipe.toml b/recipes/wip/libs/other/libxsimd/recipe.toml index eb269b44..c2f013ce 100644 --- a/recipes/wip/libs/other/libxsimd/recipe.toml +++ b/recipes/wip/libs/other/libxsimd/recipe.toml @@ -1,21 +1,7 @@ -#TODO maybe incomplete script, see https://github.com/xtensor-stack/xsimd#install-from-sources +#TODO not compiled or tested +# build instructions: https://github.com/xtensor-stack/xsimd#install-from-sources [source] git = "https://github.com/xtensor-stack/xsimd" rev = "c1247bffa8fc36de7380a5cd42673a3b32f74c97" [build] -template = "custom" -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" +template = "cmake"