media-video/qx11grab: fix build with ffmpeg3, bug #575052

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

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 (file)
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 a553c043b2f0585af54fe28873d245d500af0e46..f42752f512befffca6bd1f0607fb0bcca6878918 100644 (file)
--- 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