Sync ffmpeg variants with regular ffmpeg package

This commit is contained in:
Martchus 2018-08-29 23:36:23 +02:00
parent b4e4f76fd8
commit 8223027fdc
4 changed files with 9 additions and 9 deletions

View File

@ -43,7 +43,7 @@ optdepends=('avxsynth-git: for Avisynth support'
optdepends_x86_64=('intel-media-sdk: for Intel QSV support (Experimental! See PKGBUILD of that package for additional info)') optdepends_x86_64=('intel-media-sdk: for Intel QSV support (Experimental! See PKGBUILD of that package for additional info)')
conflicts=('ffmpeg' 'ffmpeg-full' 'ffmpeg-git' 'ffmpeg-full-git' 'ffmpeg-full-extra') conflicts=('ffmpeg' 'ffmpeg-full' 'ffmpeg-git' 'ffmpeg-full-git' 'ffmpeg-full-extra')
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
'libswscale.so' 'ffmpeg' 'qt-faststart') 'libswscale.so' 'ffmpeg' 'qt-faststart')
source=(https://ffmpeg.org/releases/$_pkgbasename-$pkgver.tar.xz{,.asc} source=(https://ffmpeg.org/releases/$_pkgbasename-$pkgver.tar.xz{,.asc}
'UNREDISTRIBUTABLE.txt') 'UNREDISTRIBUTABLE.txt')
@ -90,6 +90,7 @@ build() {
$_libnpp \ $_libnpp \
\ \
--enable-libmfx \ --enable-libmfx \
--enable-nvdec \
--enable-nvenc \ --enable-nvenc \
--enable-omx \ --enable-omx \
--enable-omx-rpi \ --enable-omx-rpi \

View File

@ -19,8 +19,7 @@ depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
makedepends=('ladspa' 'libvdpau' 'yasm') makedepends=('ladspa' 'libvdpau' 'yasm')
optdepends=('ladspa: LADSPA filters') optdepends=('ladspa: LADSPA filters')
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libswscale.so'
'libswscale.so'
"ffmpeg=$pkgver") "ffmpeg=$pkgver")
conflicts=("$_name") conflicts=("$_name")
source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git') source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git')
@ -40,7 +39,6 @@ build() {
--disable-static \ --disable-static \
--disable-stripping \ --disable-stripping \
--enable-avisynth \ --enable-avisynth \
--enable-avresample \
--enable-fontconfig \ --enable-fontconfig \
--enable-gmp \ --enable-gmp \
--enable-gnutls \ --enable-gnutls \
@ -72,6 +70,9 @@ build() {
--enable-libxcb \ --enable-libxcb \
--enable-libxml2 \ --enable-libxml2 \
--enable-libxvid \ --enable-libxvid \
--enable-nvdec \
--enable-nvenc \
--enable-omx \
--enable-shared \ --enable-shared \
--enable-version3 \ --enable-version3 \
--enable-x11grab \ --enable-x11grab \

View File

@ -10,7 +10,7 @@
_name=ffmpeg _name=ffmpeg
pkgname=ffmpeg-libfdk_aac pkgname=ffmpeg-libfdk_aac
pkgver=4.0.2 pkgver=4.0.2
pkgrel=3 pkgrel=4
epoch=1 epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)' pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
arch=('x86_64') arch=('x86_64')
@ -32,8 +32,7 @@ makedepends=('ffnvcodec-headers' 'git' 'ladspa' 'libvdpau' 'yasm')
optdepends=('ladspa: LADSPA filters') optdepends=('ladspa: LADSPA filters')
provides=( provides=(
'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' 'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libswscale.so'
'libswscale.so'
"ffmpeg=$pkgver" "ffmpeg=$pkgver"
) )
conflicts=("$_name") conflicts=("$_name")
@ -48,7 +47,6 @@ build() {
--disable-debug \ --disable-debug \
--disable-static \ --disable-static \
--disable-stripping \ --disable-stripping \
--enable-avresample \
--enable-fontconfig \ --enable-fontconfig \
--enable-gmp \ --enable-gmp \
--enable-gnutls \ --enable-gnutls \
@ -83,6 +81,7 @@ build() {
--enable-libxcb \ --enable-libxcb \
--enable-libxml2 \ --enable-libxml2 \
--enable-libxvid \ --enable-libxvid \
--enable-nvdec \
--enable-nvenc \ --enable-nvenc \
--enable-omx \ --enable-omx \
--enable-shared \ --enable-shared \

View File

@ -40,7 +40,6 @@ build() {
--enable-static \ --enable-static \
--disable-stripping \ --disable-stripping \
--enable-avisynth \ --enable-avisynth \
--enable-avresample \
--enable-fontconfig \ --enable-fontconfig \
--enable-gmp \ --enable-gmp \
--enable-gnutls \ --enable-gnutls \