Linuxビルドを修正。

rigaya · Dec 6, 2024 · 62521d8 · 62521d8
1 parent 66f2867
commit 62521d8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
@@ -18,7 +18,7 @@ jobs:
             pkgtype: deb
           - dockerimg: ubuntu2204
             pkgtype: deb
-          - dockerimg: fedora34
+          - dockerimg: fedora37
             pkgtype: rpm
 
     env:
@@ -106,7 +106,8 @@ jobs:
         id: build_exec
         run: |
           docker run -dit --rm -v ${{ steps.prep.outputs.output_dir }}:/output -u "$(id -u):$(id -g)" --name build_pkg ${{ steps.prep.outputs.tagged_image }}
-          docker exec build_pkg ./configure --extra-cxxflags="-I./AviSynthPlus/avs_core/include -I./vapoursynth/include" --enable-lto
+          docker exec build_pkg sh -c "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal && . ~/.cargo/env && cargo install cargo-c"
+          docker exec build_pkg sh -c '. ~/.cargo/env && ./configure --extra-cxxflags="-I./AviSynthPlus/avs_core/include -I./vapoursynth/include" --enable-lto'
           docker exec build_pkg make -j${{ steps.prep.outputs.nproc }}
           docker exec build_pkg ./vceencc --version
           docker exec build_pkg ./check_options.py

diff --git a/configure b/configure
@@ -107,6 +107,7 @@ EXTRALDFLAGS=""
 SRCS=""
 X86_64=1
 NO_RDTSCP_INTRIN=0
+CARGO=${CARGO:-cargo}
 ENABLE_LTO=0
 
 ENABLE_CPP_REGEX=1
@@ -149,7 +150,7 @@ LIBPLACEBO_API_VER=338
 
 CHECK_VULKAN_NAMES="vulkan"
 VULKAN_CFLAGS=""
-ENABLE_VULKAN=0
+ENABLE_VULKAN=1
 
 LIBDOVI_CFLAGS=""
 LIBDOVI_LIBS=""

diff --git a/docker/docker_fedora34 → docker/docker_fedora37 b/docker/docker_fedora34 → docker/docker_fedora37
@@ -1,4 +1,4 @@
-FROM fedora:34
+FROM fedora:37
 
 ARG LOCAL_USER_ID=1000 \
     LOCAL_GROUP_ID=1000
@@ -11,13 +11,14 @@ RUN dnf update -y \
     && dnf install -y \
       which \ 
       @development-tools gcc-c++ \
-      wget python3 \
+      wget curl python3 \
       ffmpeg ffmpeg-devel \
       libass libass-devel \
       opencl-headers \
       libX11-devel \
       vulkan-loader-devel \
       rpm-build \
+      openssl openssl-devel \
     && dnf clean all
 
 RUN useradd -u $LOCAL_USER_ID -m --user-group --shell /bin/bash rigaya

diff --git a/docker/docker_ubuntu2004 b/docker/docker_ubuntu2004
@@ -7,6 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive \
 RUN apt-get update \
     && apt install -y \
       wget \
+      curl \
       git \
       opencl-headers \
       libvulkan-dev \
@@ -26,6 +27,8 @@ RUN apt-get update \
       libavdevice-dev \
       libass9 \
       libass-dev \
+      openssl \
+      libssl-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 

diff --git a/docker/docker_ubuntu2204 b/docker/docker_ubuntu2204
@@ -7,6 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive \
 RUN apt-get update \
     && apt install -y \
       wget \
+      curl \
       git \
       opencl-headers \
       libvulkan-dev \
@@ -26,6 +27,8 @@ RUN apt-get update \
       libavdevice-dev \
       libass9 \
       libass-dev \
+      openssl \
+      libssl-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*