Bump to version 2.8.3

This commit is contained in:
Iacopo Isimbaldi
2015-12-17 01:25:46 +01:00
parent b303e7d84a
commit 73ea25346f
3 changed files with 79 additions and 15 deletions
+13 -4
View File
@@ -1,6 +1,8 @@
# Generated by mksrcinfo v8
# Thu Dec 17 00:15:57 UTC 2015
pkgbase = ffmpeg-full
pkgdesc = Complete solution to record, convert and stream audio and video (with all options)
pkgver = 2.8.1
pkgver = 2.8.3
pkgrel = 1
epoch = 1
url = http://ffmpeg.org/
@@ -37,6 +39,8 @@ pkgbase = ffmpeg-full
depends = v4l-utils
depends = xvidcore
depends = zlib
depends = libdcadec.so
depends = libvidstab.so
depends = libvorbis.so
depends = libvorbisenc.so
depends = libvpx.so
@@ -80,16 +84,21 @@ pkgbase = ffmpeg-full
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so
provides = openh264
provides = snappy
provides = xavs
provides = ffmpeg
conflicts = ffmpeg
conflicts = ffmpeg-git
conflicts = ffmpeg-full-git
source = http://ffmpeg.org/releases/ffmpeg-2.8.1.tar.bz2
source = http://ffmpeg.org/releases/ffmpeg-2.8.1.tar.bz2.asc
source = http://ffmpeg.org/releases/ffmpeg-2.8.3.tar.bz2
source = http://ffmpeg.org/releases/ffmpeg-2.8.3.tar.bz2.asc
source = UNREDISTRIBUTABLE.txt
sha256sums = e2ed5ab28dee1af94336739173eb0019afc21a54e38a96f4e3208e94a07866e2
source = ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
sha256sums = 1bcf993a71839bb4a37eaa0c51daf315932b6dad6089f672294545cc51a5caf6
sha256sums = SKIP
sha256sums = e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4
sha256sums = 277994aca5a6e40c1a90750859828817e0646bfb28142fdb34d5f9d3196c3f7a
pkgname = ffmpeg-full
+25 -11
View File
@@ -1,5 +1,4 @@
# $Id$
# Maintainer: Iacopo Isimbaldi <isiachi@rhyeworld.it>
# Maintainer: Iacopo Isimbaldi <isiachi@rhye.it>
# Original maintainer: Rudolf Polzer <divVerent[at]xonotic[dot]org>
# Original maintainer: Ionut Biru <ibiru@archlinux.org>
# Original maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
@@ -11,7 +10,7 @@
# needs too.
pkgname=ffmpeg-full
pkgver=2.8.1
pkgver=2.8.3
pkgrel=1
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (with all options)'
@@ -23,7 +22,8 @@ depends=(
'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'
'libdcadec.so' 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so'
'libvpx.so' 'libx264.so' 'libx265.so'
'celt' 'faac' 'frei0r-plugins' 'jack' 'ladspa' 'libaacplus'
'libavc1394' 'libbs2b' 'libcaca' 'libcdio-paranoia' 'libcl' 'libdc1394'
'libfdk-aac' 'libgme' 'libiec61883' 'libutvideo-git'
@@ -35,18 +35,25 @@ conflicts=('ffmpeg' 'ffmpeg-git' 'ffmpeg-full-git')
provides=(
'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
'libswscale.so'
'libswscale.so' 'openh264' 'snappy' 'xavs'
'ffmpeg'
)
source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2{,.asc}
UNREDISTRIBUTABLE.txt)
UNREDISTRIBUTABLE.txt
ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch)
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
sha256sums=('e2ed5ab28dee1af94336739173eb0019afc21a54e38a96f4e3208e94a07866e2'
sha256sums=('1bcf993a71839bb4a37eaa0c51daf315932b6dad6089f672294545cc51a5caf6'
'SKIP'
'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4')
'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4'
'277994aca5a6e40c1a90750859828817e0646bfb28142fdb34d5f9d3196c3f7a')
prepare() {
cd ${pkgname%-full}-$pkgver
patch -p1 -i ../ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
}
build() {
#source /etc/profile.d/perlbin.sh
cd ${pkgname%-full}-$pkgver
./configure \
@@ -69,6 +76,7 @@ build() {
--enable-libaacplus \
--enable-libass \
--enable-libbluray \
--enable-libdcadec \
--enable-libbs2b \
--enable-libcaca \
--enable-libcdio \
@@ -86,12 +94,14 @@ build() {
--enable-libopencore-amrnb \
--enable-libopencore-amrwb \
--enable-libopencv \
--enable-libopenh264 \
--enable-libopenjpeg \
--enable-libopus \
--enable-libpulse \
--enable-librtmp \
--enable-libschroedinger \
--enable-libshine \
--enable-libsnappy \
--enable-libsoxr \
--enable-libspeex \
--enable-libssh \
@@ -108,6 +118,11 @@ build() {
--enable-libwebp \
--enable-libx264 \
--enable-libx265 \
--enable-libxavs \
--enable-libxcb \
--enable-libxcb-shm \
--enable-libxcb-xfixes \
--enable-libxcb-shape \
--enable-libxvid \
--enable-libzmq \
--enable-libzvbi \
@@ -119,8 +134,7 @@ build() {
--enable-runtime-cpudetect \
--enable-swresample \
--enable-vdpau \
--enable-version3 \
--enable-x11grab
--enable-version3
make
make tools/qt-faststart
@@ -0,0 +1,41 @@
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