From 21f5e861bb873bae936e6e64997c834accd7d707 Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 4 Aug 2022 20:25:22 +0200 Subject: [PATCH] Adjust build scripts after updates --- scripts.d/50-lilv/96-lv2.sh | 28 ++++++++++++++++++------- scripts.d/50-lilv/96-serd.sh | 2 -- scripts.d/50-lilv/97-sord.sh | 28 +++++++++++++++++-------- scripts.d/50-lilv/98-sratom.sh | 26 ++++++++++++++++------- scripts.d/50-lilv/99-lilv.sh | 31 ++++++++++++++++++---------- scripts.d/50-vulkan/60-libplacebo.sh | 1 + 6 files changed, 79 insertions(+), 37 deletions(-) diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh index 7e45c79..7ecc6ce 100755 --- a/scripts.d/50-lilv/96-lv2.sh +++ b/scripts.d/50-lilv/96-lv2.sh @@ -10,15 +10,29 @@ ffbuild_enabled() { ffbuild_dockerbuild() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lv2 cd lv2 - git submodule update --init --recursive --depth 1 - local mywaf=( + mkdir build && cd build + + local myconf=( --prefix="$FFBUILD_PREFIX" - --no-plugins - --no-coverage + --buildtype=release + --default-library=static + -Ddocs=disabled + -Dplugins=disabled + -Dtests=disabled + -Donline_docs=false ) - CC="${FFBUILD_CROSS_PREFIX}gcc" CXX="${FFBUILD_CROSS_PREFIX}g++" ./waf configure "${mywaf[@]}" - ./waf -j$(nproc) - ./waf install + if [[ $TARGET == win* || $TARGET == linux* ]]; then + myconf+=( + --cross-file=/cross.meson + ) + else + echo "Unknown target" + return -1 + fi + + meson "${myconf[@]}" .. + ninja -j"$(nproc)" + ninja install } diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh index 2969f6e..478ee38 100755 --- a/scripts.d/50-lilv/96-serd.sh +++ b/scripts.d/50-lilv/96-serd.sh @@ -34,6 +34,4 @@ ffbuild_dockerbuild() { meson "${myconf[@]}" .. ninja -j"$(nproc)" ninja install - - sed -i 's/Cflags:/Cflags: -DSERD_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/serd-0.pc } diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh index fc83d68..39c5530 100755 --- a/scripts.d/50-lilv/97-sord.sh +++ b/scripts.d/50-lilv/97-sord.sh @@ -10,18 +10,28 @@ ffbuild_enabled() { ffbuild_dockerbuild() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sord cd sord - git submodule update --init --recursive --depth 1 - local mywaf=( + mkdir build && cd build + + local myconf=( --prefix="$FFBUILD_PREFIX" - --no-utils - --static - --no-shared + --buildtype=release + --default-library=static + -Ddocs=disabled + -Dtools=disabled + -Dtests=disabled ) - CC="${FFBUILD_CROSS_PREFIX}gcc" CXX="${FFBUILD_CROSS_PREFIX}g++" ./waf configure "${mywaf[@]}" - ./waf -j$(nproc) - ./waf install + if [[ $TARGET == win* || $TARGET == linux* ]]; then + myconf+=( + --cross-file=/cross.meson + ) + else + echo "Unknown target" + return -1 + fi - sed -i 's/Cflags:/Cflags: -DSORD_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/sord-0.pc + meson "${myconf[@]}" .. + ninja -j"$(nproc)" + ninja install } diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh index 77d984c..a4aeaa0 100755 --- a/scripts.d/50-lilv/98-sratom.sh +++ b/scripts.d/50-lilv/98-sratom.sh @@ -10,17 +10,27 @@ ffbuild_enabled() { ffbuild_dockerbuild() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sratom cd sratom - git submodule update --init --recursive --depth 1 - local mywaf=( + mkdir build && cd build + + local myconf=( --prefix="$FFBUILD_PREFIX" - --static - --no-shared + --buildtype=release + --default-library=static + -Ddocs=disabled + -Dtests=disabled ) - CC="${FFBUILD_CROSS_PREFIX}gcc" CXX="${FFBUILD_CROSS_PREFIX}g++" ./waf configure "${mywaf[@]}" - ./waf -j$(nproc) - ./waf install + if [[ $TARGET == win* || $TARGET == linux* ]]; then + myconf+=( + --cross-file=/cross.meson + ) + else + echo "Unknown target" + return -1 + fi - sed -i 's/Cflags:/Cflags: -DSRATOM_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/sratom-0.pc + meson "${myconf[@]}" .. + ninja -j"$(nproc)" + ninja install } diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh index c3cff24..e6dbade 100755 --- a/scripts.d/50-lilv/99-lilv.sh +++ b/scripts.d/50-lilv/99-lilv.sh @@ -10,22 +10,31 @@ ffbuild_enabled() { ffbuild_dockerbuild() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lilv cd lilv - git submodule update --init --recursive --depth 1 - local mywaf=( + mkdir build && cd build + + local myconf=( --prefix="$FFBUILD_PREFIX" - --static - --no-shared - --no-bindings - --no-utils - --no-bash-completion + --buildtype=release + --default-library=static + -Ddocs=disabled + -Dtools=disabled + -Dtests=disabled + -Dbindings_py=disabled ) - CC="${FFBUILD_CROSS_PREFIX}gcc" CXX="${FFBUILD_CROSS_PREFIX}g++" ./waf configure "${mywaf[@]}" - ./waf -j$(nproc) - ./waf install + if [[ $TARGET == win* || $TARGET == linux* ]]; then + myconf+=( + --cross-file=/cross.meson + ) + else + echo "Unknown target" + return -1 + fi - sed -i 's/Cflags:/Cflags: -DLILV_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/lilv-0.pc + meson "${myconf[@]}" .. + ninja -j"$(nproc)" + ninja install } ffbuild_configure() { diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index 56afd57..27ade7d 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -11,6 +11,7 @@ ffbuild_enabled() { ffbuild_dockerbuild() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" placebo cd placebo + git submodule update --init --recursive mkdir build && cd build