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

Don't depend on zip 

Closes #284
This commit is contained in:
BtbN 2023-07-22 15:46:55 +02:00
parent c07b573acd
commit 336c8909c8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -90,10 +90,10 @@ package_variant ffbuild/prefix "ffbuild/pkgroot/$BUILD_NAME"
cd ffbuild/pkgroot cd ffbuild/pkgroot
if [[ "${TARGET}" == win* ]]; then if [[ "${TARGET}" == win* ]]; then
OUTPUT_FNAME="${BUILD_NAME}.zip" OUTPUT_FNAME="${BUILD_NAME}.zip"
zip -9 -r "${ARTIFACTS_PATH}/${OUTPUT_FNAME}" "$BUILD_NAME" docker run --rm -i $TTY_ARG "${UIDARGS[@]}" -v "${ARTIFACTS_PATH}":/out -v "${PWD}/${BUILD_NAME}":"/${BUILD_NAME}" -w / "$IMAGE" zip -9 -r "/out/${OUTPUT_FNAME}" "$BUILD_NAME"
else else
OUTPUT_FNAME="${BUILD_NAME}.tar.xz" OUTPUT_FNAME="${BUILD_NAME}.tar.xz"
tar cJf "${ARTIFACTS_PATH}/${OUTPUT_FNAME}" "$BUILD_NAME" docker run --rm -i $TTY_ARG "${UIDARGS[@]}" -v "${ARTIFACTS_PATH}":/out -v "${PWD}/${BUILD_NAME}":"/${BUILD_NAME}" -w / "$IMAGE" tar cJf "/out/${OUTPUT_FNAME}" "$BUILD_NAME"
fi fi
cd - cd -

2
images/base/Dockerfile
View File

@ -8,7 +8,7 @@ RUN \
apt-get -y update && \ apt-get -y update && \
apt-get -y dist-upgrade && \ apt-get -y dist-upgrade && \
apt-get -y install build-essential yasm nasm \ apt-get -y install build-essential yasm nasm \
xxd pkgconf curl wget unzip git subversion mercurial \ xxd pkgconf curl wget unzip zip git subversion mercurial \
autoconf automake libtool libtool-bin autopoint gettext cmake clang meson ninja-build \ autoconf automake libtool libtool-bin autopoint gettext cmake clang meson ninja-build \
texinfo texi2html help2man flex bison groff \ texinfo texi2html help2man flex bison groff \
gperf itstool ragel libc6-dev libssl-dev \ gperf itstool ragel libc6-dev libssl-dev \