commit: 56b5b61eb4bf511947a0b4b22a3414838fbfc312
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 15:16:24 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 15:16:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b5b61e
media-video/qx11grab: fix build with ffmpeg3, bug #575052
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
.../qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch | 22 ++++++++++++++++++++++
media-video/qx11grab/qx11grab-0.4.12.ebuild | 1 +
2 files changed, 23 insertions(+)
diff --git a/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch
b/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch
new file mode 100644
index 0000000..a5d20ed
--- /dev/null
+++ b/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch
@@ -0,0 +1,22 @@
+Index: qx11grab-0.4.12/src/avoptions/avoptions.cpp
+===================================================================
+--- qx11grab-0.4.12.orig/src/avoptions/avoptions.cpp
++++ qx11grab-0.4.12/src/avoptions/avoptions.cpp
+@@ -178,14 +178,14 @@ namespace QX11Grab
+ {
+ QList<FFOption> list;
+ avcodec_register_all();
+- for ( int i = 0; i < PIX_FMT_NB; i++ )
++ int i = 0;
++ for ( const AVPixFmtDescriptor* pix_desc = av_pix_fmt_desc_next(NULL);
pix_desc != NULL; pix_desc = av_pix_fmt_desc_next(pix_desc))
+ {
+- const AVPixFmtDescriptor* pix_desc = &av_pix_fmt_descriptors[
static_cast<PixelFormat> ( i ) ];
+ if ( ! pix_desc->name )
+ continue;
+
+ FFOption opt;
+- opt.id = i;
++ opt.id = i++;
+ opt.name = QString::fromUtf8 ( pix_desc->name );
+ opt.value = QVariant ( pix_desc->name );
+ /*: ToolTip */
diff --git a/media-video/qx11grab/qx11grab-0.4.12.ebuild
b/media-video/qx11grab/qx11grab-0.4.12.ebuild
index a553c04..f42752f 100644
--- a/media-video/qx11grab/qx11grab-0.4.12.ebuild
+++ b/media-video/qx11grab/qx11grab-0.4.12.ebuild
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
kde? ( dev-util/automoc )
"
PDEPEND="virtual/freedesktop-icon-theme"
+PATCHES=( "${FILESDIR}/${P}-ffmpeg3.patch" )
src_prepare() {
cmake-utils_src_prepare
