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

Improve build script a bit

Browse source
This commit is contained in:
BtbN 2020-09-03 16:56:24 +02:00
parent 75d2e07732
commit b87c78bae4
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
generate.sh
View file

@ -11,12 +11,8 @@ to_df() {
} }
to_df "FROM $REPO:base-$TARGET" to_df "FROM $REPO:base-$TARGET"
to_df "ENV TARGET $TARGET" to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO"
to_df "ENV VARIANT $VARIANT" to_df "ENV FFBUILD_PREFIX=/opt/ffbuild PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig"
to_df "ENV REPO $REPO"
to_df "ENV FFPREFIX /opt/ffbuild"
to_df "ENV PKG_CONFIG_LIBDIR /opt/ffbuild/lib/pkgconfig"
for script in scripts.d/*.sh; do for script in scripts.d/*.sh; do
( (

2
images/base-win64/Dockerfile
View file

@ -7,3 +7,5 @@ RUN \
apt-get -y clean apt-get -y clean
ENV FFBUILD_TARGET_FLAGS "--pkg-config=pkg-config --cross-prefix=x86_64-w64-mingw32- --arch=x86_64 --target-os=win32" ENV FFBUILD_TARGET_FLAGS "--pkg-config=pkg-config --cross-prefix=x86_64-w64-mingw32- --arch=x86_64 --target-os=win32"
ENV FFBUILD_TOOLCHAIN x86_64-w64-mingw32
ENV FFBUILD_CROSS_PREFIX x86_64-w64-mingw32-

24
scripts.d/50-x264.sh
View file

@ -10,24 +10,34 @@ ffbuild_enabled() {
ffbuild_dockerstage() { ffbuild_dockerstage() {
to_df "ADD $SELF /root/x264.sh" to_df "ADD $SELF /root/x264.sh"
to_df "RUN bash -c 'source /root/x264.sh && ffbuild_dockerbuild'" to_df "RUN bash -c 'source /root/x264.sh && ffbuild_dockerbuild && rm /root/x264.sh'"
} }
ffbuild_dockerbuild() { ffbuild_dockerbuild() {
git clone "$X264_REPO" x264 || return -1 git clone "$X264_REPO" x264 || return -1
pushd x264 pushd x264
git checkout "$X264_COMMIT" || return -1 git switch "$X264_COMMIT" || return -1
if [[ $TARGET == win64 ]]; then local myconf=(
./configure --disable-cli --enable-static --enable-pic \ --disable-cli
--disable-lavf --disable-swscale \ --enable-static
--host=x86_64-w64-mingw32 --cross-prefix=x86_64-w64-mingw32- \ --enable-pic
--prefix="$FFPREFIX" || return -1 --disable-lavf
--disable-swscale
--prefix="$FFBUILD_PREFIX"
)
if [[ $TARGET == win* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"
--cross-prefix="$FFBUILD_CROSS_PREFIX"
)
else else
echo "Unknown target" echo "Unknown target"
return -1 return -1
fi fi
./configure "${myconf[@]}" || return -1
make -j$(nproc) || return -1 make -j$(nproc) || return -1
make install || return -1 make install || return -1