summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD21
-rw-r--r--fix_compilation_with_x264_ge_153_4.patch30
3 files changed, 58 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 36d79cf0a35..b5bcceebd8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Apr 9 11:46:25 UTC 2017
+# Sat Aug 25 22:30:26 UTC 2018
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 = 3
url = http://ffmpeg.org/
arch = i686
arch = x86_64
@@ -28,6 +28,7 @@ pkgbase = ffmpeg-compat-54
depends = libmodplug
depends = sdl
depends = jack
+ depends = libva
depends = libavutil-52
provides = libavcodec.so
provides = libavdevice.so
@@ -35,9 +36,17 @@ pkgbase = ffmpeg-compat-54
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 = 30d487fc7ad24acf098d034794e3047471909f1e0ddca4e22f7890ff15f9e1d6
+ sha256sums = 857d4a24c2948d1e374a13e3923d0ccb763f2c91434386e50362927e2cd35579
+ sha256sums = b5c4afbe2c7858575f30332b1d333375471455f13218b47e5c971febf1e7ee49
+ sha256sums = 35d813fc4228833839ca3be8a2b2aa7cac99e837f1643453c7166dddac5b2899
pkgname = ffmpeg-compat-54
diff --git a/PKGBUILD b/PKGBUILD
index 05ca0f01bbd..6cca7d15a08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,40 @@
pkgname=ffmpeg-compat-54
pkgver=1.2.12
-pkgrel=2
+pkgrel=3
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/"
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')
+ '1e4a01ed62db525607f9d0c708ef7889474222f9ae31aac057c5bb67edf7e38f'
+ '30d487fc7ad24acf098d034794e3047471909f1e0ddca4e22f7890ff15f9e1d6'
+ '857d4a24c2948d1e374a13e3923d0ccb763f2c91434386e50362927e2cd35579'
+ 'b5c4afbe2c7858575f30332b1d333375471455f13218b47e5c971febf1e7ee49'
+ '35d813fc4228833839ca3be8a2b2aa7cac99e837f1643453c7166dddac5b2899')
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
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 00000000000..4247eac5583
--- /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