diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c4c2f51..fa8c5ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: strategy: fail-fast: false matrix: - target: [win64,linux64] + target: [win64] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/build.sh b/build.sh index ef82b48..dd48b60 100755 --- a/build.sh +++ b/build.sh @@ -40,6 +40,8 @@ FF_LDFLAGS="$(xargs <<< "$FF_LDFLAGS")" FF_LDEXEFLAGS="$(xargs <<< "$FF_LDEXEFLAGS")" FF_LIBS="$(xargs <<< "$FF_LIBS")" +echo $FF_CONFIGURE + TESTFILE="uidtestfile" rm -f "$TESTFILE" docker run --rm -v "$PWD:/uidtestdir" "$IMAGE" touch "/uidtestdir/$TESTFILE" diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh index 84c073e..c47bf08 100755 --- a/scripts.d/20-zlib.sh +++ b/scripts.d/20-zlib.sh @@ -3,7 +3,7 @@ ZLIB_SRC="https://zlib.net/zlib-1.2.11.tar.gz" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index fcba45d..d023b9b 100755 --- a/scripts.d/25-freetype.sh +++ b/scripts.d/25-freetype.sh @@ -4,7 +4,7 @@ FREETYPE_SRC="https://sourceforge.net/projects/freetype/files/freetype2/2.11.1/freetype-2.11.1.tar.xz/download" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh index d4c715b..326e71b 100755 --- a/scripts.d/25-fribidi.sh +++ b/scripts.d/25-fribidi.sh @@ -4,7 +4,7 @@ FRIBIDI_REPO="https://github.com/fribidi/fribidi.git" FRIBIDI_COMMIT="9ca69d112678832f3b734cc8e399583bb12de02d" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/25-libogg.sh b/scripts.d/25-libogg.sh index aee3dfc..ea4e4e4 100755 --- a/scripts.d/25-libogg.sh +++ b/scripts.d/25-libogg.sh @@ -4,7 +4,7 @@ OGG_REPO="https://github.com/xiph/ogg.git" OGG_COMMIT="3069cc2bb44160982cdb21b2b8f0660c76b17572" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index 7400c96..c594272 100755 --- a/scripts.d/25-openssl.sh +++ b/scripts.d/25-openssl.sh @@ -4,7 +4,7 @@ OPENSSL_REPO="https://github.com/openssl/openssl.git" OPENSSL_COMMIT="OpenSSL_1_1_1l" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index 62c13f2..fbefd60 100755 --- a/scripts.d/25-xz.sh +++ b/scripts.d/25-xz.sh @@ -3,7 +3,7 @@ XZ_SRC="https://sourceforge.net/projects/lzmautils/files/xz-5.2.5.tar.xz/download" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index 1a15464..420edbe 100755 --- a/scripts.d/35-fontconfig.sh +++ b/scripts.d/35-fontconfig.sh @@ -3,7 +3,7 @@ FONTCONFIG_SRC="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index d2cd884..5af0216 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -4,7 +4,7 @@ HARFBUZZ_REPO="https://github.com/harfbuzz/harfbuzz.git" HARFBUZZ_COMMIT="70f8c57e5c72697bdd2dc84b3573e1e90a94d681" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/45-libudfread.sh b/scripts.d/45-libudfread.sh index 346a4b0..daa942e 100755 --- a/scripts.d/45-libudfread.sh +++ b/scripts.d/45-libudfread.sh @@ -4,7 +4,7 @@ LIBUDFREAD_REPO="https://code.videolan.org/videolan/libudfread.git" LIBUDFREAD_COMMIT="b3e6936a23f8af30a0be63d88f4695bdc0ea26e1" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index 91e897f..59f753a 100755 --- a/scripts.d/50-ffnvcodec.sh +++ b/scripts.d/50-ffnvcodec.sh @@ -4,7 +4,7 @@ FFNVCODEC_REPO="https://github.com/FFmpeg/nv-codec-headers.git" FFNVCODEC_COMMIT="e81e2ba5e8f365d47d91c8c8688769f62614b644" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh index 5a7a0c7..d97ca9f 100755 --- a/scripts.d/50-gme.sh +++ b/scripts.d/50-gme.sh @@ -4,7 +4,7 @@ GME_REPO="https://bitbucket.org/mpyne/game-music-emu.git" GME_COMMIT="b3d158a30492181fd7c38ef795c8d4dcfd77eaa9" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index e4137f6..90ad86f 100755 --- a/scripts.d/50-libass.sh +++ b/scripts.d/50-libass.sh @@ -4,7 +4,7 @@ ASS_REPO="https://github.com/libass/libass.git" ASS_COMMIT="f8c71aba5d14afcd6759507bad8a25037fb854b1" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index 568ab60..e57420a 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -4,7 +4,7 @@ LIBVPX_REPO="https://chromium.googlesource.com/webm/libvpx" LIBVPX_COMMIT="13f984c2162d8392d3fd0ffb8666ee518f60665a" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh index 04cdf4d..94105d8 100755 --- a/scripts.d/50-mfx.sh +++ b/scripts.d/50-mfx.sh @@ -4,7 +4,7 @@ MFX_REPO="https://github.com/lu-zero/mfx_dispatch.git" MFX_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-opencore-amr.sh b/scripts.d/50-opencore-amr.sh index b55bd22..a8cd0f9 100755 --- a/scripts.d/50-opencore-amr.sh +++ b/scripts.d/50-opencore-amr.sh @@ -3,7 +3,7 @@ OAMR_SRC="https://sourceforge.net/projects/opencore-amr/files/opencore-amr/opencore-amr-0.1.5.tar.gz/download" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh index a3fb2f8..f098e68 100755 --- a/scripts.d/50-openjpeg.sh +++ b/scripts.d/50-openjpeg.sh @@ -4,7 +4,7 @@ OPENJPEG_REPO="https://github.com/uclouvain/openjpeg.git" OPENJPEG_COMMIT="22eb737d5d5d25947cec28cf23bcb0b4a5a682a3" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index c9fdc9a..0d02a5f 100755 --- a/scripts.d/50-openmpt.sh +++ b/scripts.d/50-openmpt.sh @@ -4,7 +4,7 @@ OPENMPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT" OPENMPT_REV="16134" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index d6c677c..e841867 100755 --- a/scripts.d/50-rubberband.sh +++ b/scripts.d/50-rubberband.sh @@ -5,7 +5,7 @@ RUBBERBAND_COMMIT="b3c920a35ed1ea4da37ddd62a12d3a81278097d1" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index a134da2..09ac7ff 100755 --- a/scripts.d/50-sdl.sh +++ b/scripts.d/50-sdl.sh @@ -4,7 +4,7 @@ SDL_REPO="https://github.com/libsdl-org/SDL.git" SDL_COMMIT="615f7b4453864d9475e8b20faa78ec67be357f1e" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-soxr.sh b/scripts.d/50-soxr.sh index 5df1fea..fcacf59 100755 --- a/scripts.d/50-soxr.sh +++ b/scripts.d/50-soxr.sh @@ -5,7 +5,7 @@ SOXR_REPO="https://git.code.sf.net/p/soxr/code" SOXR_COMMIT="945b592b70470e29f917f4de89b4281fbbd540c0" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index e60ca2b..f6e7c2a 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -4,7 +4,7 @@ SRT_REPO="https://github.com/Haivision/srt.git" SRT_COMMIT="c9a8db75e865925f156e0d1c3eeea02ec43e1208" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-twolame.sh b/scripts.d/50-twolame.sh index 6464678..916544f 100755 --- a/scripts.d/50-twolame.sh +++ b/scripts.d/50-twolame.sh @@ -3,7 +3,7 @@ TWOLAME_SRC="https://sourceforge.net/projects/twolame/files/twolame/0.4.0/twolame-0.4.0.tar.gz/download" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh index 9d643b8..5983b10 100755 --- a/scripts.d/50-uavs3d.sh +++ b/scripts.d/50-uavs3d.sh @@ -5,7 +5,7 @@ UAVS3D_COMMIT="23a42eefbcde8f4d826b71f2e158f948f3e2b3ee" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/variants/defaults-gpl-shared.sh b/variants/defaults-gpl-shared.sh index 439ebae..05e6979 100644 --- a/variants/defaults-gpl-shared.sh +++ b/variants/defaults-gpl-shared.sh @@ -1,3 +1,4 @@ #!/bin/bash source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh -FF_CONFIGURE+=" --enable-shared --disable-static" +#FF_CONFIGURE+=" --enable-shared --disable-static --disable-programs --disable-filters --disable-devices --disable-encoders --disable-muxers --disable-protocols" +FF_CONFIGURE+=" --enable-shared --disable-static --disable-filters --disable-devices --disable-encoders" diff --git a/variants/windows-install-shared.sh b/variants/windows-install-shared.sh index a7e7539..473e877 100644 --- a/variants/windows-install-shared.sh +++ b/variants/windows-install-shared.sh @@ -5,7 +5,7 @@ package_variant() { OUT="$2" mkdir -p "$OUT"/bin - cp "$IN"/bin/*.{exe,dll} "$OUT"/bin + cp "$IN"/bin/*.dll "$OUT"/bin mkdir -p "$OUT"/lib cp "$IN"/bin/*.lib "$OUT"/lib