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

Merge branch 'master' of https://github.com/BtbN/FFmpeg-Builds

Browse source
This commit is contained in:
sudo-nautilus 2021-04-27 08:35:09 +05:30
commit c8de445e7e
8 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
images/base-win32/Dockerfile
View file

@ -4,7 +4,7 @@ FROM ghcr.io/$GH_REPO/base:latest
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN \ RUN \
apt-get -y install binutils-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-i686 gfortran-mingw-w64-i686 && \ apt-get -y install binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 gfortran-mingw-w64-i686 && \
apt-get -y clean && \ apt-get -y clean && \
rm /usr/lib/gcc/*-w64-mingw32/*/libstdc++*.dll* && \ rm /usr/lib/gcc/*-w64-mingw32/*/libstdc++*.dll* && \
rm /usr/lib/gcc/*-w64-mingw32/*/libgcc_s* && \ rm /usr/lib/gcc/*-w64-mingw32/*/libgcc_s* && \

4
images/base-win32/cross.meson
View file

@ -7,8 +7,8 @@ windres = 'i686-w64-mingw32-windres'
exe_wrapper = ['wine'] exe_wrapper = ['wine']
[properties] [properties]
c_link_args = ['-static-libgcc'] c_link_args = ['-static-libgcc', '-L/opt/ffbuild/lib', '-O2', '-pipe', '-fstack-protector-strong']
cpp_link_args = ['-static-libgcc', '-static-libstdc++'] cpp_link_args = ['-static-libgcc', '-static-libstdc++', '-L/opt/ffbuild/lib', '-O2', '-pipe', '-fstack-protector-strong']
needs_exe_wrapper = true needs_exe_wrapper = true
[host_machine] [host_machine]

2
images/base-win64/Dockerfile
View file

@ -4,7 +4,7 @@ FROM ghcr.io/$GH_REPO/base:latest
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN \ RUN \
apt-get -y install binutils-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gfortran-mingw-w64-x86-64 && \ apt-get -y install binutils-mingw-w64-x86-64 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gfortran-mingw-w64-x86-64 && \
apt-get -y clean && \ apt-get -y clean && \
rm /usr/lib/gcc/*-w64-mingw32/*/libstdc++*.dll* && \ rm /usr/lib/gcc/*-w64-mingw32/*/libstdc++*.dll* && \
rm /usr/lib/gcc/*-w64-mingw32/*/libgcc_s* && \ rm /usr/lib/gcc/*-w64-mingw32/*/libgcc_s* && \

4
images/base-win64/cross.meson
View file

@ -7,8 +7,8 @@ windres = 'x86_64-w64-mingw32-windres'
exe_wrapper = ['wine'] exe_wrapper = ['wine']
[properties] [properties]
c_link_args = ['-static-libgcc'] c_link_args = ['-static-libgcc', '-L/opt/ffbuild/lib', '-O2', '-pipe', '-fstack-protector-strong']
cpp_link_args = ['-static-libgcc', '-static-libstdc++'] cpp_link_args = ['-static-libgcc', '-static-libstdc++', '-L/opt/ffbuild/lib', '-O2', '-pipe', '-fstack-protector-strong']
needs_exe_wrapper = true needs_exe_wrapper = true
[host_machine] [host_machine]

4
images/base/Dockerfile
View file

@ -1,11 +1,11 @@
FROM ubuntu:20.04 FROM ubuntu:21.04
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN \ 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 xxd pkgconf git curl wget cmake unzip subversion autoconf automake libtool autopoint cmake clang texinfo texi2html gperf gettext itstool ragel libc6-dev libssl-dev gtk-doc-tools gobject-introspection gawk meson ninja-build p7zip-full python3-distutils python3-apt python-is-python3 && \ apt-get -y install build-essential yasm nasm xxd pkgconf git curl wget unzip subversion autoconf automake libtool autopoint cmake clang texinfo texi2html gperf gettext itstool ragel libc6-dev libssl-dev gtk-doc-tools gobject-introspection gawk meson ninja-build p7zip-full python3-distutils python3-apt python-is-python3 && \
apt-get -y clean apt-get -y clean
RUN git config --global user.email "builder@localhost" && \ RUN git config --global user.email "builder@localhost" && \

18
scripts.d/25-fribidi.sh
View file

@ -11,25 +11,29 @@ ffbuild_dockerbuild() {
git-mini-clone "$FRIBIDI_REPO" "$FRIBIDI_COMMIT" fribidi git-mini-clone "$FRIBIDI_REPO" "$FRIBIDI_COMMIT" fribidi
cd fribidi cd fribidi
mkdir build && cd build
local myconf=( local myconf=(
--prefix="$FFBUILD_PREFIX" --prefix="$FFBUILD_PREFIX"
--disable-shared --buildtype=release
--enable-static --default-library=static
--with-pic -Dbin=false
-Ddocs=false
-Dtests=false
) )
if [[ $TARGET == win* ]]; then if [[ $TARGET == win* ]]; then
myconf+=( myconf+=(
--host="$FFBUILD_TOOLCHAIN" --cross-file=/cross.meson
) )
else else
echo "Unknown target" echo "Unknown target"
return -1 return -1
fi fi
./autogen.sh "${myconf[@]}" meson "${myconf[@]}" ..
make ninja -j$(nproc)
make install ninja install
sed -i 's/Cflags:/Cflags: -DFRIBIDI_LIB_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/fribidi.pc sed -i 's/Cflags:/Cflags: -DFRIBIDI_LIB_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/fribidi.pc
} }

3
scripts.d/45-vmaf.sh
View file

@ -11,6 +11,9 @@ ffbuild_dockerbuild() {
git-mini-clone "$VMAF_REPO" "$VMAF_COMMIT" vmaf git-mini-clone "$VMAF_REPO" "$VMAF_COMMIT" vmaf
cd vmaf cd vmaf
# Kill build of unused and broken tools
echo > libvmaf/tools/meson.build
mkdir build && cd build mkdir build && cd build
local myconf=( local myconf=(

8
scripts.d/50-xvid.sh
View file

@ -17,6 +17,14 @@ ffbuild_dockerbuild() {
cd build/generic cd build/generic
# The original code fails on a two-digit major...
sed -i\
-e 's/GCC_MAJOR=.*/GCC_MAJOR=10/' \
-e 's/GCC_MINOR=.*/GCC_MINOR=0/' \
configure.in
./bootstrap.sh
local myconf=( local myconf=(
--prefix="$FFBUILD_PREFIX" --prefix="$FFBUILD_PREFIX"
) )