Uyanide/ffmpeg-PKGBUILD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cuda-nvcc with gcc 14

Browse Source
This commit is contained in:
Daniel Bermond
2025-05-04 20:25:13 -03:00
parent 6cff46cd23
commit 8337c3878f
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.SRCINFO
+3 -1
View File
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-full pkgbase = ffmpeg-full
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac) pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)
pkgver = 7.1.1 pkgver = 7.1.1
pkgrel = 1 pkgrel = 2
url = https://www.ffmpeg.org/ url = https://www.ffmpeg.org/
arch = x86_64 arch = x86_64
license = LicenseRef-nonfree-and-unredistributable license = LicenseRef-nonfree-and-unredistributable
@@ -158,6 +158,7 @@ pkgbase = ffmpeg-full
source = 050-ffmpeg-fix-segfault-with-avisynthplus.patch source = 050-ffmpeg-fix-segfault-with-avisynthplus.patch
source = 060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch source = 060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch
source = 070-ffmpeg-svt-av1-3.0.0-fix.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95 source = 070-ffmpeg-svt-av1-3.0.0-fix.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95
source = 080-ffmpeg-fix-cuda-nvcc-with-gcc14.patch
source = LICENSE source = LICENSE
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8 validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
sha256sums = 733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1 sha256sums = 733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1
@@ -170,6 +171,7 @@ pkgbase = ffmpeg-full
sha256sums = 26419f819d1f3e4d0534995b73d05a8195bc7c892b74c37c3880085af027515b sha256sums = 26419f819d1f3e4d0534995b73d05a8195bc7c892b74c37c3880085af027515b
sha256sums = 5a3731d1410747703948c87e46bb3aef820c6038f7101ab37f9d072cd1d15d15 sha256sums = 5a3731d1410747703948c87e46bb3aef820c6038f7101ab37f9d072cd1d15d15
sha256sums = b83ba1efdfec19ac54d1b0395a98d02039fe9d45bec1e6473e57a6288a304884 sha256sums = b83ba1efdfec19ac54d1b0395a98d02039fe9d45bec1e6473e57a6288a304884
sha256sums = e670e6ed4e6e614a248cedd9de461ddce2321d2fef982861c86639eaa65dce23
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36 sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
pkgname = ffmpeg-full pkgname = ffmpeg-full
080-ffmpeg-fix-cuda-nvcc-with-gcc14.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/configure
+++ b/configure
@@ -6748,7 +6748,7 @@ if [ -z "$nvccflags" ]; then
nvccflags=$nvccflags_default
fi
-nvccflags="$nvccflags -std=c++11"
+nvccflags="$nvccflags -std=c++14"
if enabled x86_64 || enabled ppc64 || enabled aarch64; then
nvccflags="$nvccflags -m64"
PKGBUILD
+4 -2
View File
@@ -3,7 +3,7 @@
pkgname=ffmpeg-full pkgname=ffmpeg-full
pkgver=7.1.1 pkgver=7.1.1
pkgrel=1 pkgrel=2
_svt_hevc_ver='ed80959ebb5586aa7763c91a397d44be1798587c' _svt_hevc_ver='ed80959ebb5586aa7763c91a397d44be1798587c'
_svt_vp9_ver='3b9a3fa43da4cc5fe60c7d22afe2be15341392ea' _svt_vp9_ver='3b9a3fa43da4cc5fe60c7d22afe2be15341392ea'
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)' pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)'
@@ -162,6 +162,7 @@ source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
'050-ffmpeg-fix-segfault-with-avisynthplus.patch' '050-ffmpeg-fix-segfault-with-avisynthplus.patch'
'060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch' '060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch'
'070-ffmpeg-svt-av1-3.0.0-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95' '070-ffmpeg-svt-av1-3.0.0-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95'
'080-ffmpeg-fix-cuda-nvcc-with-gcc14.patch'
'LICENSE') 'LICENSE')
sha256sums=('733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1' sha256sums=('733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1'
'SKIP' 'SKIP'
@@ -173,6 +174,7 @@ sha256sums=('733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1'
'26419f819d1f3e4d0534995b73d05a8195bc7c892b74c37c3880085af027515b' '26419f819d1f3e4d0534995b73d05a8195bc7c892b74c37c3880085af027515b'
'5a3731d1410747703948c87e46bb3aef820c6038f7101ab37f9d072cd1d15d15' '5a3731d1410747703948c87e46bb3aef820c6038f7101ab37f9d072cd1d15d15'
'b83ba1efdfec19ac54d1b0395a98d02039fe9d45bec1e6473e57a6288a304884' 'b83ba1efdfec19ac54d1b0395a98d02039fe9d45bec1e6473e57a6288a304884'
'e670e6ed4e6e614a248cedd9de461ddce2321d2fef982861c86639eaa65dce23'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36') '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
@@ -186,7 +188,7 @@ prepare() {
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/050-ffmpeg-fix-segfault-with-avisynthplus.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/050-ffmpeg-fix-segfault-with-avisynthplus.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/070-ffmpeg-svt-av1-3.0.0-fix.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/070-ffmpeg-svt-av1-3.0.0-fix.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/080-ffmpeg-fix-cuda-nvcc-with-gcc14.patch"
} }
build() { build() {