Switch entirely to new stage builder

This commit is contained in:
BtbN 2020-09-05 16:38:11 +02:00
parent 3775b95e58
commit 3454294519
20 changed files with 43 additions and 43 deletions

View file

@ -7,8 +7,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/zlib.sh"
to_df "RUN bash -c 'source /root/zlib.sh && ffbuild_dockerbuild && rm /root/zlib.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -7,8 +7,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/libxml2.sh"
to_df "RUN bash -c 'source /root/libxml2.sh && ffbuild_dockerbuild && rm /root/libxml2.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -7,8 +7,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/ft.sh"
to_df "RUN bash -c 'source /root/ft.sh && ffbuild_dockerbuild && rm /root/ft.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -8,8 +8,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/fribidi.sh"
to_df "RUN bash -c 'source /root/fribidi.sh && ffbuild_dockerbuild && rm /root/fribidi.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -7,8 +7,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/gmp.sh"
to_df "RUN bash -c 'source /root/gmp.sh && ffbuild_dockerbuild && rm /root/gmp.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -7,8 +7,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/iconv.sh"
to_df "RUN bash -c 'source /root/iconv.sh && ffbuild_dockerbuild && rm /root/iconv.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -8,8 +8,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/ogg.sh"
to_df "RUN bash -c 'source /root/ogg.sh && ffbuild_dockerbuild && rm /root/ogg.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -7,8 +7,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/fc.sh"
to_df "RUN bash -c 'source /root/fc.sh && ffbuild_dockerbuild && rm /root/fc.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -8,8 +8,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/harfbuzz.sh"
to_df "RUN bash -c 'source /root/harfbuzz.sh && ffbuild_dockerbuild && rm /root/harfbuzz.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -8,8 +8,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/vorbis.sh"
to_df "RUN bash -c 'source /root/vorbis.sh && ffbuild_dockerbuild && rm /root/vorbis.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -8,8 +8,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/amf.sh"
to_df "RUN bash -c 'source /root/amf.sh && ffbuild_dockerbuild && rm /root/amf.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -8,8 +8,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/ffnvcodec.sh"
to_df "RUN bash -c 'source /root/ffnvcodec.sh && ffbuild_dockerbuild && rm /root/ffnvcodec.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -8,8 +8,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/ass.sh"
to_df "RUN bash -c 'source /root/ass.sh && ffbuild_dockerbuild && rm /root/ass.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -7,8 +7,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/lame.sh"
to_df "RUN bash -c 'source /root/lame.sh && ffbuild_dockerbuild && rm /root/lame.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -8,8 +8,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/opus.sh"
to_df "RUN bash -c 'source /root/opus.sh && ffbuild_dockerbuild && rm /root/opus.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -8,8 +8,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/theora.sh"
to_df "RUN bash -c 'source /root/theora.sh && ffbuild_dockerbuild && rm /root/theora.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -8,8 +8,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/libvpx.sh"
to_df "RUN bash -c 'source /root/libvpx.sh && ffbuild_dockerbuild && rm /root/libvpx.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -7,8 +7,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/sdl.sh"
to_df "RUN bash -c 'source /root/sdl.sh && ffbuild_dockerbuild && rm /root/sdl.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -9,8 +9,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/x264.sh"
to_df "RUN bash -c 'source /root/x264.sh && ffbuild_dockerbuild && rm /root/x264.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {

View file

@ -9,8 +9,8 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /root/x264.sh"
to_df "RUN bash -c 'source /root/x264.sh && ffbuild_dockerbuild && rm /root/x264.sh'"
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
@ -21,17 +21,17 @@ ffbuild_dockerbuild() {
mkdir 8bit 10bit 12bit
cd 12bit
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON ../source || return -1
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON ../source || return -1
make -j$(nproc) || return -1
cp libx265.a ../8bit/libx265_main12.a
cd ../10bit
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ../source || return -1
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ../source || return -1
make -j$(nproc) || return -1
cp libx265.a ../8bit/libx265_main10.a
cd ../8bit
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ../source || return -1
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ../source || return -1
make -j$(nproc) || return -1
mv libx265.a libx265_main.a