summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--abs/core/ffmpeg/0001-libx265-Support-API-version-9.patch50
-rw-r--r--abs/core/ffmpeg/PKGBUILD79
-rw-r--r--abs/core/ffmpeg/__changelog2
3 files changed, 104 insertions, 27 deletions
diff --git a/abs/core/ffmpeg/0001-libx265-Support-API-version-9.patch b/abs/core/ffmpeg/0001-libx265-Support-API-version-9.patch
new file mode 100644
index 0000000..3b6a6e2
--- /dev/null
+++ b/abs/core/ffmpeg/0001-libx265-Support-API-version-9.patch
@@ -0,0 +1,50 @@
+From d67dbfa7c195fabce706ca03c439419450f9bd8a Mon Sep 17 00:00:00 2001
+From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+Date: Thu, 6 Mar 2014 20:01:17 +0000
+Subject: [PATCH] libx265: Support API version 9
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ configure | 4 ++--
+ libavcodec/libx265.c | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure b/configure
+index d3f5f33..4d7382a 100755
+--- a/configure
++++ b/configure
+@@ -3980,8 +3980,8 @@ enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 &
+ { check_cpp_condition x264.h "X264_BUILD >= 118" ||
+ die "ERROR: libx264 version must be >= 0.118."; }
+ enabled libx265 && require_pkg_config x265 x265.h x265_encoder_encode &&
+- { check_cpp_condition x265.h "X265_BUILD >= 7" ||
+- die "ERROR: libx265 version must be >= 7."; }
++ { check_cpp_condition x265.h "X265_BUILD >= 9" ||
++ die "ERROR: libx265 version must be >= 9."; }
+ enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
+ enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
+ enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
+diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
+index 961fc74..a6e4193 100644
+--- a/libavcodec/libx265.c
++++ b/libavcodec/libx265.c
+@@ -121,11 +121,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
+ av_reduce(&sar_num, &sar_den,
+ avctx->sample_aspect_ratio.num,
+ avctx->sample_aspect_ratio.den, 4096);
+- ctx->params->bEnableVuiParametersPresentFlag = 1;
+- ctx->params->bEnableAspectRatioIdc = 1;
+- ctx->params->aspectRatioIdc = 255;
+- ctx->params->sarWidth = sar_num;
+- ctx->params->sarHeight = sar_den;
++ ctx->params->vui.bEnableVuiParametersPresentFlag = 1;
++ ctx->params->vui.bEnableAspectRatioIdc = 1;
++ ctx->params->vui.aspectRatioIdc = 255;
++ ctx->params->vui.sarWidth = sar_num;
++ ctx->params->vui.sarHeight = sar_den;
+
+ if (x265_max_bit_depth == 8)
+ ctx->params->internalBitDepth = 8;
+--
+1.7.10.4
+
diff --git a/abs/core/ffmpeg/PKGBUILD b/abs/core/ffmpeg/PKGBUILD
index e3062b4..aa91a8c 100644
--- a/abs/core/ffmpeg/PKGBUILD
+++ b/abs/core/ffmpeg/PKGBUILD
@@ -1,49 +1,76 @@
-# $Id: PKGBUILD 163147 2012-07-08 09:30:59Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id$
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg
-pkgver=0.11.1
+pkgver=2.2.1
pkgrel=1
epoch=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
+pkgdesc='Complete and free Internet live audio and video broadcasting solution'
arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
+url='http://ffmpeg.org/'
license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib)
-makedepends=('yasm' 'git' 'libvdpau')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-md5sums=('ff8cb914f657e164dd60ea1008b555a8')
+depends=(
+ 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau'
+ 'libbluray' 'libmodplug' 'libtheora' 'libva' 'libvorbis' 'libvpx'
+ 'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex'
+ 'v4l-utils' 'x264' 'xvidcore' 'zlib' 'x265'
+ )
+makedepends=('libvdpau' 'yasm')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc}
+ 0001-libx265-Support-API-version-9.patch)
+md5sums=('b8a1ee4964c2638f46fcc803ed453818'
+ 'SKIP'
+ '4cbf9b13dc013e96be36445b4a2bfdac')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../0001-libx265-Support-API-version-9.patch
+}
build() {
cd $pkgname-$pkgver
./configure \
--prefix=/usr \
- --enable-libmp3lame \
- --enable-libvorbis \
- --enable-libxvid \
- --enable-libx264 \
- --enable-libvpx \
- --enable-libtheora \
+ --disable-debug \
+ --disable-static \
+ --enable-avresample \
+ --enable-dxva2 \
+ --enable-fontconfig \
+ --enable-gnutls \
+ --enable-gpl \
+ --enable-libass \
+ --enable-libbluray \
+ --enable-libfreetype \
--enable-libgsm \
- --enable-libspeex \
- --enable-postproc \
- --enable-shared \
- --enable-x11grab \
+ --enable-libmodplug \
+ --enable-libmp3lame \
--enable-libopencore_amrnb \
--enable-libopencore_amrwb \
- --enable-libschroedinger \
--enable-libopenjpeg \
- --enable-librtmp \
+ --enable-libopus \
--disable-libpulse \
+ --enable-librtmp \
+ --enable-libschroedinger \
+ --enable-libspeex \
+ --enable-libtheora \
--enable-libv4l2 \
- --enable-gpl \
- --enable-version3 \
+ --enable-libvorbis \
+ --enable-libvpx \
+ --enable-libx264 \
+ --enable-libx265 \
+ --enable-libxvid \
+ --enable-pic \
+ --enable-postproc \
--enable-runtime-cpudetect \
- --disable-debug \
- --disable-static
+ --enable-shared \
+ --enable-swresample \
+ --enable-vdpau \
+ --enable-version3 \
+ --enable-x11grab
make
make tools/qt-faststart
@@ -53,7 +80,7 @@ build() {
package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install install-man
- install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
+ install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
}
# vim:set ts=2 sw=2 et:
diff --git a/abs/core/ffmpeg/__changelog b/abs/core/ffmpeg/__changelog
index 1672732..7d491f4 100644
--- a/abs/core/ffmpeg/__changelog
+++ b/abs/core/ffmpeg/__changelog
@@ -1 +1 @@
-no pulse
+PKGBUILD - remove libpulse dep and disable-libpulse in configure