chore: reorganized packaging related files

Signed-off-by: k4yt3x <i@k4yt3x.com>
This commit is contained in:
k4yt3x 2024-10-30 00:00:00 +00:00
parent 5156d4a825
commit f5eb195d79
No known key found for this signature in database
7 changed files with 29 additions and 6 deletions

View File

@ -91,3 +91,17 @@ jobs:
with: with:
name: video2x-nightly-windows-amd64 name: video2x-nightly-windows-amd64
path: build/video2x_install path: build/video2x_install
container:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- uses: mr-smithers-excellent/docker-build-push@v5
name: Build the Docker image
with:
registry: ghcr.io
dockerfile: packaging/docker/Dockerfile
image: video2x
tags: latest
pushImage: false

View File

@ -33,7 +33,7 @@ jobs:
registry: ghcr.io registry: ghcr.io
username: ${{ secrets.GHCR_USER }} username: ${{ secrets.GHCR_USER }}
password: ${{ secrets.GHCR_TOKEN }} password: ${{ secrets.GHCR_TOKEN }}
dockerfile: Dockerfile dockerfile: packaging/docker/Dockerfile
image: video2x image: video2x
tags: latest, ${{ needs.setup.outputs.version }} tags: latest, ${{ needs.setup.outputs.version }}

View File

@ -104,7 +104,7 @@ if(WIN32)
else() else()
# FFmpeg # FFmpeg
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
set(REQUIRED_PKGS set(FFMPEG_REQUIRED_PKGS REQUIRED
libavcodec libavcodec
libavdevice libavdevice
libavfilter libavfilter
@ -114,7 +114,7 @@ else()
) )
# Loop through each package to find and collect include dirs and libraries # Loop through each package to find and collect include dirs and libraries
foreach(PKG ${REQUIRED_PKGS}) foreach(PKG ${FFMPEG_REQUIRED_PKGS})
pkg_check_modules(${PKG} REQUIRED ${PKG}) pkg_check_modules(${PKG} REQUIRED ${PKG})
list(APPEND ALL_INCLUDE_DIRS ${${PKG}_INCLUDE_DIRS}) list(APPEND ALL_INCLUDE_DIRS ${${PKG}_INCLUDE_DIRS})
list(APPEND ALL_LIBRARIES ${${PKG}_LIBRARIES}) list(APPEND ALL_LIBRARIES ${${PKG}_LIBRARIES})

View File

@ -43,7 +43,7 @@ You can download the latest Windows release from the [releases page](https://git
## [🐧 Install on Linux](https://aur.archlinux.org/packages/video2x-git) ## [🐧 Install on Linux](https://aur.archlinux.org/packages/video2x-git)
You can install Video2X on Arch Linux using the [video2x-git](https://aur.archlinux.org/packages/video2x-git) package or download pre-compiled binaries from the [releases page](https://github.com/k4yt3x/video2x/releases/latest). If you'd like to build from source, refer to the [PKGBUILD](PKGBUILD) file for a general overview of the required packages and commands. If you'd prefer not to compile the program from source, consider using the container image below. You can install Video2X on Arch Linux using the [video2x-git](https://aur.archlinux.org/packages/video2x-git) package or download pre-compiled binaries from the [releases page](https://github.com/k4yt3x/video2x/releases/latest). If you'd like to build from source, refer to the [PKGBUILD](packaging/arch/PKGBUILD) file for a general overview of the required packages and commands. If you'd prefer not to compile the program from source, consider using the container image below.
## [📦 Container Image](https://github.com/k4yt3x/video2x/pkgs/container/video2x) ## [📦 Container Image](https://github.com/k4yt3x/video2x/pkgs/container/video2x)

8
packaging/debian/control Normal file
View File

@ -0,0 +1,8 @@
Package: video2x
Version: 6.0.0
Section: video
Priority: optional
Architecture: amd64
Maintainer: K4YT3X <i@k4yt3x.com>
Depends: ffmpeg, libopencv-videoio406t64
Description: A machine learning-based lossless video super resolution framework.

View File

@ -1,7 +1,7 @@
# Name: Video2X Dockerfile # Name: Video2X Dockerfile
# Creator: K4YT3X # Creator: K4YT3X
# Date Created: February 3, 2022 # Date Created: February 3, 2022
# Last Modified: October 21, 2024 # Last Modified: October 30, 2024
# stage 1: build the python components into wheels # stage 1: build the python components into wheels
FROM docker.io/archlinux:latest AS builder FROM docker.io/archlinux:latest AS builder
@ -20,7 +20,8 @@ COPY --chown=builder:builder . /video2x
WORKDIR /video2x WORKDIR /video2x
# Build the package # Build the package
RUN makepkg -s --noconfirm \ RUN cp packaging/arch/PKGBUILD . \
&& makepkg -s --noconfirm \
&& find /video2x -maxdepth 1 -name 'video2x-*.pkg.tar.zst' ! -name '*-debug-*' | head -n 1 | \ && find /video2x -maxdepth 1 -name 'video2x-*.pkg.tar.zst' ! -name '*-debug-*' | head -n 1 | \
xargs -I {} cp {} /tmp/video2x.pkg.tar.zst xargs -I {} cp {} /tmp/video2x.pkg.tar.zst