| 1 |
commit: 56b5b61eb4bf511947a0b4b22a3414838fbfc312 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 18 15:16:24 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 18 15:16:24 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b5b61e |
| 7 |
|
| 8 |
media-video/qx11grab: fix build with ffmpeg3, bug #575052 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
.../qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch | 22 ++++++++++++++++++++++ |
| 14 |
media-video/qx11grab/qx11grab-0.4.12.ebuild | 1 + |
| 15 |
2 files changed, 23 insertions(+) |
| 16 |
|
| 17 |
diff --git a/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch b/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..a5d20ed |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch |
| 22 |
@@ -0,0 +1,22 @@ |
| 23 |
+Index: qx11grab-0.4.12/src/avoptions/avoptions.cpp |
| 24 |
+=================================================================== |
| 25 |
+--- qx11grab-0.4.12.orig/src/avoptions/avoptions.cpp |
| 26 |
++++ qx11grab-0.4.12/src/avoptions/avoptions.cpp |
| 27 |
+@@ -178,14 +178,14 @@ namespace QX11Grab |
| 28 |
+ { |
| 29 |
+ QList<FFOption> list; |
| 30 |
+ avcodec_register_all(); |
| 31 |
+- for ( int i = 0; i < PIX_FMT_NB; i++ ) |
| 32 |
++ int i = 0; |
| 33 |
++ for ( const AVPixFmtDescriptor* pix_desc = av_pix_fmt_desc_next(NULL); pix_desc != NULL; pix_desc = av_pix_fmt_desc_next(pix_desc)) |
| 34 |
+ { |
| 35 |
+- const AVPixFmtDescriptor* pix_desc = &av_pix_fmt_descriptors[ static_cast<PixelFormat> ( i ) ]; |
| 36 |
+ if ( ! pix_desc->name ) |
| 37 |
+ continue; |
| 38 |
+ |
| 39 |
+ FFOption opt; |
| 40 |
+- opt.id = i; |
| 41 |
++ opt.id = i++; |
| 42 |
+ opt.name = QString::fromUtf8 ( pix_desc->name ); |
| 43 |
+ opt.value = QVariant ( pix_desc->name ); |
| 44 |
+ /*: ToolTip */ |
| 45 |
|
| 46 |
diff --git a/media-video/qx11grab/qx11grab-0.4.12.ebuild b/media-video/qx11grab/qx11grab-0.4.12.ebuild |
| 47 |
index a553c04..f42752f 100644 |
| 48 |
--- a/media-video/qx11grab/qx11grab-0.4.12.ebuild |
| 49 |
+++ b/media-video/qx11grab/qx11grab-0.4.12.ebuild |
| 50 |
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND} |
| 51 |
kde? ( dev-util/automoc ) |
| 52 |
" |
| 53 |
PDEPEND="virtual/freedesktop-icon-theme" |
| 54 |
+PATCHES=( "${FILESDIR}/${P}-ffmpeg3.patch" ) |
| 55 |
|
| 56 |
src_prepare() { |
| 57 |
cmake-utils_src_prepare |
Archives