From 11ac72afb8b058c350e264da09975780211c4550 Mon Sep 17 00:00:00 2001 From: Daniel Bermond Date: Sun, 26 Jul 2020 15:53:33 +0000 Subject: [PATCH] Remove support for legacy nvidia-340xx drivers --- .SRCINFO | 2 +- PKGBUILD | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index af20634..5ba728c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = ffmpeg-full pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac) pkgver = 4.3.1 - pkgrel = 3 + pkgrel = 4 url = https://www.ffmpeg.org/ arch = x86_64 license = custom: nonfree and unredistributable diff --git a/PKGBUILD b/PKGBUILD index 4db214e..c850a83 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ _svt_vp9_ver='0.2.2' pkgname=ffmpeg-full pkgver=4.3.1 -pkgrel=3 +pkgrel=4 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)' arch=('x86_64') url='https://www.ffmpeg.org/' @@ -73,22 +73,12 @@ prepare() { build() { cd "ffmpeg-${pkgver}" - - local _ldflags='-L/opt/cuda/lib64' - - # set path of -lcuda on systems with legacy nvidia-340xx drivers - # (libcuda.so.x, required by --enable-cuda-sdk) - if pacman -Qs '^nvidia-340xx-utils' >/dev/null 2>&1 - then - _ldflags+=' -L/usr/lib/nvidia' - fi - printf '%s\n' ' -> Running ffmpeg configure script...' ./configure \ --prefix='/usr' \ --extra-cflags='-I/opt/cuda/include -I/usr/include/tensorflow' \ - --extra-ldflags="$_ldflags" \ + --extra-ldflags='-L/opt/cuda/lib64' \ \ --disable-rpath \ --enable-gpl \