From e7e321256c8aa855f7f428b7a51ea8836cb7c84a Mon Sep 17 00:00:00 2001 From: Kamran Mackey Date: Mon, 4 Jul 2016 17:59:43 -0600 Subject: [PATCH] Fixed build issues. Signed-off-by: Kamran Mackey --- .SRCINFO | 4 ++-- PKGBUILD | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c432ca3..b34eaa3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Jul 4 22:54:21 UTC 2016 +# Mon Jul 4 23:59:42 UTC 2016 pkgbase = ffmpeg-git pkgdesc = Complete solution to record, convert and stream audio and video (git version) - pkgver = r77492.f16e4a0 + pkgver = 3.2.r80913.gce466d0 pkgrel = 1 url = http://ffmpeg.org/ arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 8e1c216..bce449e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: DrZaius pkgname=ffmpeg-git -pkgver=r77492.f16e4a0 +pkgver=3.2.r80913.gce466d0 pkgrel=1 pkgdesc="Complete solution to record, convert and stream audio and video (git version)" arch=('i686' 'x86_64') @@ -11,25 +11,25 @@ license=('GPL3') url="http://ffmpeg.org/" depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gmp' 'gnutls' 'gsm' 'lame' 'libass' 'libavc1394' 'libbluray' 'libiec61883' 'libmodplug' 'libpulse' - 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' 'libwebp' - 'netcdf' 'opencore-amr' 'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex' - 'v4l-utils' 'xvidcore' 'zlib' 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' - 'libvpx.so' 'libx264.so' 'libx265.so') + 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' 'libwebp' + 'netcdf' 'opencore-amr' 'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex' + 'v4l-utils' 'xvidcore' 'zlib' 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' + 'libvpx.so' 'libx264.so' 'libx265.so') makedepends=('hardening-wrapper' 'ladspa' 'libvdpau' 'yasm') optdepends=('ladspa: LADSPA filters') provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' - 'libswscale.so') + 'libswscale.so') conflicts=('ffmpeg' 'ffmpeg-full-git') source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git') md5sums=('SKIP') pkgver() { - cd "$srcdir/$pkgname" - _ver="$(git describe --tags | sed 's|-[^-]*$||' | sed 's|^n||')" - _rev="$(git rev-list --count HEAD)" - _gitid="$(git rev-parse --short HEAD)" - echo "${_ver}.r${_rev}.g${_gitid}" + cd "$srcdir/$pkgname" + _ver="$(git describe --tags | sed 's|-[^.]*$||' | sed 's|^n||')" + _rev="$(git rev-list --count HEAD)" + _gitid="$(git rev-parse --short HEAD)" + echo "${_ver}.r${_rev}.g${_gitid}" } build() { @@ -47,7 +47,6 @@ build() { --enable-ladspa \ --enable-libass \ --enable-libbluray \ - --enable-libfdk-aac \ --enable-libfreetype \ --enable-libfribidi \ --enable-libgsm \