1 |
commit: 05b94c4ff0321bd3808ea738c7e78599ac43c574 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 18 14:55:16 2016 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 18 14:55:36 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b94c4f |
7 |
|
8 |
media-sound/karlyriceditor: bump to 2.1, fix build with ffmpeg 3, bug #575062 |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
12 |
|
13 |
media-sound/karlyriceditor/Manifest | 1 + |
14 |
.../files/karlyriceditor-2.1-ffmpeg3.patch | 54 ++++++++++++++++++++++ |
15 |
.../karlyriceditor/karlyriceditor-2.1.ebuild | 44 ++++++++++++++++++ |
16 |
3 files changed, 99 insertions(+) |
17 |
|
18 |
diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest |
19 |
index 0f7be28..14211cd 100644 |
20 |
--- a/media-sound/karlyriceditor/Manifest |
21 |
+++ b/media-sound/karlyriceditor/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST karlyriceditor-1.11.tar.gz 275744 SHA256 55c074111d5e22950d9ef270d5c38f52bc3da167081efe570f77b8f4e578b8dc SHA512 d86cc10c18bff321d2f22b4b810bcc52189602bfddbe8cbdd99120cf281dc673221ce75c9a8e07b8bab03f9a60c3634853177b3fa72e3f1213b96a3303568820 WHIRLPOOL 9495665856346ab54a0662a2a89bb7a10358f16d9844491ddcb9105cc266c1994b786b60bf56b5c206e2740aa77599653cb5c23ae88cdb026bd44adafa7a77a8 |
24 |
DIST karlyriceditor-1.4.tar.gz 236662 SHA256 b458eb21087cd0d92e8ea87b4ac094a2126cfbcf6471b0b1ea03173cec0ebfef SHA512 ac92e8f67be46880e71082ae1b2d099deb15ca1abca1fdf7eb8539d0346ca223ee50d9739f7879699fb190e7bc544c2a753402804df20c9b4c35eefae2d3bdbb WHIRLPOOL 9072da5010deb34fe9e09dee165f824b3aeace89a3fd0c1b464def17cf767a5ee84a77d7b2f8696f81364be5bc54003243faba3870198ba084b98e3bc2207984 |
25 |
+DIST karlyriceditor-2.1.tar.gz 276784 SHA256 1f9ec6717491fac6dda1883dfdbc53d32d6031092b1afa78aa2077a36c54fb97 SHA512 3b07abb9151c745f126c3a8215e94e0d0a00fbf3732c30de7bf47b7013174dfd2d087a4ec2c23bcecf28cd0ba3f5513dd9cb5729ffd486df0bb804a250c24af6 WHIRLPOOL b68389ec853244a00884f3f304c3931cf3c1b97ca80731a4ec5a282ef4065551d14f9e312e47e4196972cbf7357bd8680b8783b887075106cf014be82d0b1d93 |
26 |
|
27 |
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-2.1-ffmpeg3.patch b/media-sound/karlyriceditor/files/karlyriceditor-2.1-ffmpeg3.patch |
28 |
new file mode 100644 |
29 |
index 0000000..ebb9d56 |
30 |
--- /dev/null |
31 |
+++ b/media-sound/karlyriceditor/files/karlyriceditor-2.1-ffmpeg3.patch |
32 |
@@ -0,0 +1,54 @@ |
33 |
+Index: karlyriceditor-2.1/src/ffmpegvideodecoder.cpp |
34 |
+=================================================================== |
35 |
+--- karlyriceditor-2.1.orig/src/ffmpegvideodecoder.cpp |
36 |
++++ karlyriceditor-2.1/src/ffmpegvideodecoder.cpp |
37 |
+@@ -151,12 +151,12 @@ bool FFMpegVideoDecoder::openFile( const |
38 |
+ } |
39 |
+ |
40 |
+ // Determine required buffer size and allocate buffer |
41 |
+- int numBytes = avpicture_get_size( PIX_FMT_RGB24, d->pCodecCtx->width, d->pCodecCtx->height ); |
42 |
++ int numBytes = avpicture_get_size( AV_PIX_FMT_RGB24, d->pCodecCtx->width, d->pCodecCtx->height ); |
43 |
+ d->m_buffer.resize( numBytes ); |
44 |
+ |
45 |
+ // Assign appropriate parts of buffer to image planes in pFrameRGB |
46 |
+ avpicture_fill( (AVPicture *) d->pFrameRGB, (uint8_t*) d->m_buffer.data(), |
47 |
+- PIX_FMT_RGB24, d->pCodecCtx->width, d->pCodecCtx->height ); |
48 |
++ AV_PIX_FMT_RGB24, d->pCodecCtx->width, d->pCodecCtx->height ); |
49 |
+ |
50 |
+ d->skipFrames = seekto; |
51 |
+ return true; |
52 |
+@@ -215,7 +215,7 @@ bool FFMpegVideoDecoderPriv::readFrame( |
53 |
+ int w = pCodecCtx->width; |
54 |
+ int h = pCodecCtx->height; |
55 |
+ |
56 |
+- img_convert_ctx = sws_getCachedContext(img_convert_ctx,w, h, pCodecCtx->pix_fmt, w, h, PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL); |
57 |
++ img_convert_ctx = sws_getCachedContext(img_convert_ctx,w, h, pCodecCtx->pix_fmt, w, h, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL); |
58 |
+ |
59 |
+ if ( img_convert_ctx == NULL ) |
60 |
+ { |
61 |
+Index: karlyriceditor-2.1/src/ffmpegvideoencoder.cpp |
62 |
+=================================================================== |
63 |
+--- karlyriceditor-2.1.orig/src/ffmpegvideoencoder.cpp |
64 |
++++ karlyriceditor-2.1/src/ffmpegvideoencoder.cpp |
65 |
+@@ -333,7 +333,7 @@ av_log_set_level(AV_LOG_VERBOSE); |
66 |
+ videoCodecCtx->time_base.num = m_videoformat->frame_rate_num; |
67 |
+ videoCodecCtx->time_base.den = m_videoformat->frame_rate_den; |
68 |
+ videoCodecCtx->gop_size = (m_videoformat->frame_rate_den / m_videoformat->frame_rate_num) / 2; // GOP size is framerate / 2 |
69 |
+- videoCodecCtx->pix_fmt = PIX_FMT_YUV420P; |
70 |
++ videoCodecCtx->pix_fmt = AV_PIX_FMT_YUV420P; |
71 |
+ videoCodecCtx->bit_rate = m_videobitrate; |
72 |
+ videoCodecCtx->bit_rate_tolerance = m_videobitrate * av_q2d(videoCodecCtx->time_base); |
73 |
+ |
74 |
+@@ -865,10 +865,10 @@ bool FFMpegVideoEncoderPriv::convertImag |
75 |
+ videoConvertCtx = sws_getCachedContext( videoConvertCtx, |
76 |
+ m_videoformat->width, |
77 |
+ m_videoformat->height, |
78 |
+- PIX_FMT_BGRA, |
79 |
++ AV_PIX_FMT_BGRA, |
80 |
+ m_videoformat->width, |
81 |
+ m_videoformat->height, |
82 |
+- PIX_FMT_YUV420P, |
83 |
++ AV_PIX_FMT_YUV420P, |
84 |
+ SWS_BICUBIC, |
85 |
+ NULL, |
86 |
+ NULL, |
87 |
|
88 |
diff --git a/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild b/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild |
89 |
new file mode 100644 |
90 |
index 0000000..8b13bcb |
91 |
--- /dev/null |
92 |
+++ b/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild |
93 |
@@ -0,0 +1,44 @@ |
94 |
+# Copyright 1999-2015 Gentoo Foundation |
95 |
+# Distributed under the terms of the GNU General Public License v2 |
96 |
+# $Id$ |
97 |
+ |
98 |
+EAPI=6 |
99 |
+ |
100 |
+inherit eutils qmake-utils |
101 |
+ |
102 |
+DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats" |
103 |
+HOMEPAGE="http://www.ulduzsoft.com/linux/karaoke-lyrics-editor/" |
104 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
105 |
+ |
106 |
+LICENSE="GPL-3+" |
107 |
+SLOT="0" |
108 |
+KEYWORDS="~amd64 ~x86" |
109 |
+IUSE="libav" |
110 |
+ |
111 |
+RDEPEND=" |
112 |
+ dev-libs/openssl:0 |
113 |
+ dev-qt/qtcore:4 |
114 |
+ dev-qt/qtgui:4 |
115 |
+ media-libs/libsdl[sound] |
116 |
+ libav? ( media-video/libav:= ) |
117 |
+ !libav? ( media-video/ffmpeg:= ) |
118 |
+" |
119 |
+DEPEND="${RDEPEND} |
120 |
+ virtual/pkgconfig |
121 |
+" |
122 |
+ |
123 |
+PATCHES=( |
124 |
+ "${FILESDIR}/${PN}-1.11-libav.patch" |
125 |
+ "${FILESDIR}/${PN}-2.1-ffmpeg3.patch" |
126 |
+) |
127 |
+ |
128 |
+src_configure() { |
129 |
+ eqmake4 "${PN}.pro" |
130 |
+} |
131 |
+ |
132 |
+src_install() { |
133 |
+ dodoc Changelog |
134 |
+ dobin bin/${PN} |
135 |
+ doicon packages/${PN}.png |
136 |
+ make_desktop_entry ${PN} 'Karaoke Lyrics Editor' |
137 |
+} |