From 079792d4e1c4eefaf91a1601561266e6edb4abc5 Mon Sep 17 00:00:00 2001 From: tsukumi Date: Tue, 10 May 2022 07:27:27 +0900 Subject: [PATCH] linuxarm64 image don't build libraries that are can't be build for arm64 (aarch64) --- scripts.d/45-x11/40-libx11.sh | 1 + scripts.d/45-x11/50-libxext.sh | 1 + scripts.d/45-x11/50-libxfixes.sh | 1 + scripts.d/45-x11/50-libxi.sh | 1 + scripts.d/45-x11/50-libxinerama.sh | 1 + scripts.d/45-x11/50-libxrender.sh | 1 + scripts.d/45-x11/50-libxscrnsaver.sh | 1 + scripts.d/45-x11/50-libxxf86vm.sh | 1 + scripts.d/45-x11/60-libglvnd.sh | 1 + scripts.d/45-x11/60-libxcursor.sh | 1 + scripts.d/45-x11/60-libxrandr.sh | 1 + scripts.d/45-x11/60-libxv.sh | 1 + scripts.d/50-davs2.sh | 2 ++ scripts.d/50-mfx.sh | 1 + scripts.d/50-sdl.sh | 1 + scripts.d/50-vaapi/50-libva.sh | 1 + scripts.d/50-xavs2.sh | 2 ++ 17 files changed, 19 insertions(+) diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index 6e84e24..ca9773f 100755 --- a/scripts.d/45-x11/40-libx11.sh +++ b/scripts.d/45-x11/40-libx11.sh @@ -5,6 +5,7 @@ LIBX11_COMMIT="35d1513bc7fdd3ac6f5807feb601efc34ac19163" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh index 77d5bad..3d7006a 100755 --- a/scripts.d/45-x11/50-libxext.sh +++ b/scripts.d/45-x11/50-libxext.sh @@ -5,6 +5,7 @@ LIBXEXT_COMMIT="47904063048fa6ef6e8e16219ddef4d14d5d9a4b" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh index 693f3dd..7c5f6d3 100755 --- a/scripts.d/45-x11/50-libxfixes.sh +++ b/scripts.d/45-x11/50-libxfixes.sh @@ -5,6 +5,7 @@ LIBXFIXES_COMMIT="6fe3bd64dd82f704ed91478acb4c99ab5c00be16" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh index 4ba520a..8d12604 100755 --- a/scripts.d/45-x11/50-libxi.sh +++ b/scripts.d/45-x11/50-libxi.sh @@ -5,6 +5,7 @@ LIBXI_COMMIT="f24d7f43ab4d97203e60677a3d42e11dbc80c8b4" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh index 9483165..bd94cb8 100755 --- a/scripts.d/45-x11/50-libxinerama.sh +++ b/scripts.d/45-x11/50-libxinerama.sh @@ -5,6 +5,7 @@ LIBXINERAMA_COMMIT="c5187f076d16601c15c59c5a2f05c0513d9f042b" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh index e4ac8af..8d2c475 100755 --- a/scripts.d/45-x11/50-libxrender.sh +++ b/scripts.d/45-x11/50-libxrender.sh @@ -5,6 +5,7 @@ LIBXRENDER_COMMIT="bce0618839fc33f44edd8b5498b8e33d167806ff" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh index 5b37c50..c227c4d 100755 --- a/scripts.d/45-x11/50-libxscrnsaver.sh +++ b/scripts.d/45-x11/50-libxscrnsaver.sh @@ -5,6 +5,7 @@ LIBXSCRNSAVER_COMMIT="aa9fd5061d0a8832480ad0c1acc9d2e864e807f4" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh index 147573f..bb13de9 100755 --- a/scripts.d/45-x11/50-libxxf86vm.sh +++ b/scripts.d/45-x11/50-libxxf86vm.sh @@ -5,6 +5,7 @@ LIBXXF86VM_COMMIT="7f43cd2a905e7b93b83c9ce81dabb768f6fa2bc7" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh index e43f202..122c185 100755 --- a/scripts.d/45-x11/60-libglvnd.sh +++ b/scripts.d/45-x11/60-libglvnd.sh @@ -5,6 +5,7 @@ GLVND_COMMIT="5024e5796ea16baf6f9203b1414c870a30b20474" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh index 4a11470..7718117 100755 --- a/scripts.d/45-x11/60-libxcursor.sh +++ b/scripts.d/45-x11/60-libxcursor.sh @@ -5,6 +5,7 @@ LIBXCURSOR_COMMIT="27adb16027fa99d83818a0ed9f6623cb03f0c574" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh index bc159c1..463d327 100755 --- a/scripts.d/45-x11/60-libxrandr.sh +++ b/scripts.d/45-x11/60-libxrandr.sh @@ -5,6 +5,7 @@ LIBXRANDR_COMMIT="55dcda4518eda8ae03ef25ea29d3c994ad71eb0a" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh index 1648a2e..3eb0107 100755 --- a/scripts.d/45-x11/60-libxv.sh +++ b/scripts.d/45-x11/60-libxv.sh @@ -5,6 +5,7 @@ LIBXV_COMMIT="03a6f599d060591a9a7cd8558bd2143a1c7c70d7" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 [[ $ADDINS_STR == *4.4* ]] && return -1 return 0 } diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh index 64b84a3..a95a370 100755 --- a/scripts.d/50-davs2.sh +++ b/scripts.d/50-davs2.sh @@ -6,6 +6,8 @@ DAVS2_COMMIT="b06d7585620f4e90a6d19a2926bb4e59793b8942" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 [[ $TARGET == win32 ]] && return -1 + # davs2 aarch64 support is broken + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh index 04cdf4d..fae8e16 100755 --- a/scripts.d/50-mfx.sh +++ b/scripts.d/50-mfx.sh @@ -4,6 +4,7 @@ MFX_REPO="https://github.com/lu-zero/mfx_dispatch.git" MFX_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c" ffbuild_enabled() { + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index 00ed7e3..6c754a0 100755 --- a/scripts.d/50-sdl.sh +++ b/scripts.d/50-sdl.sh @@ -4,6 +4,7 @@ SDL_REPO="https://github.com/libsdl-org/SDL.git" SDL_COMMIT="981e1e3c4489add5bf6d4df5415af3cf1ef2773d" ffbuild_enabled() { + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index fdc26f5..62d56dc 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -5,6 +5,7 @@ LIBVA_COMMIT="aeba58590726ab08b924e6a2ad0078d74c5dd01b" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 + [[ $TARGET == linuxarm64 ]] && return -1 return 0 } diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh index 309edd9..3c37a8c 100755 --- a/scripts.d/50-xavs2.sh +++ b/scripts.d/50-xavs2.sh @@ -6,6 +6,8 @@ XAVS2_COMMIT="eae1e8b9d12468059bdd7dee893508e470fa83d8" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 [[ $TARGET == win32 ]] && return -1 + # xavs2 aarch64 support is broken + [[ $TARGET == linuxarm64 ]] && return -1 return 0 }