dw/FFmpeg-Builds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix X11 and rust build on arm64

Browse source
This commit is contained in:
BtbN 2022-07-06 14:55:26 +02:00
parent f29d3b5662
commit 9c766b0b33
16 changed files with 64 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts.d/45-x11/40-libx11.sh
View file

@ -5,7 +5,6 @@ LIBX11_COMMIT="3a30ada60c5217ada37b143b541c8e6f6284c7fa"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
[[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@ -28,6 +27,12 @@ ffbuild_dockerbuild() {
--enable-ipv6
)
if [[ $TARGET == linuxarm64 ]]; then
myconf+=(
--disable-malloc0returnsnull
)
fi
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"

7
scripts.d/45-x11/50-libxext.sh
View file

@ -5,7 +5,6 @@ LIBXEXT_COMMIT="47904063048fa6ef6e8e16219ddef4d14d5d9a4b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
[[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@ -26,6 +25,12 @@ ffbuild_dockerbuild() {
--without-lint
)
if [[ $TARGET == linuxarm64 ]]; then
myconf+=(
--disable-malloc0returnsnull
)
fi
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"

1
scripts.d/45-x11/50-libxfixes.sh
View file

@ -5,7 +5,6 @@ LIBXFIXES_COMMIT="6fe3bd64dd82f704ed91478acb4c99ab5c00be16"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
[[ $TARGET == linuxarm64 ]] && return -1
return 0
}

7
scripts.d/45-x11/50-libxi.sh
View file

@ -5,7 +5,6 @@ LIBXI_COMMIT="f24d7f43ab4d97203e60677a3d42e11dbc80c8b4"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
[[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@ -22,6 +21,12 @@ ffbuild_dockerbuild() {
--with-pic
)
if [[ $TARGET == linuxarm64 ]]; then
myconf+=(
--disable-malloc0returnsnull
)
fi
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"

7
scripts.d/45-x11/50-libxinerama.sh
View file

@ -5,7 +5,6 @@ LIBXINERAMA_COMMIT="c5187f076d16601c15c59c5a2f05c0513d9f042b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
[[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@ -22,6 +21,12 @@ ffbuild_dockerbuild() {
--with-pic
)
if [[ $TARGET == linuxarm64 ]]; then
myconf+=(
--disable-malloc0returnsnull
)
fi
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"

7
scripts.d/45-x11/50-libxrender.sh
View file

@ -5,7 +5,6 @@ LIBXRENDER_COMMIT="bce0618839fc33f44edd8b5498b8e33d167806ff"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
[[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@ -22,6 +21,12 @@ ffbuild_dockerbuild() {
--with-pic
)
if [[ $TARGET == linuxarm64 ]]; then
myconf+=(
--disable-malloc0returnsnull
)
fi
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"

7
scripts.d/45-x11/50-libxscrnsaver.sh
View file

@ -5,7 +5,6 @@ LIBXSCRNSAVER_COMMIT="aa9fd5061d0a8832480ad0c1acc9d2e864e807f4"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
[[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@ -22,6 +21,12 @@ ffbuild_dockerbuild() {
--with-pic
)
if [[ $TARGET == linuxarm64 ]]; then
myconf+=(
--disable-malloc0returnsnull
)
fi
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"

7
scripts.d/45-x11/50-libxxf86vm.sh
View file

@ -5,7 +5,6 @@ LIBXXF86VM_COMMIT="7f43cd2a905e7b93b83c9ce81dabb768f6fa2bc7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
[[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@ -22,6 +21,12 @@ ffbuild_dockerbuild() {
--with-pic
)
if [[ $TARGET == linuxarm64 ]]; then
myconf+=(
--disable-malloc0returnsnull
)
fi
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"

1
scripts.d/45-x11/60-libglvnd.sh
View file

@ -5,7 +5,6 @@ GLVND_COMMIT="8e5f0f16467cc8ce870789d9a5b6a2c3f58921c9"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
[[ $TARGET == linuxarm64 ]] && return -1
return 0
}

1
scripts.d/45-x11/60-libxcursor.sh
View file

@ -5,7 +5,6 @@ LIBXCURSOR_COMMIT="27adb16027fa99d83818a0ed9f6623cb03f0c574"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
[[ $TARGET == linuxarm64 ]] && return -1
return 0
}

7
scripts.d/45-x11/60-libxrandr.sh
View file

@ -5,7 +5,6 @@ LIBXRANDR_COMMIT="55dcda4518eda8ae03ef25ea29d3c994ad71eb0a"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
[[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@ -22,6 +21,12 @@ ffbuild_dockerbuild() {
--with-pic
)
if [[ $TARGET == linuxarm64 ]]; then
myconf+=(
--disable-malloc0returnsnull
)
fi
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"

7
scripts.d/45-x11/60-libxv.sh
View file

@ -5,7 +5,6 @@ LIBXV_COMMIT="03a6f599d060591a9a7cd8558bd2143a1c7c70d7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
[[ $TARGET == linuxarm64 ]] && return -1
[[ $ADDINS_STR == *4.4* ]] && return -1
return 0
}
@ -24,6 +23,12 @@ ffbuild_dockerbuild() {
--without-lint
)
if [[ $TARGET == linuxarm64 ]]; then
myconf+=(
--disable-malloc0returnsnull
)
fi
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"