diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-02-18 16:16:24 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-02-18 16:16:24 +0100 |
| commit | 56b5b61eb4bf511947a0b4b22a3414838fbfc312 (patch) | |
| tree | cd71277cfff9042909898edc9e857f2df60da32c | |
| parent | media-sound/karlyriceditor: bump to 2.1, fix build with ffmpeg 3, bug #575062 (diff) | |
| download | gentoo-56b5b61eb4bf511947a0b4b22a3414838fbfc312.tar.gz gentoo-56b5b61eb4bf511947a0b4b22a3414838fbfc312.tar.bz2 gentoo-56b5b61eb4bf511947a0b4b22a3414838fbfc312.zip | |
media-video/qx11grab: fix build with ffmpeg3, bug #575052
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
| -rw-r--r-- | media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch | 22 | ||||
| -rw-r--r-- | media-video/qx11grab/qx11grab-0.4.12.ebuild | 1 |
2 files changed, 23 insertions, 0 deletions
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 000000000000..a5d20ed5161d --- /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 a553c043b2f0..f42752f512be 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 |