diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | PKGBUILD | 45 | ||||
| -rw-r--r-- | ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 |
3 files changed, 26 insertions, 78 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Dec 18 19:44:39 UTC 2015 +# Thu Dec 24 21:06:14 UTC 2015 pkgbase = ffmpeg-libfdk_aac pkgdesc = Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support) - pkgver = 2.8.3 - pkgrel = 2 + pkgver = 2.8.4 + pkgrel = 1 epoch = 1 url = http://ffmpeg.org/ arch = i686 @@ -49,7 +49,6 @@ pkgbase = ffmpeg-libfdk_aac depends = libx265.so depends = libfdk-aac optdepends = ladspa: LADSPA filters - provides = ffmpeg=2.8.3 provides = libavcodec.so provides = libavdevice.so provides = libavfilter.so @@ -59,13 +58,12 @@ pkgbase = ffmpeg-libfdk_aac provides = libpostproc.so provides = libswresample.so provides = libswscale.so + provides = ffmpeg=2.8.4 conflicts = ffmpeg - source = http://ffmpeg.org/releases/ffmpeg-2.8.3.tar.bz2 - source = http://ffmpeg.org/releases/ffmpeg-2.8.3.tar.bz2.asc - source = ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch - md5sums = 937a6573ba399cf3e6808c9c6ea3d6d6 - md5sums = SKIP - md5sums = 71be9bcd297cb9ce833bbc5d425c0470 + source = http://ffmpeg.org/releases/ffmpeg-2.8.4.tar.bz2 + source = http://ffmpeg.org/releases/ffmpeg-2.8.4.tar.bz2.asc + sha256sums = 83cc8136a7845546062a43cda9ae3cf0a02f43ef5e434d2f997f055231a75f8e + sha256sums = SKIP pkgname = ffmpeg-libfdk_aac @@ -8,48 +8,37 @@ _name=ffmpeg pkgname=ffmpeg-libfdk_aac -pkgver=2.8.3 -pkgrel=2 +pkgver=2.8.4 +pkgrel=1 epoch=1 pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)' arch=('i686' 'x86_64') url='http://ffmpeg.org/' license=('GPL3' 'custom:libfdk-aac') -depends=( - 'alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' 'libass' - 'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh' 'libtheora' - 'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg' 'opus' - 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib' - 'libdcadec.so' 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' - 'libvpx.so' 'libx264.so' 'libx265.so' - 'libfdk-aac' - ) +depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' + 'libass' 'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh' + 'libtheora' 'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg' + 'opus' 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib' + 'libdcadec.so' 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' + 'libvpx.so' 'libx264.so' 'libx265.so' + 'libfdk-aac') makedepends=('hardening-wrapper' 'ladspa' 'libvdpau' 'yasm') optdepends=('ladspa: LADSPA filters') -provides=( - "ffmpeg=$pkgver" - 'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' - 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' - 'libswscale.so' -) +provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' + 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' + 'libswscale.so' + "ffmpeg=$pkgver") conflicts=("$_name") -source=(http://ffmpeg.org/releases/$_name-$pkgver.tar.bz2{,.asc} - ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) +source=(http://ffmpeg.org/releases/$_name-$pkgver.tar.bz2{,.asc}) validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel -md5sums=('937a6573ba399cf3e6808c9c6ea3d6d6' - 'SKIP' - '71be9bcd297cb9ce833bbc5d425c0470') -prepare() { - cd $_name-$pkgver - patch -p1 -i ../ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch -} + build() { cd $_name-$pkgver ./configure \ - --prefix=/usr \ + --prefix='/usr' \ --disable-debug \ --disable-static \ --disable-stripping \ @@ -107,3 +96,5 @@ package() { install -d "$pkgdir/usr/share/licenses/$pkgname" install -m 0644 NOTICE "$pkgdir/usr/share/licenses/$pkgname/NOTICE" } +sha256sums=('83cc8136a7845546062a43cda9ae3cf0a02f43ef5e434d2f997f055231a75f8e' + 'SKIP') diff --git a/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch deleted file mode 100644 index 15d2600d1c47..000000000000 --- a/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 -From: James Zern <jzern@google.com> -Date: Mon, 19 Oct 2015 22:44:11 -0700 -Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings - -VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed -from libvpx and the remaining values were never used here - -Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> -Signed-off-by: James Zern <jzern@google.com> ---- - libavcodec/libvpxenc.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c -index 5f39783..992122c 100644 ---- a/libavcodec/libvpxenc.c -+++ b/libavcodec/libvpxenc.c -@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { - - /** String mappings for enum vp8e_enc_control_id */ - static const char *const ctlidstr[] = { -- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", -- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", -- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", -- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", -- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", -- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", - [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", - [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", - [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", -- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", - [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", - [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", -- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", - [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", - [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", - [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", --- -1.7.10.4 - |