From aea1ed7d00d1c98c73741c5f547058ac5cb7de68 Mon Sep 17 00:00:00 2001 From: Markus Perl Date: Wed, 30 Nov 2022 10:11:17 +0100 Subject: [PATCH 1/7] update --- build-ffmpeg | 76 +++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/build-ffmpeg b/build-ffmpeg index e4089c18..b8d8c35b 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -417,6 +417,7 @@ else build_done "nettle" "3.8" fi +if ! $MACOS_M1; then if build "gnutls" "3.6.16"; then download "https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz" execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --disable-doc --disable-tools --disable-cxx --disable-tests --disable-gtk-doc-html --disable-libdane --disable-nls --enable-local-libopts --disable-guile --with-included-libtasn1 --with-included-unistring --without-p11-kit CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" @@ -426,6 +427,7 @@ else fi CONFIGURE_OPTIONS+=("--enable-gmp" "--enable-gnutls") fi +fi if build "cmake" "3.23.1"; then download "https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1.tar.gz" @@ -448,6 +450,7 @@ if command_exists "python3"; then if ! command_exists ${r}; then execute pip3 install ${r} --quiet --upgrade --no-cache-dir --disable-pip-version-check fi + export PATH=$PATH:~/Library/Python/3.9/bin done fi if command_exists "meson"; then @@ -655,65 +658,60 @@ CONFIGURE_OPTIONS+=("--enable-libzimg") if command_exists "python3"; then - if build "lv2" "1.18.2"; then - download "https://lv2plug.in/spec/lv2-1.18.2.tar.bz2" "lv2-1.18.2.tar.bz2" - execute python3 ./waf configure --prefix="${WORKSPACE}" --lv2-user - execute python3 ./waf - execute python3 ./waf install + if command_exists "meson"; then - build_done "lv2" "1.18.2" + if build "lv2" "1.18.10"; then + download "https://lv2plug.in/spec/lv2-1.18.10.tar.xz" "lv2-1.18.10.tar.xz" + execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib + execute ninja -C build + execute ninja -C build install + build_done "lv2" "1.18.10" fi if build "waflib" "b600c92"; then download "https://gitlab.com/drobilla/autowaf/-/archive/b600c928b221a001faeab7bd92786d0b25714bc8/autowaf-b600c928b221a001faeab7bd92786d0b25714bc8.tar.gz" "autowaf.tar.gz" build_done "waflib" "b600c92" fi - if build "serd" "0.30.10"; then - download "https://gitlab.com/drobilla/serd/-/archive/v0.30.10/serd-v0.30.10.tar.gz" "serd-v0.30.10.tar.gz" - execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/serd-v0.30.10/waflib/" - execute python3 ./waf configure --prefix="${WORKSPACE}" --static --no-shared --no-posix - execute python3 ./waf - execute python3 ./waf install - build_done "serd" "0.30.10" + if build "serd" "0.30.16"; then + download "https://gitlab.com/drobilla/serd/-/archive/v0.30.16/serd-v0.30.16.tar.gz" "serd-v0.30.16.tar.gz" + execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib + execute ninja -C build + execute ninja -C build install + build_done "serd" "0.30.16" fi if build "pcre" "8.45"; then download "https://altushost-swe.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.gz" "pcre-8.45.tar.gz" execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static execute make -j $MJOBS execute make install - build_done "pcre" "8.45" fi - if build "sord" "0.16.8"; then - download "https://gitlab.com/drobilla/sord/-/archive/v0.16.8/sord-v0.16.8.tar.gz" "sord-v0.16.8.tar.gz" - execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/sord-v0.16.8/waflib/" - execute python3 ./waf configure --prefix="${WORKSPACE}" CFLAGS="${CFLAGS}" --static --no-shared --no-utils - execute python3 ./waf CFLAGS="${CFLAGS}" - execute python3 ./waf install - - build_done "sord" "0.16.8" - fi - if build "sratom" "0.6.8"; then - download "https://gitlab.com/lv2/sratom/-/archive/v0.6.8/sratom-v0.6.8.tar.gz" "sratom-v0.6.8.tar.gz" - execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/sratom-v0.6.8/waflib/" - execute python3 ./waf configure --prefix="${WORKSPACE}" --static --no-shared - execute python3 ./waf - execute python3 ./waf install - - build_done "sratom" "0.6.8" - fi - if build "lilv" "0.24.12"; then - download "https://gitlab.com/lv2/lilv/-/archive/v0.24.12/lilv-v0.24.12.tar.gz" "lilv-v0.24.12.tar.gz" - execute cp -r "${PACKAGES}"/autowaf/* "${PACKAGES}/lilv-v0.24.12/waflib/" - execute python3 ./waf configure --prefix="${WORKSPACE}" --static --no-shared --no-utils - execute python3 ./waf - execute python3 ./waf install - build_done "lilv" "0.24.12" + if build "sord" "0.16.14"; then + download "https://gitlab.com/drobilla/sord/-/archive/v0.16.14/sord-v0.16.14.tar.gz" "sord-v0.16.14.tar.gz" + execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib + execute ninja -C build + execute ninja -C build install + build_done "sord" "0.16.14" + fi + if build "sratom" "0.6.14"; then + download "https://gitlab.com/lv2/sratom/-/archive/v0.6.14/sratom-v0.6.14.tar.gz" "sratom-v0.6.14.tar.gz" + execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib + execute ninja -C build + execute ninja -C build install + build_done "sratom" "0.6.14" + fi + if build "lilv" "0.24.20"; then + download "https://gitlab.com/lv2/lilv/-/archive/v0.24.20/lilv-v0.24.20.tar.gz" "lilv-v0.24.20.tar.gz" + execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib + execute ninja -C build + execute ninja -C build install + build_done "lilv" "0.24.20" fi CFLAGS+=" -I$WORKSPACE/include/lilv-0" CONFIGURE_OPTIONS+=("--enable-lv2") fi +fi if build "opencore" "0.1.5"; then download "https://sourceforge.net/projects/opencore-amr/files/opencore-amr/opencore-amr-0.1.5.tar.gz/download?use_mirror=gigenet" "opencore-amr-0.1.5.tar.gz" From 3f61d36fa2e5335518069643c672e01278c53782 Mon Sep 17 00:00:00 2001 From: Markus Perl Date: Wed, 30 Nov 2022 12:41:26 +0100 Subject: [PATCH 2/7] ubuntu update --- .github/workflows/build.yml | 24 ++++++++++++------------ Dockerfile | 4 ++-- build-ffmpeg | 4 ++-- full-static.dockerfile | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 177efb20..060d342b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ on: jobs: build-linux: name: build in native linux - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.10 steps: - name: Checkout code uses: actions/checkout@v2 @@ -59,7 +59,7 @@ jobs: build-docker: name: build in docker - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.10 steps: - name: Checkout code uses: actions/checkout@v2 @@ -67,11 +67,11 @@ jobs: - name: pull base image id: ubuntu_pull run: | - docker pull ubuntu:20.04 + docker pull ubuntu:22.10 - name: run if ubuntu_pull failed if: failure() && steps.ubuntu_pull.outcome == 'failure' run: | - docker pull ubuntu:20.04 + docker pull ubuntu:22.10 - name: build ffmpeg run: | docker build -t ffmpeg:ubuntu -f Dockerfile . @@ -81,7 +81,7 @@ jobs: build-cuda-ubuntu-docker: name: build in ubuntu docker with cuda - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.10 steps: - name: Checkout code uses: actions/checkout@v2 @@ -89,13 +89,13 @@ jobs: - name: pull base image id: cuda_ubuntu_pull run: | - docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04 - docker pull ubuntu:20.04 + docker pull nvidia/cuda:11.4.2-devel-ubuntu22.10 + docker pull ubuntu:22.10 - name: run if cuda_ubuntu_pull failed if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure' run: | - docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04 - docker pull ubuntu:20.04 + docker pull nvidia/cuda:11.4.2-devel-ubuntu22.10 + docker pull ubuntu:22.10 - name: build ffmpeg run: | docker build -t ffmpeg:cuda-ubuntu -f cuda-ubuntu.dockerfile . @@ -129,7 +129,7 @@ jobs: build-full-static: name: full static build in docker - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.10 steps: - name: Checkout code uses: actions/checkout@v2 @@ -137,11 +137,11 @@ jobs: - name: pull base image id: cuda_ubuntu_pull run: | - docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04 + docker pull nvidia/cuda:11.4.2-devel-ubuntu22.10 - name: run if cuda_ubuntu_pull failed if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure' run: | - docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04 + docker pull nvidia/cuda:11.4.2-devel-ubuntu22.10 - name: build ffmpeg run: | docker build -t ffmpeg:cuda-static -f full-static.dockerfile . diff --git a/Dockerfile b/Dockerfile index 96c67b6c..854e3926 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 AS build +FROM ubuntu:22.10 AS build ENV DEBIAN_FRONTEND noninteractive @@ -13,7 +13,7 @@ COPY ./build-ffmpeg /app/build-ffmpeg RUN SKIPINSTALL=yes /app/build-ffmpeg --build -FROM ubuntu:20.04 +FROM ubuntu:22.10 ENV DEBIAN_FRONTEND noninteractive diff --git a/build-ffmpeg b/build-ffmpeg index b8d8c35b..782a4e1b 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -417,7 +417,7 @@ else build_done "nettle" "3.8" fi -if ! $MACOS_M1; then +if ! $ARCH == 'arm64'; then if build "gnutls" "3.6.16"; then download "https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz" execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --disable-doc --disable-tools --disable-cxx --disable-tests --disable-gtk-doc-html --disable-libdane --disable-nls --enable-local-libopts --disable-guile --with-included-libtasn1 --with-included-unistring --without-p11-kit CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" @@ -425,7 +425,7 @@ if ! $MACOS_M1; then execute make install build_done "gnutls" "3.6.16" fi - CONFIGURE_OPTIONS+=("--enable-gmp" "--enable-gnutls") + # CONFIGURE_OPTIONS+=("--enable-gmp" "--enable-gnutls") fi fi diff --git a/full-static.dockerfile b/full-static.dockerfile index 7f334e3c..98ce7650 100644 --- a/full-static.dockerfile +++ b/full-static.dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 AS build +FROM ubuntu:22.10 AS build ENV DEBIAN_FRONTEND noninteractive ENV NVIDIA_VISIBLE_DEVICES all From 81886b95b130b2c089a993cc5c5fd40f644ba21c Mon Sep 17 00:00:00 2001 From: Markus Perl Date: Wed, 30 Nov 2022 19:27:37 +0100 Subject: [PATCH 3/7] Github Workflow update --- .github/workflows/build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 060d342b..98f99811 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ on: jobs: build-linux: name: build in native linux - runs-on: ubuntu-22.10 + runs-on: ubuntu-22.04 steps: - name: Checkout code uses: actions/checkout@v2 @@ -59,7 +59,7 @@ jobs: build-docker: name: build in docker - runs-on: ubuntu-22.10 + runs-on: ubuntu-22.04 steps: - name: Checkout code uses: actions/checkout@v2 @@ -67,11 +67,11 @@ jobs: - name: pull base image id: ubuntu_pull run: | - docker pull ubuntu:22.10 + docker pull ubuntu:22.04 - name: run if ubuntu_pull failed if: failure() && steps.ubuntu_pull.outcome == 'failure' run: | - docker pull ubuntu:22.10 + docker pull ubuntu:22.04 - name: build ffmpeg run: | docker build -t ffmpeg:ubuntu -f Dockerfile . @@ -81,7 +81,7 @@ jobs: build-cuda-ubuntu-docker: name: build in ubuntu docker with cuda - runs-on: ubuntu-22.10 + runs-on: ubuntu-22.04 steps: - name: Checkout code uses: actions/checkout@v2 @@ -89,13 +89,13 @@ jobs: - name: pull base image id: cuda_ubuntu_pull run: | - docker pull nvidia/cuda:11.4.2-devel-ubuntu22.10 - docker pull ubuntu:22.10 + docker pull nvidia/cuda:11.4.2-devel-ubuntu22.04 + docker pull ubuntu:22.04 - name: run if cuda_ubuntu_pull failed if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure' run: | - docker pull nvidia/cuda:11.4.2-devel-ubuntu22.10 - docker pull ubuntu:22.10 + docker pull nvidia/cuda:11.4.2-devel-ubuntu22.04 + docker pull ubuntu:22.04 - name: build ffmpeg run: | docker build -t ffmpeg:cuda-ubuntu -f cuda-ubuntu.dockerfile . @@ -129,7 +129,7 @@ jobs: build-full-static: name: full static build in docker - runs-on: ubuntu-22.10 + runs-on: ubuntu-22.04 steps: - name: Checkout code uses: actions/checkout@v2 @@ -137,11 +137,11 @@ jobs: - name: pull base image id: cuda_ubuntu_pull run: | - docker pull nvidia/cuda:11.4.2-devel-ubuntu22.10 + docker pull nvidia/cuda:11.4.2-devel-ubuntu22.04 - name: run if cuda_ubuntu_pull failed if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure' run: | - docker pull nvidia/cuda:11.4.2-devel-ubuntu22.10 + docker pull nvidia/cuda:11.4.2-devel-ubuntu22.04 - name: build ffmpeg run: | docker build -t ffmpeg:cuda-static -f full-static.dockerfile . From bb9ad6ee7518db54f21b56f1e12915bae3457bd2 Mon Sep 17 00:00:00 2001 From: Markus Perl Date: Wed, 30 Nov 2022 19:30:42 +0100 Subject: [PATCH 4/7] ubuntu update --- .github/workflows/build.yml | 4 ++-- cuda-ubuntu.dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98f99811..736404e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,12 +89,12 @@ jobs: - name: pull base image id: cuda_ubuntu_pull run: | - docker pull nvidia/cuda:11.4.2-devel-ubuntu22.04 + docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04 docker pull ubuntu:22.04 - name: run if cuda_ubuntu_pull failed if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure' run: | - docker pull nvidia/cuda:11.4.2-devel-ubuntu22.04 + docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04 docker pull ubuntu:22.04 - name: build ffmpeg run: | diff --git a/cuda-ubuntu.dockerfile b/cuda-ubuntu.dockerfile index 0f6f0d90..08888c77 100644 --- a/cuda-ubuntu.dockerfile +++ b/cuda-ubuntu.dockerfile @@ -1,6 +1,6 @@ -ARG VER=20.04 +ARG VER=22.04 -FROM nvidia/cuda:11.4.2-devel-ubuntu${VER} AS build +FROM nvidia/cuda:11.8.0-devel-ubuntu${VER} AS build ENV DEBIAN_FRONTEND noninteractive ENV NVIDIA_VISIBLE_DEVICES all From 623470ef6a48bc6dd731288edb1dc81d71967305 Mon Sep 17 00:00:00 2001 From: Markus Perl Date: Wed, 30 Nov 2022 19:38:26 +0100 Subject: [PATCH 5/7] if fix --- build-ffmpeg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-ffmpeg b/build-ffmpeg index 782a4e1b..03666fb1 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -417,7 +417,7 @@ else build_done "nettle" "3.8" fi -if ! $ARCH == 'arm64'; then +if [[ ! $ARCH == 'arm64' ]]; then if build "gnutls" "3.6.16"; then download "https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz" execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --disable-doc --disable-tools --disable-cxx --disable-tests --disable-gtk-doc-html --disable-libdane --disable-nls --enable-local-libopts --disable-guile --with-included-libtasn1 --with-included-unistring --without-p11-kit CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" From 8aff9b901f532c8ff61e6136605b14f57e728816 Mon Sep 17 00:00:00 2001 From: Markus Perl Date: Wed, 30 Nov 2022 19:48:41 +0100 Subject: [PATCH 6/7] Workflow update --- .github/workflows/build.yml | 4 ++-- full-static.dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 736404e3..8ac9e03c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -137,11 +137,11 @@ jobs: - name: pull base image id: cuda_ubuntu_pull run: | - docker pull nvidia/cuda:11.4.2-devel-ubuntu22.04 + docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04 - name: run if cuda_ubuntu_pull failed if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure' run: | - docker pull nvidia/cuda:11.4.2-devel-ubuntu22.04 + docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04 - name: build ffmpeg run: | docker build -t ffmpeg:cuda-static -f full-static.dockerfile . diff --git a/full-static.dockerfile b/full-static.dockerfile index 98ce7650..6c075927 100644 --- a/full-static.dockerfile +++ b/full-static.dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.10 AS build +FROM ubuntu:22.04 AS build ENV DEBIAN_FRONTEND noninteractive ENV NVIDIA_VISIBLE_DEVICES all From 85c3a84eedee979f9944b4517a658ad33f885224 Mon Sep 17 00:00:00 2001 From: Markus Perl Date: Wed, 30 Nov 2022 20:24:25 +0100 Subject: [PATCH 7/7] cuda update --- cuda-ubuntu.dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cuda-ubuntu.dockerfile b/cuda-ubuntu.dockerfile index 08888c77..d14f4127 100644 --- a/cuda-ubuntu.dockerfile +++ b/cuda-ubuntu.dockerfile @@ -29,11 +29,11 @@ RUN apt-get update \ && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* # Copy libnpp -COPY --from=build /usr/local/cuda-11.4/targets/x86_64-linux/lib/libnppc.so.11 /lib/x86_64-linux-gnu/libnppc.so.11 -COPY --from=build /usr/local/cuda-11.4/targets/x86_64-linux/lib/libnppig.so.11 /lib/x86_64-linux-gnu/libnppig.so.11 -COPY --from=build /usr/local/cuda-11.4/targets/x86_64-linux/lib/libnppicc.so.11 /lib/x86_64-linux-gnu/libnppicc.so.11 -COPY --from=build /usr/local/cuda-11.4/targets/x86_64-linux/lib/libnppidei.so.11 /lib/x86_64-linux-gnu/libnppidei.so.11 -COPY --from=build /usr/local/cuda-11.4/targets/x86_64-linux/lib/libnppif.so.11 /lib/x86_64-linux-gnu/libnppif.so.11 +COPY --from=build /usr/local/cuda-11.8/targets/x86_64-linux/lib/libnppc.so.11 /lib/x86_64-linux-gnu/libnppc.so.11 +COPY --from=build /usr/local/cuda-11.8/targets/x86_64-linux/lib/libnppig.so.11 /lib/x86_64-linux-gnu/libnppig.so.11 +COPY --from=build /usr/local/cuda-11.8/targets/x86_64-linux/lib/libnppicc.so.11 /lib/x86_64-linux-gnu/libnppicc.so.11 +COPY --from=build /usr/local/cuda-11.8/targets/x86_64-linux/lib/libnppidei.so.11 /lib/x86_64-linux-gnu/libnppidei.so.11 +COPY --from=build /usr/local/cuda-11.8/targets/x86_64-linux/lib/libnppif.so.11 /lib/x86_64-linux-gnu/libnppif.so.11 # Copy ffmpeg COPY --from=build /app/workspace/bin/ffmpeg /usr/bin/ffmpeg