Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/karlyriceditor/, media-sound/karlyriceditor/files/
Date: Mon, 30 May 2016 17:41:07
Message-Id: 1464630050.a12adc8e8b0a36ffee9099f7799df759dc633153.pesa@gentoo
1 commit: a12adc8e8b0a36ffee9099f7799df759dc633153
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 30 17:17:00 2016 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Mon May 30 17:40:50 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a12adc8e
7
8 media-sound/karlyriceditor: remove old
9
10 Package-Manager: portage-2.3.0_rc1
11
12 media-sound/karlyriceditor/Manifest | 1 -
13 .../files/karlyriceditor-1.3-libav.patch | 10 ------
14 .../files/karlyriceditor-1.4-ffmpeg_compat.patch | 37 ----------------------
15 .../files/karlyriceditor-1.4-qmin.patch | 13 --------
16 .../karlyriceditor/karlyriceditor-1.11-r1.ebuild | 37 ----------------------
17 5 files changed, 98 deletions(-)
18
19 diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest
20 index e82a832..076c72f 100644
21 --- a/media-sound/karlyriceditor/Manifest
22 +++ b/media-sound/karlyriceditor/Manifest
23 @@ -1,2 +1 @@
24 -DIST karlyriceditor-1.11.tar.gz 275744 SHA256 55c074111d5e22950d9ef270d5c38f52bc3da167081efe570f77b8f4e578b8dc SHA512 d86cc10c18bff321d2f22b4b810bcc52189602bfddbe8cbdd99120cf281dc673221ce75c9a8e07b8bab03f9a60c3634853177b3fa72e3f1213b96a3303568820 WHIRLPOOL 9495665856346ab54a0662a2a89bb7a10358f16d9844491ddcb9105cc266c1994b786b60bf56b5c206e2740aa77599653cb5c23ae88cdb026bd44adafa7a77a8
25 DIST karlyriceditor-2.1.tar.gz 276784 SHA256 1f9ec6717491fac6dda1883dfdbc53d32d6031092b1afa78aa2077a36c54fb97 SHA512 3b07abb9151c745f126c3a8215e94e0d0a00fbf3732c30de7bf47b7013174dfd2d087a4ec2c23bcecf28cd0ba3f5513dd9cb5729ffd486df0bb804a250c24af6 WHIRLPOOL b68389ec853244a00884f3f304c3931cf3c1b97ca80731a4ec5a282ef4065551d14f9e312e47e4196972cbf7357bd8680b8783b887075106cf014be82d0b1d93
26
27 diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.3-libav.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.3-libav.patch
28 deleted file mode 100644
29 index d3f63d5..0000000
30 --- a/media-sound/karlyriceditor/files/karlyriceditor-1.3-libav.patch
31 +++ /dev/null
32 @@ -1,10 +0,0 @@
33 ---- src/ffmpeg_headers.h
34 -+++ src/ffmpeg_headers.h
35 -@@ -32,6 +32,7 @@
36 -
37 - #include "libavcodec/avcodec.h"
38 - #include "libavformat/avformat.h"
39 -+#include "libavutil/mathematics.h"
40 - #include "libswscale/swscale.h"
41 -
42 - };
43
44 diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.4-ffmpeg_compat.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.4-ffmpeg_compat.patch
45 deleted file mode 100644
46 index 9711f9e..0000000
47 --- a/media-sound/karlyriceditor/files/karlyriceditor-1.4-ffmpeg_compat.patch
48 +++ /dev/null
49 @@ -1,37 +0,0 @@
50 -Index: karlyriceditor-1.4/src/ffmpegvideoencoder.cpp
51 -===================================================================
52 ---- karlyriceditor-1.4.orig/src/ffmpegvideoencoder.cpp
53 -+++ karlyriceditor-1.4/src/ffmpegvideoencoder.cpp
54 -@@ -397,6 +397,13 @@ int FFMpegVideoEncoderPriv::encodeImage(
55 - // SWS conversion
56 - convertImage_sws(img);
57 -
58 -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,2,0)
59 -+ int out_size = avcodec_encode_video(pVideoCodecCtx,outbuf,outbuf_size,ppicture);
60 -+
61 -+ if (out_size > 0)
62 -+ {
63 -+ av_init_packet(&pkt);
64 -+#else
65 - av_init_packet( &pkt );
66 - pkt.data = NULL;
67 - pkt.size = 0;
68 -@@ -408,6 +415,7 @@ int FFMpegVideoEncoderPriv::encodeImage(
69 -
70 - if ( got_packet )
71 - {
72 -+#endif
73 - if ( pVideoCodecCtx->coded_frame->pts != (int64_t) (0x8000000000000000LL) )
74 - pkt.pts= av_rescale_q(pVideoCodecCtx->coded_frame->pts, pVideoCodecCtx->time_base, pVideoStream->time_base);
75 -
76 -@@ -415,6 +423,10 @@ int FFMpegVideoEncoderPriv::encodeImage(
77 - pkt.flags |= AV_PKT_FLAG_KEY;
78 -
79 - pkt.stream_index = pVideoStream->index;
80 -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,2,0)
81 -+ pkt.data = outbuf;
82 -+ pkt.size = out_size;
83 -+#endif
84 -
85 - int ret = av_interleaved_write_frame(pOutputCtx, &pkt);
86 -
87
88 diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.4-qmin.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.4-qmin.patch
89 deleted file mode 100644
90 index b7835e5..0000000
91 --- a/media-sound/karlyriceditor/files/karlyriceditor-1.4-qmin.patch
92 +++ /dev/null
93 @@ -1,13 +0,0 @@
94 -Index: karlyriceditor-1.4/src/kfn_file_parser.cpp
95 -===================================================================
96 ---- karlyriceditor-1.4.orig/src/kfn_file_parser.cpp
97 -+++ karlyriceditor-1.4/src/kfn_file_parser.cpp
98 -@@ -311,7 +311,7 @@ QByteArray KFNFileParser::extract( const
99 -
100 - while ( total_in < entry.length_in )
101 - {
102 -- int toRead = qMin( sizeof(buffer), (unsigned int) entry.length_in - total_in );
103 -+ int toRead = qMin( sizeof(buffer), (size_t) entry.length_in - total_in );
104 - int bytesRead = m_file.read( buffer, toRead );
105 -
106 - // We might need to write less than we read since the file is rounded to 16 bytes
107
108 diff --git a/media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild
109 deleted file mode 100644
110 index 6f968fa..0000000
111 --- a/media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild
112 +++ /dev/null
113 @@ -1,37 +0,0 @@
114 -# Copyright 1999-2015 Gentoo Foundation
115 -# Distributed under the terms of the GNU General Public License v2
116 -# $Id$
117 -
118 -EAPI=5
119 -
120 -inherit eutils qt4-r2
121 -
122 -DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats"
123 -HOMEPAGE="http://www.ulduzsoft.com/linux/karaoke-lyrics-editor/"
124 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
125 -
126 -LICENSE="GPL-3+"
127 -SLOT="0"
128 -KEYWORDS="~amd64 ~x86"
129 -IUSE="libav"
130 -
131 -RDEPEND="
132 - dev-libs/openssl:0
133 - dev-qt/qtcore:4
134 - dev-qt/qtgui:4
135 - media-libs/libsdl[sound]
136 - libav? ( media-video/libav:= )
137 - !libav? ( media-video/ffmpeg:= )
138 -"
139 -DEPEND="${RDEPEND}
140 - virtual/pkgconfig
141 -"
142 -
143 -PATCHES=( "${FILESDIR}/${P}-libav.patch" )
144 -
145 -src_install() {
146 - dodoc Changelog
147 - dobin bin/${PN}
148 - doicon packages/${PN}.png
149 - make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
150 -}