summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancoism902019-03-10 13:00:18 +0100
committerfrancoism902019-03-10 13:00:18 +0100
commit26350ed9caaa7f5a7db963584cebf972af4323f9 (patch)
tree7acb3aa736bbe02079f0893f4903735bf8fe39df
parentaa909f301b77c482141be20241616d050137bfc4 (diff)
downloadaur-26350ed9caaa7f5a7db963584cebf972af4323f9.tar.gz
sync with ffmpeg pkg
-rw-r--r--.SRCINFO40
-rw-r--r--PKGBUILD130
2 files changed, 115 insertions, 55 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b09dac5fe93..9ca1efeb3d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,30 @@
pkgbase = ffmpeg-qsv
pkgdesc = Complete solution to record, convert and stream audio and video (including qsv and libfdk-aac)
- pkgver = 4.1
- pkgrel = 1
- url = http://www.ffmpeg.org/
+ pkgver = 4.1.1
+ pkgrel = 2
+ url = https://www.ffmpeg.org/
arch = x86_64
license = GPL3
license = custom: nonfree and unredistributable
makedepends = ffnvcodec-headers
makedepends = git
makedepends = ladspa
- makedepends = yasm
- makedepends = opencl-headers
+ makedepends = nasm
depends = alsa-lib
depends = aom
depends = bzip2
depends = fontconfig
depends = fribidi
- depends = glibc
depends = gmp
depends = gnutls
depends = gsm
depends = jack
depends = lame
+ depends = libass.so
depends = libavc1394
+ depends = libbluray.so
depends = libdrm
+ depends = libfreetype.so
depends = libiec61883
depends = libmodplug
depends = libomxil-bellagio
@@ -32,13 +33,21 @@ pkgbase = ffmpeg-qsv
depends = libsoxr
depends = libssh
depends = libtheora
+ depends = libva
depends = libvdpau
+ depends = libvidstab.so
+ depends = libvorbisenc.so
+ depends = libvorbis.so
+ depends = libvpx.so
depends = libwebp
depends = libx11
+ depends = libx264.so
+ depends = libx265.so
depends = libxcb
depends = libxext
depends = libxml2
depends = libxv
+ depends = libxvidcore.so
depends = opencore-amr
depends = openjpeg2
depends = opus
@@ -47,22 +56,12 @@ pkgbase = ffmpeg-qsv
depends = v4l-utils
depends = xz
depends = zlib
- depends = libass.so
- depends = libbluray.so
- depends = libfreetype.so
- depends = libva-drm.so
- depends = libva.so
- depends = libva-x11.so
- depends = libvidstab.so
- depends = libvorbisenc.so
- depends = libvorbis.so
- depends = libvpx.so
- depends = libx264.so
- depends = libx265.so
- depends = libxvidcore.so
depends = libfdk-aac
depends = intel-media-sdk
optdepends = ladspa: LADSPA filters
+ optdepends = libva-utils: Intel VA-API Media Applications and Scripts for libva
+ optdepends = libva-intel-driver: VA-API implementation for Intel G45 and HD Graphics family
+ optdepends = libva-mesa-driver: VA-API implementation for gallium
optdepends = compute-runtime: Intel(R) Graphics Compute Runtime for OpenCL(TM).
optdepends = beignet: OpenCL implementation for Intel IvyBridge+ iGPUs
optdepends = opencl-mesa: OpenCL support for AMD/ATI Radeon mesa drivers
@@ -70,7 +69,6 @@ pkgbase = ffmpeg-qsv
optdepends = opencl-nvidia: OpenCL implemention for NVIDIA
provides = ffmpeg
provides = ffmpeg-libfdk_aac
- provides = qt-faststart
provides = libavcodec.so
provides = libavdevice.so
provides = libavfilter.so
@@ -88,7 +86,7 @@ pkgbase = ffmpeg-qsv
conflicts = ffmpeg-full-git
conflicts = ffmpeg-semifull-git
conflicts = ffmpeg-qsv-git
- source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.1
+ source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.1.1
source = LICENSE
sha256sums = SKIP
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
diff --git a/PKGBUILD b/PKGBUILD
index 94fb63a6343..c7f16df4490 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,51 +10,113 @@
_srcname=ffmpeg
pkgname=ffmpeg-qsv
-pkgver=4.1
-pkgrel=1
+pkgver=4.1.1
+pkgrel=2
pkgdesc='Complete solution to record, convert and stream audio and video (including qsv and libfdk-aac)'
-arch=('x86_64')
-url='http://www.ffmpeg.org/'
+arch=(x86_64)
+url='https://www.ffmpeg.org/'
license=('GPL3' 'custom: nonfree and unredistributable')
depends=(
- 'alsa-lib' 'aom' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
- 'jack' 'lame' 'libavc1394' 'libdrm' 'libiec61883' 'libmodplug'
- 'libomxil-bellagio' 'libpulse' 'libraw1394' 'libsoxr' 'libssh' 'libtheora'
- 'libvdpau' 'libwebp' 'libx11' 'libxcb' 'libxext' 'libxml2' 'libxv'
- 'opencore-amr' 'openjpeg2' 'opus' 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib'
- 'libass.so' 'libbluray.so' 'libfreetype.so' 'libva-drm.so' 'libva.so'
- 'libva-x11.so' 'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so'
- 'libx264.so' 'libx265.so' 'libxvidcore.so' 'libfdk-aac' 'intel-media-sdk'
+ alsa-lib
+ aom
+ bzip2
+ fontconfig
+ fribidi
+ gmp
+ gnutls
+ gsm
+ jack
+ lame
+ libass.so
+ libavc1394
+ libbluray.so
+ libdrm
+ libfreetype.so
+ libiec61883
+ libmodplug
+ libomxil-bellagio
+ libpulse
+ libraw1394
+ libsoxr
+ libssh
+ libtheora
+ libva
+ libvdpau
+ libvidstab.so
+ libvorbisenc.so
+ libvorbis.so
+ libvpx.so
+ libwebp
+ libx11
+ libx264.so
+ libx265.so
+ libxcb
+ libxext
+ libxml2
+ libxv
+ libxvidcore.so
+ opencore-amr
+ openjpeg2
+ opus
+ sdl2
+ speex
+ v4l-utils
+ xz
+ zlib
+ libfdk-aac
+ intel-media-sdk
+)
+makedepends=(
+ ffnvcodec-headers
+ git
+ ladspa
+ nasm
)
-makedepends=('ffnvcodec-headers' 'git' 'ladspa' 'yasm' 'opencl-headers')
optdepends=(
- 'ladspa: LADSPA filters'
- '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'
- 'opencl-amd: OpenCL userspace driver as provided in the amdgpu-pro driver stack'
- 'opencl-nvidia: OpenCL implemention for NVIDIA'
+ 'ladspa: LADSPA filters'
+ 'libva-utils: Intel VA-API Media Applications and Scripts for libva'
+ 'libva-intel-driver: VA-API implementation for Intel G45 and HD Graphics family'
+ 'libva-mesa-driver: VA-API implementation for gallium'
+ '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'
+ 'opencl-amd: OpenCL userspace driver as provided in the amdgpu-pro driver stack'
+ 'opencl-nvidia: OpenCL implemention for NVIDIA'
)
provides=(
- 'ffmpeg' 'ffmpeg-libfdk_aac' 'qt-faststart'
- 'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
- 'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libswscale.so'
+ ffmpeg
+ ffmpeg-libfdk_aac
+ libavcodec.so
+ libavdevice.so
+ libavfilter.so
+ libavformat.so
+ libavutil.so
+ libpostproc.so
+ libswresample.so
+ libswscale.so
)
conflicts=(
-'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink'
-'ffmpeg-git' 'ffmpeg-full-git' 'ffmpeg-semifull-git' 'ffmpeg-qsv-git')
+ ffmpeg
+ ffmpeg-full-nvenc
+ ffmpeg-nvenc
+ ffmpeg-libfdk_aac
+ ffmpeg-decklink
+ ffmpeg-git
+ ffmpeg-full-git
+ ffmpeg-semifull-git
+ ffmpeg-qsv-git
+)
source=("git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}" 'LICENSE')
sha256sums=('SKIP'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
build() {
- cd ffmpeg
+ cd ffmpeg
- export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}/opt/intel/mediasdk/lib64/pkgconfig"
+ export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}/opt/intel/mediasdk/lib64/pkgconfig"
- ./configure \
+ ./configure \
--prefix='/usr' \
- --extra-libs='-lpthread' \
--disable-debug \
--disable-static \
--disable-stripping \
@@ -107,13 +169,13 @@ build() {
--enable-vaapi \
--enable-vdpau
- make
- make tools/qt-faststart
- make doc/ff{mpeg,play}.1
+ make
+ make tools/qt-faststart
+ make doc/ff{mpeg,play}.1
}
package() {
- 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"
+ 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"
}