Date: Thursday, April 10, 2014 @ 09:18:21 Author: bpiotrowski Revision: 210121
archrelease: copy trunk to extra-i686, extra-x86_64 Added: ffmpeg/repos/extra-i686/0001-libx265-Support-API-version-9.patch (from rev 210120, ffmpeg/trunk/0001-libx265-Support-API-version-9.patch) ffmpeg/repos/extra-i686/PKGBUILD (from rev 210120, ffmpeg/trunk/PKGBUILD) ffmpeg/repos/extra-x86_64/0001-libx265-Support-API-version-9.patch (from rev 210120, ffmpeg/trunk/0001-libx265-Support-API-version-9.patch) ffmpeg/repos/extra-x86_64/PKGBUILD (from rev 210120, ffmpeg/trunk/PKGBUILD) Deleted: ffmpeg/repos/extra-i686/PKGBUILD ffmpeg/repos/extra-x86_64/PKGBUILD -------------------------------------------------------+ /PKGBUILD | 172 ++++++++++++++++ extra-i686/0001-libx265-Support-API-version-9.patch | 50 ++++ extra-i686/PKGBUILD | 79 ------- extra-x86_64/0001-libx265-Support-API-version-9.patch | 50 ++++ extra-x86_64/PKGBUILD | 79 ------- 5 files changed, 272 insertions(+), 158 deletions(-) Copied: ffmpeg/repos/extra-i686/0001-libx265-Support-API-version-9.patch (from rev 210120, ffmpeg/trunk/0001-libx265-Support-API-version-9.patch) =================================================================== --- extra-i686/0001-libx265-Support-API-version-9.patch (rev 0) +++ extra-i686/0001-libx265-Support-API-version-9.patch 2014-04-10 07:18:21 UTC (rev 210121) @@ -0,0 +1,50 @@ +From d67dbfa7c195fabce706ca03c439419450f9bd8a Mon Sep 17 00:00:00 2001 +From: Derek Buitenhuis <derek.buitenh...@gmail.com> +Date: Thu, 6 Mar 2014 20:01:17 +0000 +Subject: [PATCH] libx265: Support API version 9 + +Signed-off-by: Derek Buitenhuis <derek.buitenh...@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 + Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-04-10 07:18:12 UTC (rev 210120) +++ extra-i686/PKGBUILD 2014-04-10 07:18:21 UTC (rev 210121) @@ -1,79 +0,0 @@ -# $Id$ -# Maintainer: Ionut Biru <ib...@archlinux.org> -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> -# Contributor: Paul Mattal <p...@archlinux.org> - -pkgname=ffmpeg -pkgver=2.2 -pkgrel=2 -epoch=1 -pkgdesc='Complete and free Internet live audio and video broadcasting solution' -arch=('i686' 'x86_64') -url='http://ffmpeg.org/' -license=('GPL') -depends=( - 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau' - 'libbluray' 'libmodplug' 'libpulse' '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}) -md5sums=('744febca199548c9393b1f1ed05ccdd8' - 'SKIP') - -build() { - cd $pkgname-$pkgver - - ./configure \ - --prefix=/usr \ - --disable-debug \ - --disable-static \ - --enable-avresample \ - --enable-dxva2 \ - --enable-fontconfig \ - --enable-gnutls \ - --enable-gpl \ - --enable-libass \ - --enable-libbluray \ - --enable-libfreetype \ - --enable-libgsm \ - --enable-libmodplug \ - --enable-libmp3lame \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libopenjpeg \ - --enable-libopus \ - --enable-libpulse \ - --enable-librtmp \ - --enable-libschroedinger \ - --enable-libspeex \ - --enable-libtheora \ - --enable-libv4l2 \ - --enable-libvorbis \ - --enable-libvpx \ - --enable-libx264 \ - --enable-libx265 \ - --enable-libxvid \ - --enable-pic \ - --enable-postproc \ - --enable-runtime-cpudetect \ - --enable-shared \ - --enable-swresample \ - --enable-vdpau \ - --enable-version3 \ - --enable-x11grab - - make - make tools/qt-faststart - make doc/ff{mpeg,play,server}.1 -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install install-man - install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart -} - -# vim:set ts=2 sw=2 et: Copied: ffmpeg/repos/extra-i686/PKGBUILD (from rev 210120, ffmpeg/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-04-10 07:18:21 UTC (rev 210121) @@ -0,0 +1,86 @@ +# $Id$ +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> +# Contributor: Paul Mattal <p...@archlinux.org> + +pkgname=ffmpeg +pkgver=2.2 +pkgrel=3 +epoch=1 +pkgdesc='Complete and free Internet live audio and video broadcasting solution' +arch=('i686' 'x86_64') +url='http://ffmpeg.org/' +license=('GPL') +depends=( + 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau' + 'libbluray' 'libmodplug' 'libpulse' '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=('744febca199548c9393b1f1ed05ccdd8' + 'SKIP' + '4cbf9b13dc013e96be36445b4a2bfdac') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../0001-libx265-Support-API-version-9.patch +} + +build() { + cd $pkgname-$pkgver + + ./configure \ + --prefix=/usr \ + --disable-debug \ + --disable-static \ + --enable-avresample \ + --enable-dxva2 \ + --enable-fontconfig \ + --enable-gnutls \ + --enable-gpl \ + --enable-libass \ + --enable-libbluray \ + --enable-libfreetype \ + --enable-libgsm \ + --enable-libmodplug \ + --enable-libmp3lame \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libpulse \ + --enable-librtmp \ + --enable-libschroedinger \ + --enable-libspeex \ + --enable-libtheora \ + --enable-libv4l2 \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libxvid \ + --enable-pic \ + --enable-postproc \ + --enable-runtime-cpudetect \ + --enable-shared \ + --enable-swresample \ + --enable-vdpau \ + --enable-version3 \ + --enable-x11grab + + make + make tools/qt-faststart + make doc/ff{mpeg,play,server}.1 +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install install-man + install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart +} + +# vim:set ts=2 sw=2 et: Copied: ffmpeg/repos/extra-x86_64/0001-libx265-Support-API-version-9.patch (from rev 210120, ffmpeg/trunk/0001-libx265-Support-API-version-9.patch) =================================================================== --- extra-x86_64/0001-libx265-Support-API-version-9.patch (rev 0) +++ extra-x86_64/0001-libx265-Support-API-version-9.patch 2014-04-10 07:18:21 UTC (rev 210121) @@ -0,0 +1,50 @@ +From d67dbfa7c195fabce706ca03c439419450f9bd8a Mon Sep 17 00:00:00 2001 +From: Derek Buitenhuis <derek.buitenh...@gmail.com> +Date: Thu, 6 Mar 2014 20:01:17 +0000 +Subject: [PATCH] libx265: Support API version 9 + +Signed-off-by: Derek Buitenhuis <derek.buitenh...@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 + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-04-10 07:18:12 UTC (rev 210120) +++ extra-x86_64/PKGBUILD 2014-04-10 07:18:21 UTC (rev 210121) @@ -1,79 +0,0 @@ -# $Id$ -# Maintainer: Ionut Biru <ib...@archlinux.org> -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> -# Contributor: Paul Mattal <p...@archlinux.org> - -pkgname=ffmpeg -pkgver=2.2 -pkgrel=2 -epoch=1 -pkgdesc='Complete and free Internet live audio and video broadcasting solution' -arch=('i686' 'x86_64') -url='http://ffmpeg.org/' -license=('GPL') -depends=( - 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau' - 'libbluray' 'libmodplug' 'libpulse' '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}) -md5sums=('744febca199548c9393b1f1ed05ccdd8' - 'SKIP') - -build() { - cd $pkgname-$pkgver - - ./configure \ - --prefix=/usr \ - --disable-debug \ - --disable-static \ - --enable-avresample \ - --enable-dxva2 \ - --enable-fontconfig \ - --enable-gnutls \ - --enable-gpl \ - --enable-libass \ - --enable-libbluray \ - --enable-libfreetype \ - --enable-libgsm \ - --enable-libmodplug \ - --enable-libmp3lame \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libopenjpeg \ - --enable-libopus \ - --enable-libpulse \ - --enable-librtmp \ - --enable-libschroedinger \ - --enable-libspeex \ - --enable-libtheora \ - --enable-libv4l2 \ - --enable-libvorbis \ - --enable-libvpx \ - --enable-libx264 \ - --enable-libx265 \ - --enable-libxvid \ - --enable-pic \ - --enable-postproc \ - --enable-runtime-cpudetect \ - --enable-shared \ - --enable-swresample \ - --enable-vdpau \ - --enable-version3 \ - --enable-x11grab - - make - make tools/qt-faststart - make doc/ff{mpeg,play,server}.1 -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install install-man - install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart -} - -# vim:set ts=2 sw=2 et: Copied: ffmpeg/repos/extra-x86_64/PKGBUILD (from rev 210120, ffmpeg/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-04-10 07:18:21 UTC (rev 210121) @@ -0,0 +1,86 @@ +# $Id$ +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> +# Contributor: Paul Mattal <p...@archlinux.org> + +pkgname=ffmpeg +pkgver=2.2 +pkgrel=3 +epoch=1 +pkgdesc='Complete and free Internet live audio and video broadcasting solution' +arch=('i686' 'x86_64') +url='http://ffmpeg.org/' +license=('GPL') +depends=( + 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau' + 'libbluray' 'libmodplug' 'libpulse' '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=('744febca199548c9393b1f1ed05ccdd8' + 'SKIP' + '4cbf9b13dc013e96be36445b4a2bfdac') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../0001-libx265-Support-API-version-9.patch +} + +build() { + cd $pkgname-$pkgver + + ./configure \ + --prefix=/usr \ + --disable-debug \ + --disable-static \ + --enable-avresample \ + --enable-dxva2 \ + --enable-fontconfig \ + --enable-gnutls \ + --enable-gpl \ + --enable-libass \ + --enable-libbluray \ + --enable-libfreetype \ + --enable-libgsm \ + --enable-libmodplug \ + --enable-libmp3lame \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libpulse \ + --enable-librtmp \ + --enable-libschroedinger \ + --enable-libspeex \ + --enable-libtheora \ + --enable-libv4l2 \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libxvid \ + --enable-pic \ + --enable-postproc \ + --enable-runtime-cpudetect \ + --enable-shared \ + --enable-swresample \ + --enable-vdpau \ + --enable-version3 \ + --enable-x11grab + + make + make tools/qt-faststart + make doc/ff{mpeg,play,server}.1 +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install install-man + install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart +} + +# vim:set ts=2 sw=2 et: