diff options
-rw-r--r-- | .SRCINFO | 17 | ||||
-rw-r--r-- | PKGBUILD | 25 | ||||
-rw-r--r-- | fix_compilation_with_x264_ge_153_4.patch | 30 |
3 files changed, 59 insertions, 13 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Sun Apr 9 11:46:25 UTC 2017 pkgbase = ffmpeg-compat-54 pkgdesc = Compatibility package for ffmpeg to provide versions 54 of libavcodec, libavdevice and libavformat, not anymore provided by the ffmpeg package pkgver = 1.2.12 - pkgrel = 2 + pkgrel = 4 url = http://ffmpeg.org/ arch = i686 arch = x86_64 @@ -28,16 +26,23 @@ pkgbase = ffmpeg-compat-54 depends = libmodplug depends = sdl depends = jack + depends = libva depends = libavutil-52 provides = libavcodec.so provides = libavdevice.so provides = libavformat.so + options = !lto source = http://ffmpeg.org/releases/ffmpeg-1.2.12.tar.bz2 - source = http://ffmpeg.org/releases/ffmpeg-1.2.12.tar.bz2.asc source = libvpx_VP8E_UPD_ENTROPY.patch::https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab + source = fix_compilation_with_x264_ge_153_1.patch::https://github.com/FFmpeg/FFmpeg/commit/89f704cabab446afc8ba6ecea76714a51b1df32b.patch + source = fix_compilation_with_x264_ge_153_2.patch::https://github.com/FFmpeg/FFmpeg/commit/2a111c99a60fdf4fe5eea2b073901630190c6c93.patch + source = fix_compilation_with_x264_ge_153_3.patch::https://github.com/FFmpeg/FFmpeg/commit/7e60c74329353db28db00552028bc88cd2a52346.patch + source = fix_compilation_with_x264_ge_153_4.patch sha256sums = 913ac95c7fad92c2a4ebcfd11850904f531845c75d45c3e4e4a693990fe2497d - sha256sums = SKIP sha256sums = 1e4a01ed62db525607f9d0c708ef7889474222f9ae31aac057c5bb67edf7e38f + sha256sums = 7f0d0b0b9843b05231dc3a7d6204a96a75449359b36c76adb89bf12cd42a2216 + sha256sums = 1cd460e0af142ab5ae233afe6b4afa66a5431a284d0a05e02b84fa88f9a3d4b6 + sha256sums = 4fba701c5e9f0e172ff24e30d2abf25d6f46d0aa02502512bfedd4df42329453 + sha256sums = 35d813fc4228833839ca3be8a2b2aa7cac99e837f1643453c7166dddac5b2899 pkgname = ffmpeg-compat-54 - @@ -2,27 +2,38 @@ pkgname=ffmpeg-compat-54 pkgver=1.2.12 -pkgrel=2 +pkgrel=4 pkgdesc="Compatibility package for ffmpeg to provide versions 54 of libavcodec, libavdevice and libavformat, not anymore provided by the ffmpeg package" arch=('i686' 'x86_64') url="http://ffmpeg.org/" +options=('!lto') license=('GPL') depends=('gsm' 'lame' 'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'libvpx' 'schroedinger' 'speex' 'v4l-utils' 'xvidcore' 'libpulse' 'libx264' - 'libtheora' 'libbluray' 'libmodplug' 'sdl' 'jack' 'libavutil-52') + 'libtheora' 'libbluray' 'libmodplug' 'sdl' 'jack' 'libva' 'libavutil-52') makedepends=('yasm' 'libass') provides=('libavcodec.so' 'libavdevice.so' 'libavformat.so') source=("http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.bz2" - "http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.bz2.asc" - "libvpx_VP8E_UPD_ENTROPY.patch"::"https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab") + "libvpx_VP8E_UPD_ENTROPY.patch"::"https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab" + "fix_compilation_with_x264_ge_153_1.patch"::"https://github.com/FFmpeg/FFmpeg/commit/89f704cabab446afc8ba6ecea76714a51b1df32b.patch" + "fix_compilation_with_x264_ge_153_2.patch"::"https://github.com/FFmpeg/FFmpeg/commit/2a111c99a60fdf4fe5eea2b073901630190c6c93.patch" + "fix_compilation_with_x264_ge_153_3.patch"::"https://github.com/FFmpeg/FFmpeg/commit/7e60c74329353db28db00552028bc88cd2a52346.patch" + "fix_compilation_with_x264_ge_153_4.patch") sha256sums=('913ac95c7fad92c2a4ebcfd11850904f531845c75d45c3e4e4a693990fe2497d' - 'SKIP' - '1e4a01ed62db525607f9d0c708ef7889474222f9ae31aac057c5bb67edf7e38f') -validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') + '1e4a01ed62db525607f9d0c708ef7889474222f9ae31aac057c5bb67edf7e38f' + '7f0d0b0b9843b05231dc3a7d6204a96a75449359b36c76adb89bf12cd42a2216' + '1cd460e0af142ab5ae233afe6b4afa66a5431a284d0a05e02b84fa88f9a3d4b6' + '4fba701c5e9f0e172ff24e30d2abf25d6f46d0aa02502512bfedd4df42329453' + '35d813fc4228833839ca3be8a2b2aa7cac99e837f1643453c7166dddac5b2899') prepare() { cd "ffmpeg-${pkgver}" patch -p1 -i "../libvpx_VP8E_UPD_ENTROPY.patch" + # Fixes for libx264 >= 153 + patch -p1 -i "../fix_compilation_with_x264_ge_153_1.patch" + patch -p1 -i "../fix_compilation_with_x264_ge_153_2.patch" + patch -p1 -i "../fix_compilation_with_x264_ge_153_3.patch" + patch -p1 -i "../fix_compilation_with_x264_ge_153_4.patch" } build() { diff --git a/fix_compilation_with_x264_ge_153_4.patch b/fix_compilation_with_x264_ge_153_4.patch new file mode 100644 index 000000000000..4247eac55837 --- /dev/null +++ b/fix_compilation_with_x264_ge_153_4.patch @@ -0,0 +1,30 @@ +diff -Naur ffmpeg-1.2.12.orig/libavcodec/libx264.c ffmpeg-1.2.12/libavcodec/libx264.c +--- ffmpeg-1.2.12.orig/libavcodec/libx264.c 2018-08-26 00:25:51.142481000 +0200 ++++ ffmpeg-1.2.12/libavcodec/libx264.c 2018-08-26 00:27:16.508999660 +0200 +@@ -160,7 +160,7 @@ + + x264_picture_init( &x4->pic ); + x4->pic.img.i_csp = x4->params.i_csp; +- if (desc->comp[0].depth > 8) ++ if (desc->comp[0].depth_minus1 > 8) + x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH; + x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt); + +@@ -491,7 +491,7 @@ + x4->params.i_width = avctx->width; + x4->params.i_height = avctx->height; + #if X264_BUILD >= 153 +- x4->params.i_bitdepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth; ++ x4->params.i_bitdepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1; + #endif + av_reduce(&sw, &sh, avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den, 4096); + x4->params.vui.i_sar_width = sw; +@@ -596,8 +596,6 @@ + AV_PIX_FMT_YUV422P10, + AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_NV12, +- AV_PIX_FMT_NV16, +- AV_PIX_FMT_NV20, + #ifdef X264_CSP_NV21 + AV_PIX_FMT_NV21, + #endif |