From 78daa50a95c4d650490a322bd2bed4f0ed75779d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Fri, 22 Mar 2024 22:21:31 +0100 Subject: [PATCH] Fix building some vulkan-dependent packages vulkan-headers was a dependency of vulkan-loader, packages now fails to build after It was removed. --- mingw-w64-ffmpeg/PKGBUILD | 3 ++- mingw-w64-ffmpeg4.4/PKGBUILD | 3 ++- mingw-w64-qt6-tools/PKGBUILD | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mingw-w64-ffmpeg/PKGBUILD b/mingw-w64-ffmpeg/PKGBUILD index 5a6ca466c0..8ab8556c30 100644 --- a/mingw-w64-ffmpeg/PKGBUILD +++ b/mingw-w64-ffmpeg/PKGBUILD @@ -7,7 +7,7 @@ _realname=ffmpeg pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=6.1.1 -pkgrel=7 +pkgrel=8 pkgdesc="Complete solution to record, convert and stream audio and video (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -65,6 +65,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-pkgconf" "${MINGW_PACKAGE_PREFIX}-dlfcn" + "${MINGW_PACKAGE_PREFIX}-vulkan-headers" $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || echo "${MINGW_PACKAGE_PREFIX}-amf-headers") $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || echo "${MINGW_PACKAGE_PREFIX}-ffnvcodec-headers") $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || echo "${MINGW_PACKAGE_PREFIX}-nasm")) diff --git a/mingw-w64-ffmpeg4.4/PKGBUILD b/mingw-w64-ffmpeg4.4/PKGBUILD index 979ab6119c..9bd5d2ac2a 100644 --- a/mingw-w64-ffmpeg4.4/PKGBUILD +++ b/mingw-w64-ffmpeg4.4/PKGBUILD @@ -7,7 +7,7 @@ _realname=ffmpeg pkgbase="mingw-w64-${_realname}4.4" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}4.4" pkgver=4.4.4 -pkgrel=9 +pkgrel=10 pkgdesc="Complete solution to record, convert and stream audio and video (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -61,6 +61,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-pkgconf" "${MINGW_PACKAGE_PREFIX}-dlfcn" + "${MINGW_PACKAGE_PREFIX}-vulkan-headers" $([[ ${CARCH} == aarch64 ]] || echo \ "${MINGW_PACKAGE_PREFIX}-amf-headers" \ "${MINGW_PACKAGE_PREFIX}-ffnvcodec-headers" \ diff --git a/mingw-w64-qt6-tools/PKGBUILD b/mingw-w64-qt6-tools/PKGBUILD index 91c054618f..3e705e5bcc 100644 --- a/mingw-w64-qt6-tools/PKGBUILD +++ b/mingw-w64-qt6-tools/PKGBUILD @@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") _qtver=6.6.2 pkgver=${_qtver/-/} -pkgrel=3 +pkgrel=4 pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp) (mingw-w64)' arch=(any) mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -23,6 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt6-activeqt" "${MINGW_PACKAGE_PREFIX}-clang" "${MINGW_PACKAGE_PREFIX}-clang-tools-extra" + "${MINGW_PACKAGE_PREFIX}-vulkan-headers" "${MINGW_PACKAGE_PREFIX}-zstd" "rsync") _pkgfn="${_realname/6-/}-everywhere-src-${_qtver}"