From 5673f49bce0dce3399bfc933e05e95b23137caed Mon Sep 17 00:00:00 2001 From: Uyanide Date: Tue, 7 Jul 2026 20:49:02 +0200 Subject: [PATCH] remove gcc15 --- .SRCINFO | 1 - PKGBUILD | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a51b3e7..b43f8af 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -10,7 +10,6 @@ pkgbase = ffmpeg-full makedepends = cmake makedepends = cuda makedepends = ffnvcodec-headers - makedepends = gcc15 makedepends = git makedepends = gmp makedepends = libgl diff --git a/PKGBUILD b/PKGBUILD index fbfdc78..e25faa0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -99,7 +99,6 @@ makedepends=( 'cmake' 'cuda' 'ffnvcodec-headers' - 'gcc15' 'git' 'gmp' 'libgl' @@ -145,17 +144,12 @@ build() { local _pkgconfigdir="${_stagingdir}/lib/pkgconfig" export PKG_CONFIG_PATH="${_pkgconfigdir}${PKG_CONFIG_PATH:+":${PKG_CONFIG_PATH}"}" - export CC=gcc-15 - export CXX=g++-15 - local -a _cmake_opts=( '-GUnix Makefiles' '-DBUILD_SHARED_LIBS:BOOL=OFF' '-DCMAKE_BUILD_TYPE:STRING=None' "-DCMAKE_INSTALL_PREFIX:PATH=${_stagingdir}" '-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON' - '-DCMAKE_C_COMPILER=gcc-15' - '-DCMAKE_CXX_COMPILER=g++-15' '-Wno-dev') # ffmpeg requires lensfun git master, but lensfun-git package wrongly installs its files to non-standard locations: @@ -179,8 +173,7 @@ build() { -DWHISPER_BUILD_EXAMPLES:BOOL='OFF' \ -DWHISPER_BUILD_TESTS:BOOL='OFF' \ -DGGML_CUDA:BOOL='ON' \ - -DCMAKE_CUDA_ARCHITECTURES='89' \ - -DCMAKE_CUDA_HOST_COMPILER=g++-15 + -DCMAKE_CUDA_ARCHITECTURES='89' cmake --build build/whisper.cpp --target install cd "ffmpeg-${pkgver}" @@ -191,8 +184,6 @@ build() { ./configure \ --prefix='/usr' \ - --cc=gcc-15 \ - --cxx=g++-15 \ --enable-lto \ \ --disable-rpath \