From 0fb547589d3ff5dd9edb1d9e5f59f03257b10f61 Mon Sep 17 00:00:00 2001 From: k4yt3x Date: Tue, 22 Oct 2024 00:00:00 +0000 Subject: [PATCH] feat(*): updated Dockerfile and PKGBUILD for 6.0.0-beta.4 Signed-off-by: k4yt3x --- Dockerfile | 12 +++++++----- PKGBUILD | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a0cf0bb..7339000 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,15 @@ # Name: Video2X Dockerfile # Creator: K4YT3X # Date Created: February 3, 2022 -# Last Modified: October 14, 2024 +# Last Modified: October 21, 2024 # stage 1: build the python components into wheels FROM docker.io/archlinux:latest AS builder # Install dependencies and create a non-root user RUN pacman -Syy --noconfirm \ - base-devel ffmpeg ncnn git cmake make clang pkgconf vulkan-headers openmp spdlog sudo \ + base-devel git cmake make clang pkgconf sudo \ + ffmpeg ncnn vulkan-headers openmp spdlog opencv \ nvidia-utils vulkan-radeon vulkan-intel vulkan-swrast \ && useradd -m builder \ && echo 'builder ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/builder @@ -31,11 +32,12 @@ LABEL maintainer="K4YT3X " \ ENV VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json\ :/usr/share/vulkan/icd.d/radeon_icd.x86_64.json\ -:/usr/share/vulkan/icd.d/intel_icd.x86_64.json +:/usr/share/vulkan/icd.d/intel_icd.x86_64.json\ +:/usr/share/vulkan/icd.d/lvp_icd.x86_64.json COPY --from=builder /tmp/video2x.pkg.tar.zst /video2x.pkg.tar.zst -RUN pacman -Sy --noconfirm ffmpeg ncnn spdlog \ - nvidia-utils vulkan-radeon vulkan-intel vulkan-swrast \ +RUN pacman -Sy --noconfirm nvidia-utils vulkan-radeon vulkan-intel vulkan-swrast \ + ffmpeg ncnn spdlog opencv \ && pacman -U --noconfirm /video2x.pkg.tar.zst \ && rm -rf /video2x.pkg.tar.zst /var/cache/pacman/pkg/* diff --git a/PKGBUILD b/PKGBUILD index e892901..a0b8dce 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgdesc="A machine learning-based lossless video super resolution framework" arch=('x86_64') url="https://github.com/k4yt3x/video2x" license=('AGPL3') -depends=('ffmpeg' 'ncnn' 'vulkan-driver' 'opencv-cuda' 'spdlog') +depends=('ffmpeg' 'ncnn' 'vulkan-driver' 'opencv' 'spdlog') makedepends=('git' 'cmake' 'make' 'clang' 'pkgconf' 'vulkan-headers' 'openmp') pkgver() {