commit: ac1de66b8f0e6b5eb3ea4422028b5cb140c6cb70
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 13:34:07 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 13:34:21 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1de66b
media-video/x264-encoder: fix build with ffmpeg git master.
Package-Manager: portage-2.2.20.1
media-video/x264-encoder/files/ffmpeg29.patch | 13 +++++++++++++
.../x264-encoder/x264-encoder-0.0.20150820-r1.ebuild | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/media-video/x264-encoder/files/ffmpeg29.patch
b/media-video/x264-encoder/files/ffmpeg29.patch
new file mode 100644
index 0000000..d840c87
--- /dev/null
+++ b/media-video/x264-encoder/files/ffmpeg29.patch
@@ -0,0 +1,13 @@
+Index: x264-snapshot-20150820-2245/x264.c
+===================================================================
+--- x264-snapshot-20150820-2245.orig/x264.c
++++ x264-snapshot-20150820-2245/x264.c
+@@ -442,7 +442,7 @@ static void print_csp_names( int longhel
+ printf( " - valid csps for `lavf'
demuxer:\n" );
+ printf( INDENT );
+ size_t line_len = strlen( INDENT );
+- for( enum PixelFormat i = AV_PIX_FMT_NONE+1; i < AV_PIX_FMT_NB; i++ )
++ for( enum AVPixelFormat i = AV_PIX_FMT_NONE+1; i < AV_PIX_FMT_NB; i++ )
+ {
+ const char *pfname = av_get_pix_fmt_name( i );
+ if( pfname )
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild
b/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild
index 71259d7..a837041 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}/gpac.patch"
+ epatch "${FILESDIR}/gpac.patch" "${FILESDIR}/ffmpeg29.patch"
}
src_configure() {
