From 2cfdb698c9748a69340b0756ede122276cbf58ac Mon Sep 17 00:00:00 2001
From: k4yt3x <i@k4yt3x.com>
Date: Mon, 23 Dec 2024 00:00:00 +0000
Subject: [PATCH] build(container): optimize container build speed

Signed-off-by: k4yt3x <i@k4yt3x.com>
---
 packaging/arch/PKGBUILD     | 7 ++++---
 packaging/docker/Dockerfile | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD
index bc5bee2..f012768 100644
--- a/packaging/arch/PKGBUILD
+++ b/packaging/arch/PKGBUILD
@@ -1,18 +1,19 @@
 pkgname=video2x-git
-pkgver=0
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="A machine learning-based video super resolution and frame interpolation framework"
 arch=('x86_64')
 url="https://github.com/k4yt3x/video2x"
-license=('AGPL3')
+license=('AGPL-3.0-only')
 depends=('ffmpeg' 'ncnn' 'vulkan-driver' 'spdlog' 'boost-libs')
 makedepends=('git' 'cmake' 'clang' 'vulkan-headers' 'openmp' 'boost')
 
 pkgver() {
-    git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
 }
 
 prepare() {
+    git rm ../third_party/{ncnn,spdlog,boost}
     git submodule update --init --recursive
 }
 
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 673d916..d096e2e 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -1,7 +1,7 @@
 # Name: Video2X Dockerfile
 # Creator: K4YT3X
 # Date Created: February 3, 2022
-# Last Modified: November 1, 2024
+# Last Modified: December 23, 2024
 
 # stage 1: build the python components into wheels
 FROM docker.io/archlinux:latest AS builder
@@ -17,11 +17,11 @@ RUN pacman -Syy --noconfirm \
 # Switch to the non-root user and copy the source code
 USER builder
 COPY --chown=builder:builder . /video2x
+COPY --chown=builder:builder packaging/arch/PKGBUILD /video2x/PKGBUILD
 WORKDIR /video2x
 
 # Build the package
-RUN cp packaging/arch/PKGBUILD . \
-    && makepkg -s --noconfirm \
+RUN makepkg -s --noconfirm \
     && find /video2x -maxdepth 1 -name 'video2x-*.pkg.tar.zst' ! -name '*-debug-*' | head -n 1 | \
         xargs -I {} cp {} /tmp/video2x.pkg.tar.zst