summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancoism902018-07-20 10:40:52 +0200
committerfrancoism902018-07-20 10:40:52 +0200
commitab494d5e48f96a39dbcd3897f3123c0330666a06 (patch)
treeb5e9a7a796c92ccdad48061bd7d5ab5a6fbcc046
parentdb0e270e4079c0e5fac2ca71d2fba6fcad1c184e (diff)
downloadaur-ab494d5e48f96a39dbcd3897f3123c0330666a06.tar.gz
Switch to yasm, use git as upstream, clean-up
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD33
2 files changed, 21 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 34252af1aba..462bc316b6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
pkgbase = ffmpeg-qsv
- pkgdesc = Record, convert and stream audio and video (including qsv and libfdk-aac)
- pkgver = 4.0.1
- pkgrel = 2
+ pkgdesc = Complete solution to record, convert and stream audio and video (including qsv and libfdk-aac)
+ pkgver = 4.0.2
+ pkgrel = 1
url = http://www.ffmpeg.org/
- arch = i686
arch = x86_64
license = GPL3
license = custom: nonfree and unredistributable
makedepends = ffnvcodec-headers
- makedepends = nasm
+ makedepends = git
+ makedepends = ladspa
+ makedepends = yasm
makedepends = opencl-headers
depends = glibc
depends = alsa-lib
@@ -109,9 +110,9 @@ pkgbase = ffmpeg-qsv
conflicts = ffmpeg-full-git
conflicts = ffmpeg-semifull-git
conflicts = ffmpeg-qsv-git
- source = https://ffmpeg.org/releases/ffmpeg-4.0.1.tar.xz
+ source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.0.2
source = LICENSE
- sha256sums = 605f5c01c60db35d3b617a79cabb2c7032412be243554602eeed1b628125c0ee
+ sha256sums = SKIP
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
pkgname = ffmpeg-qsv
diff --git a/PKGBUILD b/PKGBUILD
index 85e39046d84..0eaed468456 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,12 +8,12 @@
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
# Contributor: Ben Widawsky <ben@bwidawsk.net>
-pkgname=ffmpeg-qsv
_srcname=ffmpeg
-pkgver=4.0.1
-pkgrel=2
-pkgdesc='Record, convert and stream audio and video (including qsv and libfdk-aac)'
-arch=('i686' 'x86_64')
+pkgname=ffmpeg-qsv
+pkgver=4.0.2
+pkgrel=1
+pkgdesc='Complete solution to record, convert and stream audio and video (including qsv and libfdk-aac)'
+arch=('x86_64')
url='http://www.ffmpeg.org/'
license=('GPL3' 'custom: nonfree and unredistributable')
depends=(
@@ -26,9 +26,8 @@ depends=(
'v4l-utils' 'vid.stab' 'libvorbis' 'libvpx' 'wavpack' 'libwebp' 'libx264.so'
'x265' 'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lilv' 'xz' 'ocl-icd'
'mesa' 'sndio' 'sdl2' 'libxv' 'libx11' 'libxext' 'zlib' 'libomxil-bellagio'
-'libva' 'libdrm' 'libvdpau'
-'libfdk-aac' 'intel-media-sdk')
-makedepends=('ffnvcodec-headers' 'nasm' 'opencl-headers')
+'libva' 'libdrm' 'libvdpau' 'libfdk-aac' 'intel-media-sdk')
+makedepends=('ffnvcodec-headers' 'git' 'ladspa' 'yasm' 'opencl-headers')
optdepends=('compute-runtime: Intel(R) Graphics Compute Runtime for OpenCL(TM).'
'beignet: OpenCL implementation for Intel IvyBridge+ iGPUs'
'opencl-mesa: OpenCL support for AMD/ATI Radeon mesa drivers'
@@ -42,16 +41,12 @@ provides=('ffmpeg' 'ffmpeg-libfdk_aac' 'qt-faststart'
conflicts=(
'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')
-sha256sums=('605f5c01c60db35d3b617a79cabb2c7032412be243554602eeed1b628125c0ee'
+source=("git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}" 'LICENSE')
+sha256sums=('SKIP'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
-prepare() {
- cd "${_srcname}-${pkgver}"
-}
-
build() {
- cd "${_srcname}-${pkgver}"
+ cd ffmpeg
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}/opt/intel/mediasdk/lib64/pkgconfig"
@@ -124,9 +119,7 @@ build() {
}
package() {
- cd "${_srcname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install install-man
- install -Dm 755 tools/qt-faststart "${pkgdir}"/usr/bin/
- install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ make DESTDIR="${pkgdir}" -C ffmpeg install install-man
+ install -Dm 755 ffmpeg/tools/qt-faststart "${pkgdir}"/usr/bin/
+ install -Dm 644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}