From f466c9ee23736eb60c5df376662b59113f1f60f9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 4 Jan 2018 20:24:24 +0100 Subject: [PATCH] Prepare ffmpeg rebuild --- ffmpeg/full-nvenc/PKGBUILD | 5 +++-- ffmpeg/libfdk_aac-git/PKGBUILD | 25 +++++++++++++++---------- ffmpeg/libfdk_aac/PKGBUILD | 5 +++-- ffmpeg/mingw-w64/PKGBUILD | 5 +++-- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ffmpeg/full-nvenc/PKGBUILD b/ffmpeg/full-nvenc/PKGBUILD index a8411025..eb8ad19c 100644 --- a/ffmpeg/full-nvenc/PKGBUILD +++ b/ffmpeg/full-nvenc/PKGBUILD @@ -18,7 +18,7 @@ pkgname=ffmpeg-full-nvenc _pkgbasename=ffmpeg pkgver=3.4.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Record, convert, and stream audio and video (all codecs including Nvidia NVENC)" arch=('i686' 'x86_64') @@ -33,7 +33,7 @@ depends=('alsa-lib' 'bzip2' 'celt' 'chromaprint-fftw' 'fontconfig' 'frei0r-plugi 'opencv' 'opencl-driver' 'opencl-icd-loader' 'openh264' 'openjpeg2' 'libopenmpt-svn' 'opus' 'rubberband' 'rtmpdump' 'schroedinger' 'sdl2' 'smbclient' 'speex' 'shine' 'tesseract' 'twolame' 'v4l-utils' - 'libvidstab.so' 'vo-amrwbenc' 'libxcb' 'libxvidcore.so' 'xz' 'wavpack' 'zeromq' 'zimg' + 'libvidstab.so' 'vo-amrwbenc' 'libxcb' 'libxml2' 'libxvidcore.so' 'xz' 'wavpack' 'zeromq' 'zimg' 'zlib' 'zvbi' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so' 'libx265.so' 'snappy' 'sndio' 'xavs' 'libfreetype.so') depends_x86_64=('cuda') @@ -169,6 +169,7 @@ build() { --enable-libxcb-shm \ --enable-libxcb-xfixes \ --enable-libxcb-shape \ + --enable-libxml2 \ --enable-libxvid \ --enable-libzimg \ --enable-libzmq \ diff --git a/ffmpeg/libfdk_aac-git/PKGBUILD b/ffmpeg/libfdk_aac-git/PKGBUILD index bfcbbf10..6d5029e0 100644 --- a/ffmpeg/libfdk_aac-git/PKGBUILD +++ b/ffmpeg/libfdk_aac-git/PKGBUILD @@ -1,24 +1,27 @@ _name=ffmpeg pkgname=ffmpeg-libfdk_aac-git pkgver=r74550.907373e -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)' arch=('i686' 'x86_64') url='https://ffmpeg.org/' license=('GPL3' 'custom:libfdk-aac') -depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gmp' 'gnutls' 'gsm' 'lame' 'libass' - 'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh' 'libtheora' - 'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg' 'opus' - 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib' - 'libvorbis.so' 'libvorbisenc.so' 'libvpx.so' 'libx264.so' 'libx265.so' +depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm' + 'jack' 'lame' 'libavc1394' 'libiec61883' 'libmodplug' 'libpulse' + 'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' + 'libwebp' 'libx11' 'libxcb' 'libxml2' 'opencore-amr' 'openjpeg2' 'opus' + 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib' + 'libass.so' 'libbluray.so' 'libfreetype.so' + 'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' + 'libx264.so' 'libx265.so' 'libxvidcore.so' 'libfdk-aac') -makedepends=('hardening-wrapper' 'ladspa' 'libvdpau' 'yasm' 'git') +makedepends=('ladspa' 'libvdpau' 'yasm') optdepends=('ladspa: LADSPA filters') -provides=("ffmpeg=$pkgver" - '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' - 'libswscale.so') + 'libswscale.so' + "ffmpeg=$pkgver") conflicts=("$_name") source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git' 'fs56089.patch') @@ -76,6 +79,8 @@ build() { --enable-libwebp \ --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ + --enable-libxml2 \ --enable-libxvid \ --enable-shared \ --enable-version3 \ diff --git a/ffmpeg/libfdk_aac/PKGBUILD b/ffmpeg/libfdk_aac/PKGBUILD index 3f4a55d6..52302030 100644 --- a/ffmpeg/libfdk_aac/PKGBUILD +++ b/ffmpeg/libfdk_aac/PKGBUILD @@ -10,7 +10,7 @@ _name=ffmpeg pkgname=ffmpeg-libfdk_aac pkgver=3.4.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ license=('GPL3' 'custom:libfdk-aac') depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm' 'jack' 'lame' 'libavc1394' 'libiec61883' 'libmodplug' 'libpulse' 'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' - 'libwebp' 'libx11' 'libxcb' 'opencore-amr' 'openjpeg2' 'opus' + 'libwebp' 'libx11' 'libxcb' 'libxml2' 'opencore-amr' 'openjpeg2' 'opus' 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib' 'libass.so' 'libbluray.so' 'libfreetype.so' 'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' @@ -86,6 +86,7 @@ build() { --enable-libx264 \ --enable-libx265 \ --enable-libxcb \ + --enable-libxml2 \ --enable-libxvid \ --enable-shared \ --enable-version3 \ diff --git a/ffmpeg/mingw-w64/PKGBUILD b/ffmpeg/mingw-w64/PKGBUILD index b7cb7d37..1561004a 100644 --- a/ffmpeg/mingw-w64/PKGBUILD +++ b/ffmpeg/mingw-w64/PKGBUILD @@ -7,7 +7,7 @@ _name=ffmpeg pkgname=mingw-w64-ffmpeg pkgver=3.4.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Complete solution to record, convert and stream audio and video (mingw-w64)' arch=('any') @@ -16,7 +16,7 @@ license=('GPL3' 'custom:libfdk-aac') depends=('mingw-w64-crt' 'mingw-w64-bzip2' 'mingw-w64-fontconfig' 'mingw-w64-fribidi' 'mingw-w64-gmp' 'mingw-w64-gnutls' 'mingw-w64-gsm' 'mingw-w64-lame' 'mingw-w64-libass' 'mingw-w64-dcadec' 'mingw-w64-libbluray' 'mingw-w64-libmodplug' 'mingw-w64-libsoxr' 'mingw-w64-libtheora' 'mingw-w64-vid.stab' 'mingw-w64-libwebp' 'mingw-w64-libvorbis' - 'mingw-w64-libvpx' 'mingw-w64-opencore-amr' 'mingw-w64-openjpeg2' 'mingw-w64-opus' 'mingw-w64-libssh' + 'mingw-w64-libvpx' 'mingw-w64-libxml2' 'mingw-w64-opencore-amr' 'mingw-w64-openjpeg2' 'mingw-w64-opus' 'mingw-w64-libssh' 'mingw-w64-schroedinger' 'mingw-w64-libfdk-aac' 'mingw-w64-sdl2' 'mingw-w64-speex' 'mingw-w64-x264' 'mingw-w64-xvidcore' 'mingw-w64-zlib' 'mingw-w64-x265') options=(!strip !buildflags staticlibs) @@ -75,6 +75,7 @@ build() { --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ + --enable-libxml2 \ --enable-libx264 \ --enable-libx265 \ --enable-libxvid \