From b0416c8f36be8a57e7d7603dda9e6fb65f37285a Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 14 Nov 2021 14:49:36 +0100 Subject: [PATCH] Use make-based openh264 build system --- scripts.d/50-openh264.sh | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh index 95bae3a..0aec784 100755 --- a/scripts.d/50-openh264.sh +++ b/scripts.d/50-openh264.sh @@ -11,33 +11,37 @@ ffbuild_dockerbuild() { git-mini-clone "$OPENH264_REPO" "$OPENH264_COMMIT" openh264 cd openh264 - mkdir bdir && cd bdir - local myconf=( - --prefix="$FFBUILD_PREFIX" - --buildtype=release - --default-library=static - -Dtests=disabled + PREFIX="$FFBUILD_PREFIX" + BUILDTYPE=Release + DEBUGSYMBOLS=False + LIBDIR_NAME=lib + CC="$FFBUILD_CROSS_PREFIX"gcc + CXX="$FFBUILD_CROSS_PREFIX"g++ + AR="$FFBUILD_CROSS_PREFIX"ar ) - if [[ $TARGET == win* || $TARGET == linux* ]]; then + if [[ $TARGET == win32 ]]; then myconf+=( - --cross-file=/cross.meson + OS=mingw_nt + ARCH=i686 + ) + elif [[ $TARGET == win64 ]]; then + myconf+=( + OS=mingw_nt + ARCH=x86_64 + ) + elif [[ $TARGET == linux64 ]]; then + myconf+=( + OS=linux + ARCH=x86_64 ) else echo "Unknown target" return -1 fi - meson "${myconf[@]}" .. - ninja -j$(nproc) - ninja install - - if [[ $TARGET == win* ]]; then - rm "$FFBUILD_PREFIX"/{lib,bin}/libopenh264*.dll* - else - rm "$FFBUILD_PREFIX"/lib/libopenh264*.so* - fi + make -j$(nproc) "${myconf[@]}" install-static } ffbuild_configure() {