Date: Sunday, December 20, 2015 @ 12:00:18 Author: alucryd Revision: 257034
upgpkg: ffmpeg 1:2.8.4-1 Modified: ffmpeg/trunk/PKGBUILD Deleted: ffmpeg/trunk/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch ------------------------------------------------------------------+ PKGBUILD | 60 ++++------ ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 ------ 2 files changed, 26 insertions(+), 75 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-12-20 10:15:45 UTC (rev 257033) +++ PKGBUILD 2015-12-20 11:00:18 UTC (rev 257034) @@ -1,12 +1,12 @@ # $Id$ -# Maintainer: Ionut Biru <ib...@archlinux.org> -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Ionut Biru <ib...@archlinux.org> # Contributor: Tom Newsom <jeeps...@gmx.co.uk> # Contributor: Paul Mattal <p...@archlinux.org> pkgname=ffmpeg -pkgver=2.8.3 +pkgver=2.8.4 pkgrel=1 epoch=1 pkgdesc='Complete solution to record, convert and stream audio and video' @@ -13,38 +13,27 @@ arch=('i686' 'x86_64') url='http://ffmpeg.org/' license=('GPL3') -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' -) +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') 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' -) -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc} - ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) -validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel -md5sums=('937a6573ba399cf3e6808c9c6ea3d6d6' - 'SKIP' - '71be9bcd297cb9ce833bbc5d425c0470') +provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' + 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' + 'libswscale.so') +source=(http://ffmpeg.org/releases/${pkgname}-${pkgver}.tar.bz2{,.asc}) +validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') +sha256sums=('83cc8136a7845546062a43cda9ae3cf0a02f43ef5e434d2f997f055231a75f8e' + 'SKIP') -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch -} - build() { - cd $pkgname-$pkgver + cd ${pkgname}-${pkgver} ./configure \ - --prefix=/usr \ + --prefix='/usr' \ --disable-debug \ --disable-static \ --disable-stripping \ @@ -82,7 +71,7 @@ --enable-libxvid \ --enable-shared \ --enable-version3 \ - --enable-x11grab \ + --enable-x11grab make make tools/qt-faststart @@ -90,7 +79,10 @@ } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install install-man - install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install install-man + install -Dm 755 tools/qt-faststart "${pkgdir}"/usr/bin/ } + +# vim: ts=2 sw=2 et: Deleted: ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch =================================================================== --- ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch 2015-12-20 10:15:45 UTC (rev 257033) +++ ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch 2015-12-20 11:00:18 UTC (rev 257034) @@ -1,41 +0,0 @@ -From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 -From: James Zern <jz...@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 <mich...@niedermayer.cc> -Signed-off-by: James Zern <jz...@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 -