libplaceboとlibvmafをstatic linkするように。

Author: rigaya

.github/workflows/build_base_images.yml

@@ -13,9 +13,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - dockerimg: ubuntu2004_cuda11
-          - dockerimg: fedora39_cuda12
+        include:
+          - dockerimg: ubuntu2004_cuda11
+          - dockerimg: ubuntu2204_cuda11
+          - dockerimg: ubuntu2404_cuda12
+          - dockerimg: fedora39_cuda12
 
     env:
       DOCKER_FILE: docker/docker_${{ matrix.dockerimg }}

.github/workflows/build_packages.yml

@@ -14,22 +14,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - dockerimg: ubuntu2004_cuda11
-            pkgtype: deb
-            arch: x86_64
-          - dockerimg: fedora39_cuda12
-            pkgtype: rpm
-            arch: x86_64
-          #- dockerimg: ubuntu2204_cuda11_aarch64
-          #  pkgtype: deb
-          #  arch: arm64
+        include:
+          - dockerimg: ubuntu2004_cuda11
+            pkgtype: deb
+            arch: x86_64
+          - dockerimg: fedora39_cuda12
+            pkgtype: rpm
+            arch: x86_64
+          #- dockerimg: ubuntu2204_cuda11_aarch64
+          #  pkgtype: deb
+          #  arch: arm64
 
     env:
       DOCKER_IMAGE: ${{ matrix.dockerimg }}
       PKG_TYPE: ${{ matrix.pkgtype }}
       BASE_IMAGE_REPO: ghcr.io/${{ github.repository_owner }}/nvenc-build
-      FFMPEG_PREFIX: /opt/build_scripts/ffmpeg_dll/build_dll/x64/build
+      FFMPEG_PREFIX: /opt/build_scripts/ffmpeg_dll/build_dll/x64/build
+      VMAF_PREFIX: /opt/build_scripts/ffmpeg_dll/x64/build
 
     name: Upload Release Asset
     runs-on: ubuntu-latest
@@ -95,30 +96,35 @@ jobs:
             --workdir /work \
             --name build_pkg ${{ steps.prep.outputs.base_image }}
           docker exec build_pkg bash -lc '
+            VMAFPKG="${{ env.VMAF_PREFIX }}/lib/pkgconfig"
             FFPKG="${{ env.FFMPEG_PREFIX }}/lib/pkgconfig:${{ env.FFMPEG_PREFIX }}/lib/x86_64-linux-gnu/pkgconfig"
-            export PKG_CONFIG_PATH="${FFPKG}${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
-            meson setup ./build . --buildtype=release -Db_lto=true -Dcpp_args="['\''-I/work/AviSynthPlus/avs_core/include'\'','\''-I/work/vapoursynth/include'\'']"
+            export PKG_CONFIG_PATH="${VMAFPKG}:${FFPKG}${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
+            meson setup ./build . --buildtype=release -Db_lto=true -Denable_libplacebo=enabled -Dlibplacebo_static=true -Denable_vmaf=enabled -Dlibvmaf_static=true -Dcpp_args="['\''-I/work/AviSynthPlus/avs_core/include'\'','\''-I/work/vapoursynth/include'\'']"
           '
           docker exec build_pkg bash -lc "meson compile -C ./build -j${{ steps.prep.outputs.nproc }}"
-          docker exec build_pkg bash -lc '
-            set -e
-            ldd ./build/nvencc | tee /tmp/nvencc.ldd
-            if grep -F "=> not found" /tmp/nvencc.ldd | grep -Fv "libcuda.so.1 => not found" >/dev/null; then
-              echo "Unexpected missing shared libraries detected." >&2
-              exit 1
-            fi
-          '
-          docker exec build_pkg bash -lc '
-            set -e
-            if [[ "${{ matrix.dockerimg }}" == ubuntu* ]]; then
-              mkdir -p /tmp/nvenc-cuda-stubs
-              ln -sf /usr/local/cuda/targets/x86_64-linux/lib/stubs/libcuda.so /tmp/nvenc-cuda-stubs/libcuda.so.1
-              export LD_LIBRARY_PATH="/tmp/nvenc-cuda-stubs:/usr/local/cuda/targets/x86_64-linux/lib/stubs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
-            fi
-            ./build/nvencc --version
-            ./check_options.py -exe ./build/nvencc
-          '
-          docker exec build_pkg cp ./build/nvencc ./nvencc
+          docker exec build_pkg bash -lc '
+            set -e
+            ldd ./build/nvencc | tee /tmp/nvencc.ldd
+            if grep -F "=> not found" /tmp/nvencc.ldd | grep -Fv "libcuda.so.1 => not found" >/dev/null; then
+              echo "Unexpected missing shared libraries detected." >&2
+              exit 1
+            fi
+            if readelf -d ./build/nvencc | grep -F "(NEEDED)" | grep -E "libplacebo|libvmaf" >/dev/null; then
+              echo "libplacebo/libvmaf must be statically linked, but shared dependency was found." >&2
+              exit 1
+            fi
+          '
+          docker exec build_pkg bash -lc '
+            set -e
+            if [[ "${{ matrix.dockerimg }}" == ubuntu* ]]; then
+              mkdir -p /tmp/nvenc-cuda-stubs
+              ln -sf /usr/local/cuda/targets/x86_64-linux/lib/stubs/libcuda.so /tmp/nvenc-cuda-stubs/libcuda.so.1
+              export LD_LIBRARY_PATH="/tmp/nvenc-cuda-stubs:/usr/local/cuda/targets/x86_64-linux/lib/stubs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
+            fi
+            ./build/nvencc --version
+            ./check_options.py -exe ./build/nvencc
+          '
+          docker exec build_pkg cp ./build/nvencc ./nvencc
           docker exec build_pkg ./build_${{ env.PKG_TYPE }}.sh
           docker exec build_pkg bash -lc "cp -v ./*.${{ env.PKG_TYPE }} /output/"
           PKGFILE=`ls ${{ steps.prep.outputs.output_dir }}/*.${{ env.PKG_TYPE }}`