Add pgp check. Remove makepkg internal function. Cleanups.

This commit is contained in:
Daniel Bermond
2018-10-15 21:02:44 +00:00
parent 55c94c2e71
commit 9f2547246e
2 changed files with 14 additions and 28 deletions
+4 -14
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 nvenc, qsv and libfdk-aac) pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)
pkgver = 4.0.2 pkgver = 4.0.2
pkgrel = 4 pkgrel = 5
url = http://www.ffmpeg.org/ url = http://www.ffmpeg.org/
arch = i686 arch = i686
arch = x86_64 arch = x86_64
@@ -98,11 +98,6 @@ pkgbase = ffmpeg-full
depends = libmysofa depends = libmysofa
depends = rockchip-mpp depends = rockchip-mpp
provides = ffmpeg provides = ffmpeg
provides = ffmpeg-full-nvenc
provides = ffmpeg-nvenc
provides = ffmpeg-libfdk_aac
provides = ffmpeg-decklink
provides = qt-faststart
provides = libavutil.so provides = libavutil.so
provides = libavcodec.so provides = libavcodec.so
provides = libavformat.so provides = libavformat.so
@@ -113,17 +108,12 @@ pkgbase = ffmpeg-full
provides = libswresample.so provides = libswresample.so
provides = libpostproc.so provides = libpostproc.so
conflicts = ffmpeg conflicts = ffmpeg
conflicts = ffmpeg-full-nvenc
conflicts = ffmpeg-nvenc
conflicts = ffmpeg-libfdk_aac
conflicts = ffmpeg-decklink
conflicts = ffmpeg-git
conflicts = ffmpeg-full-git
conflicts = ffmpeg-semifull-git
conflicts = ffmpeg-qsv-git
source = https://ffmpeg.org/releases/ffmpeg-4.0.2.tar.xz source = https://ffmpeg.org/releases/ffmpeg-4.0.2.tar.xz
source = https://ffmpeg.org/releases/ffmpeg-4.0.2.tar.xz.asc
source = LICENSE source = LICENSE
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
sha256sums = a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97 sha256sums = a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97
sha256sums = SKIP
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36 sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
source_x86_64 = vmaf-1.3.9-fix.patch source_x86_64 = vmaf-1.3.9-fix.patch
depends_x86_64 = cuda depends_x86_64 = cuda
+9 -13
View File
@@ -1,10 +1,10 @@
# Maintainer : Daniel Bermond < yahoo-com: danielbermond > # Maintainer : Daniel Bermond < gmail-com: danielbermond >
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it> # Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
pkgname=ffmpeg-full pkgname=ffmpeg-full
_srcname=ffmpeg _srcname=ffmpeg
pkgver=4.0.2 pkgver=4.0.2
pkgrel=4 pkgrel=5
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)' pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://www.ffmpeg.org/' url='http://www.ffmpeg.org/'
@@ -43,22 +43,18 @@ makedepends_x86_64=(
# AUR: # AUR:
'vmaf' 'vmaf'
) )
provides=( provides=('ffmpeg' 'libavutil.so' 'libavcodec.so' 'libavformat.so' 'libavdevice.so'
'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink'
'qt-faststart' 'libavutil.so' 'libavcodec.so' 'libavformat.so' 'libavdevice.so'
'libavfilter.so' 'libavresample.so' 'libswscale.so' 'libswresample.so' 'libavfilter.so' 'libavresample.so' 'libswscale.so' 'libswresample.so'
'libpostproc.so' 'libpostproc.so')
) conflicts=('ffmpeg')
conflicts=( source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink'
'ffmpeg-git' 'ffmpeg-full-git' 'ffmpeg-semifull-git' 'ffmpeg-qsv-git'
)
source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"
'LICENSE') 'LICENSE')
source_x86_64=('vmaf-1.3.9-fix.patch') source_x86_64=('vmaf-1.3.9-fix.patch')
sha256sums=('a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97' sha256sums=('a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97'
'SKIP'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36') '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
sha256sums_x86_64=('4eab61257adfdae2233cf8e5a12bd4d1e551b69711c8b4d14cffdd0f2c85812b') sha256sums_x86_64=('4eab61257adfdae2233cf8e5a12bd4d1e551b69711c8b4d14cffdd0f2c85812b')
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
prepare() { prepare() {
cd "${_srcname}-${pkgver}" cd "${_srcname}-${pkgver}"
@@ -95,7 +91,7 @@ build() {
fi fi
fi fi
msg2 'Running ffmpeg configure script. Please wait...' printf '%s\n' ' -> Running ffmpeg configure script...'
./configure \ ./configure \
--prefix='/usr' \ --prefix='/usr' \