[gentoo-commits] repo/gentoo:master commit in: media-sound/karlyriceditor/, media-sound/karlyriceditor/files/

[Michael Palimaka]

commit: 155c286af71f5a93ed4f8bbbe8b157db45666cef
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Apr 25 11:45:40 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Apr 25 11:45:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155c286a

media-sound/karlyriceditor: remove 2.1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-sound/karlyriceditor/Manifest|   1 -
 .../files/karlyriceditor-1.11-libav.patch  | 320 -
 .../files/karlyriceditor-2.1-ffmpeg3.patch |  54 
 .../files/karlyriceditor-2.1-qt55.patch|  12 -
 .../karlyriceditor/karlyriceditor-2.1.ebuild   |  55 
 5 files changed, 442 deletions(-)

diff --git a/media-sound/karlyriceditor/Manifest 
b/media-sound/karlyriceditor/Manifest
index 1e29260cb5c..e24dc4f8ea0 100644
--- a/media-sound/karlyriceditor/Manifest
+++ b/media-sound/karlyriceditor/Manifest
@@ -1,2 +1 @@
-DIST karlyriceditor-2.1.tar.gz 276784 SHA256 
1f9ec6717491fac6dda1883dfdbc53d32d6031092b1afa78aa2077a36c54fb97 SHA512 
3b07abb9151c745f126c3a8215e94e0d0a00fbf3732c30de7bf47b7013174dfd2d087a4ec2c23bcecf28cd0ba3f5513dd9cb5729ffd486df0bb804a250c24af6
 WHIRLPOOL 
b68389ec853244a00884f3f304c3931cf3c1b97ca80731a4ec5a282ef4065551d14f9e312e47e4196972cbf7357bd8680b8783b887075106cf014be82d0b1d93
 DIST karlyriceditor-2.2.tar.gz 280119 SHA256 
9d58e692b50902deb5fea3a58f26c78954a7c8f9cddca864f86bf3d98324151a SHA512 
bce3aed1402c8fff3e04940527773d2855d3d67e47b159478c53e63eaadfbb70df3f4fbefb75490cc17b750455e1359963468ce14dd504f37219e1268a213103
 WHIRLPOOL 
d908b585f88682d7c7692d0bcaff9c73e0a1e67ae6ab429f45b5dcfd46fcc2d21a1bee8ffa221368b67a8fde12231fe87290c0f2ac27f33ea0dda6d5217a63e2

diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch 
b/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch
deleted file mode 100644
index 9ef67ad8d0e..000
--- a/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-From: =?utf-8?q?Martin_Stegh=C3=B6fer?= 
-Date: Tue, 13 Nov 2012 20:19:11 +0100
-Subject: Add missing includes for libavutil
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Author: Martin Steghöfer 
-Bug: 
https://sourceforge.net/tracker/?func=detail=3512390_id=290648=1229531
-Forwarded: not-needed
-
-Added includes necessary for the use of the function "av_rescale_q".
-Forwarding to upstream not needed because an equivalent patch has already been
-posted to upstream's bug tracker (see URL in the "Bug" field).

- src/audioplayerprivate.cpp | 3 +++
- src/ffmpegvideoencoder.cpp | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/src/audioplayerprivate.cpp b/src/audioplayerprivate.cpp
-index 90e..1b6b32d 100644
 a/src/audioplayerprivate.cpp
-+++ b/src/audioplayerprivate.cpp
-@@ -21,6 +21,9 @@
- 
- #include "audioplayer.h"
- #include "audioplayerprivate.h"
-+extern "C" {
-+#include "libavutil/mathematics.h"
-+}
- #include 
- 
- // SDL defines its own main() function in SDL_main. And so does Qt, so if we 
continue without
-diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp
-index 5734d2e..49182b5 100644
 a/src/ffmpegvideoencoder.cpp
-+++ b/src/ffmpegvideoencoder.cpp
-@@ -28,6 +28,9 @@
- #include "videoencodingprofiles.h"
- #include "audioplayer.h"
- #include "audioplayerprivate.h"
-+extern "C" {
-+#include "libavutil/mathematics.h"
-+}
- 
- 
- #define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-From: =?utf-8?q?Martin_Stegh=C3=B6fer?= 
-Date: Sat, 12 Apr 2014 15:19:48 +0200
-Subject: Fix compilation: FFmpeg/Libav
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Author: Martin Steghöfer 
-Forwarded: not-needed
-
-The upstream developers compile Karlyriceditor against FFmpeg, but in Debian
-there is only Libav available, whose API is slowly drifting away from
-FFmpeg's. This patch adapts the code to several of those differences:
-* The second parameters of "avformat_new_stream" is of non-const pointer
-  type, but the code tries to pass a const pointer to it.
-* There is no AV_ROUND_PASS_MINMAX flag for the rounding parameter of
-  av_rescale_q_rnd in Libav.
-* The member r_frame_rate is no longer present in AVStream. The recommended
-  replacement is avg_frame_rate.
-* The enums CODEC_ID_MP3 and CODEC_ID_AC3 have been prefixed with AV_.
-* The function avcodec_alloc_frame was removed in favor of av_frame_alloc.
-  The corresponding deallocation function is av_frame_free (not the generic
-  av_free).

- src/audioplayerprivate.cpp |  4 ++--
- src/ffmpegvideodecoder.cpp |  8 
- src/ffmpegvideoencoder.cpp | 32 
- 3 files changed, 26 insertions(+), 18 deletions(-)
-
-diff --git a/src/audioplayerprivate.cpp 

[gentoo-commits] repo/gentoo:master commit in: media-sound/karlyriceditor/, media-sound/karlyriceditor/files/

[Davide Pesavento]

commit: a12adc8e8b0a36ffee9099f7799df759dc633153
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon May 30 17:17:00 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon May 30 17:40:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a12adc8e

media-sound/karlyriceditor: remove old

Package-Manager: portage-2.3.0_rc1

 media-sound/karlyriceditor/Manifest|  1 -
 .../files/karlyriceditor-1.3-libav.patch   | 10 --
 .../files/karlyriceditor-1.4-ffmpeg_compat.patch   | 37 --
 .../files/karlyriceditor-1.4-qmin.patch| 13 
 .../karlyriceditor/karlyriceditor-1.11-r1.ebuild   | 37 --
 5 files changed, 98 deletions(-)

diff --git a/media-sound/karlyriceditor/Manifest 
b/media-sound/karlyriceditor/Manifest
index e82a832..076c72f 100644
--- a/media-sound/karlyriceditor/Manifest
+++ b/media-sound/karlyriceditor/Manifest
@@ -1,2 +1 @@
-DIST karlyriceditor-1.11.tar.gz 275744 SHA256 
55c074111d5e22950d9ef270d5c38f52bc3da167081efe570f77b8f4e578b8dc SHA512 
d86cc10c18bff321d2f22b4b810bcc52189602bfddbe8cbdd99120cf281dc673221ce75c9a8e07b8bab03f9a60c3634853177b3fa72e3f1213b96a3303568820
 WHIRLPOOL 
9495665856346ab54a0662a2a89bb7a10358f16d9844491ddcb9105cc266c1994b786b60bf56b5c206e2740aa77599653cb5c23ae88cdb026bd44adafa7a77a8
 DIST karlyriceditor-2.1.tar.gz 276784 SHA256 
1f9ec6717491fac6dda1883dfdbc53d32d6031092b1afa78aa2077a36c54fb97 SHA512 
3b07abb9151c745f126c3a8215e94e0d0a00fbf3732c30de7bf47b7013174dfd2d087a4ec2c23bcecf28cd0ba3f5513dd9cb5729ffd486df0bb804a250c24af6
 WHIRLPOOL 
b68389ec853244a00884f3f304c3931cf3c1b97ca80731a4ec5a282ef4065551d14f9e312e47e4196972cbf7357bd8680b8783b887075106cf014be82d0b1d93

diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.3-libav.patch 
b/media-sound/karlyriceditor/files/karlyriceditor-1.3-libav.patch
deleted file mode 100644
index d3f63d5..000
--- a/media-sound/karlyriceditor/files/karlyriceditor-1.3-libav.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 src/ffmpeg_headers.h
-+++ src/ffmpeg_headers.h
-@@ -32,6 +32,7 @@
- 
- #include "libavcodec/avcodec.h"
- #include "libavformat/avformat.h"
-+#include "libavutil/mathematics.h"
- #include "libswscale/swscale.h"
- 
- };

diff --git 
a/media-sound/karlyriceditor/files/karlyriceditor-1.4-ffmpeg_compat.patch 
b/media-sound/karlyriceditor/files/karlyriceditor-1.4-ffmpeg_compat.patch
deleted file mode 100644
index 9711f9e..000
--- a/media-sound/karlyriceditor/files/karlyriceditor-1.4-ffmpeg_compat.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: karlyriceditor-1.4/src/ffmpegvideoencoder.cpp
-===
 karlyriceditor-1.4.orig/src/ffmpegvideoencoder.cpp
-+++ karlyriceditor-1.4/src/ffmpegvideoencoder.cpp
-@@ -397,6 +397,13 @@ int FFMpegVideoEncoderPriv::encodeImage(
-   // SWS conversion
-   convertImage_sws(img);
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,2,0)
-+  int out_size = 
avcodec_encode_video(pVideoCodecCtx,outbuf,outbuf_size,ppicture);
-+
-+  if (out_size > 0)
-+  {
-+  av_init_packet();
-+#else
-   av_init_packet(  );
-   pkt.data = NULL;
-   pkt.size = 0;
-@@ -408,6 +415,7 @@ int FFMpegVideoEncoderPriv::encodeImage(
- 
-   if ( got_packet )
-   {
-+#endif
-   if ( pVideoCodecCtx->coded_frame->pts != (int64_t) 
(0x8000LL) )
-   pkt.pts= av_rescale_q(pVideoCodecCtx->coded_frame->pts, 
pVideoCodecCtx->time_base, pVideoStream->time_base);
- 
-@@ -415,6 +423,10 @@ int FFMpegVideoEncoderPriv::encodeImage(
-   pkt.flags |= AV_PKT_FLAG_KEY;
- 
-   pkt.stream_index = pVideoStream->index;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,2,0)
-+  pkt.data = outbuf;
-+  pkt.size = out_size;
-+#endif
- 
-   int ret = av_interleaved_write_frame(pOutputCtx, );
- 

diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.4-qmin.patch 
b/media-sound/karlyriceditor/files/karlyriceditor-1.4-qmin.patch
deleted file mode 100644
index b7835e5..000
--- a/media-sound/karlyriceditor/files/karlyriceditor-1.4-qmin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: karlyriceditor-1.4/src/kfn_file_parser.cpp
-===
 karlyriceditor-1.4.orig/src/kfn_file_parser.cpp
-+++ karlyriceditor-1.4/src/kfn_file_parser.cpp
-@@ -311,7 +311,7 @@ QByteArray KFNFileParser::extract( const
- 
-   while ( total_in < entry.length_in )
-   {
--  int toRead = qMin( sizeof(buffer), (unsigned int) 
entry.length_in - total_in );
-+  int toRead = qMin( sizeof(buffer), (size_t) entry.length_in - 
total_in );
-   int bytesRead = m_file.read( buffer, toRead );
- 
-   // We might need to write less than we read since the file is 
rounded to 16 bytes

diff --git 

[gentoo-commits] repo/gentoo:master commit in: media-sound/karlyriceditor/, media-sound/karlyriceditor/files/

[Alexis Ballier]

commit: 05b94c4ff0321bd3808ea738c7e78599ac43c574
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Feb 18 14:55:16 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Feb 18 14:55:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b94c4f

media-sound/karlyriceditor: bump to 2.1, fix build with ffmpeg 3, bug #575062

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

 media-sound/karlyriceditor/Manifest|  1 +
 .../files/karlyriceditor-2.1-ffmpeg3.patch | 54 ++
 .../karlyriceditor/karlyriceditor-2.1.ebuild   | 44 ++
 3 files changed, 99 insertions(+)

diff --git a/media-sound/karlyriceditor/Manifest 
b/media-sound/karlyriceditor/Manifest
index 0f7be28..14211cd 100644
--- a/media-sound/karlyriceditor/Manifest
+++ b/media-sound/karlyriceditor/Manifest
@@ -1,2 +1,3 @@
 DIST karlyriceditor-1.11.tar.gz 275744 SHA256 
55c074111d5e22950d9ef270d5c38f52bc3da167081efe570f77b8f4e578b8dc SHA512 
d86cc10c18bff321d2f22b4b810bcc52189602bfddbe8cbdd99120cf281dc673221ce75c9a8e07b8bab03f9a60c3634853177b3fa72e3f1213b96a3303568820
 WHIRLPOOL 
9495665856346ab54a0662a2a89bb7a10358f16d9844491ddcb9105cc266c1994b786b60bf56b5c206e2740aa77599653cb5c23ae88cdb026bd44adafa7a77a8
 DIST karlyriceditor-1.4.tar.gz 236662 SHA256 
b458eb21087cd0d92e8ea87b4ac094a2126cfbcf6471b0b1ea03173cec0ebfef SHA512 
ac92e8f67be46880e71082ae1b2d099deb15ca1abca1fdf7eb8539d0346ca223ee50d9739f7879699fb190e7bc544c2a753402804df20c9b4c35eefae2d3bdbb
 WHIRLPOOL 
9072da5010deb34fe9e09dee165f824b3aeace89a3fd0c1b464def17cf767a5ee84a77d7b2f8696f81364be5bc54003243faba3870198ba084b98e3bc2207984
+DIST karlyriceditor-2.1.tar.gz 276784 SHA256 
1f9ec6717491fac6dda1883dfdbc53d32d6031092b1afa78aa2077a36c54fb97 SHA512 
3b07abb9151c745f126c3a8215e94e0d0a00fbf3732c30de7bf47b7013174dfd2d087a4ec2c23bcecf28cd0ba3f5513dd9cb5729ffd486df0bb804a250c24af6
 WHIRLPOOL 
b68389ec853244a00884f3f304c3931cf3c1b97ca80731a4ec5a282ef4065551d14f9e312e47e4196972cbf7357bd8680b8783b887075106cf014be82d0b1d93

diff --git a/media-sound/karlyriceditor/files/karlyriceditor-2.1-ffmpeg3.patch 
b/media-sound/karlyriceditor/files/karlyriceditor-2.1-ffmpeg3.patch
new file mode 100644
index 000..ebb9d56
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-2.1-ffmpeg3.patch
@@ -0,0 +1,54 @@
+Index: karlyriceditor-2.1/src/ffmpegvideodecoder.cpp
+===
+--- karlyriceditor-2.1.orig/src/ffmpegvideodecoder.cpp
 karlyriceditor-2.1/src/ffmpegvideodecoder.cpp
+@@ -151,12 +151,12 @@ bool FFMpegVideoDecoder::openFile( const
+   }
+ 
+   // Determine required buffer size and allocate buffer
+-  int numBytes = avpicture_get_size( PIX_FMT_RGB24, d->pCodecCtx->width, 
d->pCodecCtx->height );
++  int numBytes = avpicture_get_size( AV_PIX_FMT_RGB24, 
d->pCodecCtx->width, d->pCodecCtx->height );
+   d->m_buffer.resize( numBytes );
+ 
+   // Assign appropriate parts of buffer to image planes in pFrameRGB
+   avpicture_fill( (AVPicture *) d->pFrameRGB, (uint8_t*) 
d->m_buffer.data(),
+-  PIX_FMT_RGB24, d->pCodecCtx->width, 
d->pCodecCtx->height );
++  AV_PIX_FMT_RGB24, d->pCodecCtx->width, 
d->pCodecCtx->height );
+ 
+   d->skipFrames = seekto;
+   return true;
+@@ -215,7 +215,7 @@ bool FFMpegVideoDecoderPriv::readFrame(
+   int w = pCodecCtx->width;
+   int h = pCodecCtx->height;
+ 
+-  img_convert_ctx = 
sws_getCachedContext(img_convert_ctx,w, h, pCodecCtx->pix_fmt, w, h, 
PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
++  img_convert_ctx = 
sws_getCachedContext(img_convert_ctx,w, h, pCodecCtx->pix_fmt, w, h, 
AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
+ 
+   if ( img_convert_ctx == NULL )
+   {
+Index: karlyriceditor-2.1/src/ffmpegvideoencoder.cpp
+===
+--- karlyriceditor-2.1.orig/src/ffmpegvideoencoder.cpp
 karlyriceditor-2.1/src/ffmpegvideoencoder.cpp
+@@ -333,7 +333,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+   videoCodecCtx->time_base.num = m_videoformat->frame_rate_num;
+   videoCodecCtx->time_base.den = m_videoformat->frame_rate_den;
+   videoCodecCtx->gop_size = (m_videoformat->frame_rate_den / 
m_videoformat->frame_rate_num) / 2;  // GOP size is framerate / 2
+-  videoCodecCtx->pix_fmt = PIX_FMT_YUV420P;
++  videoCodecCtx->pix_fmt = AV_PIX_FMT_YUV420P;
+   videoCodecCtx->bit_rate = m_videobitrate;
+   videoCodecCtx->bit_rate_tolerance = m_videobitrate * 
av_q2d(videoCodecCtx->time_base);
+ 
+@@ -865,10 +865,10 @@ bool FFMpegVideoEncoderPriv::convertImag
+   videoConvertCtx =