summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2015-10-10 05:50:13 +1100
committerMichael Palimaka <kensington@gentoo.org>2015-10-10 05:51:51 +1100
commit8db5c61ec2b1d9d5b37f1b14434f32342b4f0803 (patch)
treecbc8245c70cd46e3f4b23ddffa07b88d25d9a9ef /media-sound/karlyriceditor
parentx11-misc/screengrab: unbundle x11-libs/libqxt (diff)
downloadgentoo-8db5c61ec2b1d9d5b37f1b14434f32342b4f0803.tar.gz
gentoo-8db5c61ec2b1d9d5b37f1b14434f32342b4f0803.tar.bz2
gentoo-8db5c61ec2b1d9d5b37f1b14434f32342b4f0803.zip
media-sound/karlyriceditor: version bump
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'media-sound/karlyriceditor')
-rw-r--r--media-sound/karlyriceditor/Manifest1
-rw-r--r--media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch320
-rw-r--r--media-sound/karlyriceditor/karlyriceditor-1.11.ebuild37
3 files changed, 358 insertions, 0 deletions
diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest
index 109d80eb659..041b2dbeada 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.3.tar.gz 215564 SHA256 f59bc9352e30a02228db65d47e190aa00e6f8e7f6ec18b093a30841548b90e57 SHA512 23e91e6f950b4f3d5ddaa474380dfd5904bd29f262144df6d587efbba070e1c84bd6d364981e0babb75aa4562c375734b16944817e49ad83ab0c169cf9d2e0e5 WHIRLPOOL d71b7111e2bf57a995acb10de14c39bce37c8f8072936812d8d672540dd22650ce1259cffccecfe6231ca0a3cba87546cd00247247bdc2b6deeb58f2e6c11c10
DIST karlyriceditor-1.4.tar.gz 236662 SHA256 b458eb21087cd0d92e8ea87b4ac094a2126cfbcf6471b0b1ea03173cec0ebfef SHA512 ac92e8f67be46880e71082ae1b2d099deb15ca1abca1fdf7eb8539d0346ca223ee50d9739f7879699fb190e7bc544c2a753402804df20c9b4c35eefae2d3bdbb WHIRLPOOL 9072da5010deb34fe9e09dee165f824b3aeace89a3fd0c1b464def17cf767a5ee84a77d7b2f8696f81364be5bc54003243faba3870198ba084b98e3bc2207984
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch
new file mode 100644
index 00000000000..6322c070854
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch
@@ -0,0 +1,320 @@
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin@steghoefer.eu>
+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 <martin@steghoefer.eu>
+Bug: http://sourceforge.net/tracker/?func=detail&aid=3512390&group_id=290648&atid=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 ffff90e..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/SDL.h>
+
+ // 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?= <martin@steghoefer.eu>
+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 <martin@steghoefer.eu>
+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 b/src/audioplayerprivate.cpp
+index 1b6b32d..a6536cd 100644
+--- a/src/audioplayerprivate.cpp
++++ b/src/audioplayerprivate.cpp
+@@ -118,7 +118,7 @@ void AudioPlayerPrivate::close()
+ }
+
+ if ( m_frame )
+- av_free( m_frame );
++ av_frame_free( &m_frame );
+
+ m_frame = 0;
+ pFormatCtx = 0;
+@@ -227,7 +227,7 @@ bool AudioPlayerPrivate::open( const QString& filename )
+ }
+
+ // Allocate the buffer
+- m_frame = avcodec_alloc_frame();
++ m_frame = av_frame_alloc();
+
+ if ( !m_frame )
+ {
+diff --git a/src/ffmpegvideodecoder.cpp b/src/ffmpegvideodecoder.cpp
+index 2ec5969..7820f72 100644
+--- a/src/ffmpegvideodecoder.cpp
++++ b/src/ffmpegvideodecoder.cpp
+@@ -113,8 +113,8 @@ bool FFMpegVideoDecoder::openFile( const QString& filename, unsigned int seekto
+ if ( d->videoStream == -1 )
+ return false; // Didn't find a video stream
+
+- d->m_fps_den = d->pFormatCtx->streams[d->videoStream]->r_frame_rate.den;
+- d->m_fps_num = d->pFormatCtx->streams[d->videoStream]->r_frame_rate.num;
++ d->m_fps_den = d->pFormatCtx->streams[d->videoStream]->avg_frame_rate.den;
++ d->m_fps_num = d->pFormatCtx->streams[d->videoStream]->avg_frame_rate.num;
+
+ if ( d->m_fps_den == 60000 )
+ d->m_fps_den = 30000;
+@@ -139,10 +139,10 @@ bool FFMpegVideoDecoder::openFile( const QString& filename, unsigned int seekto
+ }
+
+ // Allocate video frame
+- d->pFrame = avcodec_alloc_frame();
++ d->pFrame = av_frame_alloc();
+
+ // Allocate an AVFrame structure
+- d->pFrameRGB = avcodec_alloc_frame();
++ d->pFrameRGB = av_frame_alloc();
+
+ if ( !d->pFrame || !d->pFrameRGB )
+ {
+diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp
+index 49182b5..bdf1730 100644
+--- a/src/ffmpegvideoencoder.cpp
++++ b/src/ffmpegvideoencoder.cpp
+@@ -174,10 +174,10 @@ bool FFMpegVideoEncoderPriv::close()
+ delete[] audioSampleBuffer;
+
+ if ( videoFrame )
+- av_free(videoFrame);
++ av_frame_free( &videoFrame );
+
+ if ( audioFrame )
+- av_free( audioFrame );
++ av_frame_free( &audioFrame );
+
+ outputFormatCtx = 0;
+ outputFormat = 0;
+@@ -383,7 +383,11 @@ av_log_set_level(AV_LOG_VERBOSE);
+ }
+
+ // Create the video stream, index
+- videoStream = avformat_new_stream( outputFormatCtx, videoCodecCtx->codec );
++ // Use a block to keep the helper variable "codec" local to avoid conflict with gotos
++ {
++ AVCodec codec = *videoCodecCtx->codec;
++ videoStream = avformat_new_stream( outputFormatCtx, &codec );
++ }
+
+ if ( !videoStream )
+ {
+@@ -425,10 +429,10 @@ av_log_set_level(AV_LOG_VERBOSE);
+ // We're copying the stream
+ memcpy( newCtx, m_aplayer->aCodecCtx, sizeof(AVCodecContext) );
+
+- if ( newCtx->block_align == 1 && newCtx->codec_id == CODEC_ID_MP3 )
++ if ( newCtx->block_align == 1 && newCtx->codec_id == AV_CODEC_ID_MP3 )
+ newCtx->block_align= 0;
+
+- if ( newCtx->codec_id == CODEC_ID_AC3 )
++ if ( newCtx->codec_id == AV_CODEC_ID_AC3 )
+ newCtx->block_align= 0;
+ }
+ else
+@@ -443,7 +447,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ }
+
+ // Hack to use the fixed AC3 codec if available
+- if ( audioCodec->id == CODEC_ID_AC3 && avcodec_find_encoder_by_name( "ac3_fixed" ) )
++ if ( audioCodec->id == AV_CODEC_ID_AC3 && avcodec_find_encoder_by_name( "ac3_fixed" ) )
+ audioCodec = avcodec_find_encoder_by_name( "ac3_fixed" );
+
+ // Allocate the audio context
+@@ -544,7 +548,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ goto cleanup;
+ }
+
+- audioFrame = avcodec_alloc_frame();
++ audioFrame = av_frame_alloc();
+
+ if ( !audioFrame )
+ {
+@@ -573,10 +577,10 @@ av_log_set_level(AV_LOG_VERBOSE);
+ goto cleanup;
+ }
+
+- if ( audioStream->codec->block_align == 1 && audioStream->codec->codec_id == CODEC_ID_MP3 )
++ if ( audioStream->codec->block_align == 1 && audioStream->codec->codec_id == AV_CODEC_ID_MP3 )
+ audioStream->codec->block_align= 0;
+
+- if ( audioStream->codec->codec_id == CODEC_ID_AC3 )
++ if ( audioStream->codec->codec_id == AV_CODEC_ID_AC3 )
+ audioStream->codec->block_align= 0;
+ }
+
+@@ -595,7 +599,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ }
+
+ // Allocate the YUV frame
+- videoFrame = avcodec_alloc_frame();
++ videoFrame = av_frame_alloc();
+
+ if ( !videoFrame )
+ {
+@@ -753,8 +757,12 @@ int FFMpegVideoEncoderPriv::encodeImage( const QImage &img, qint64 )
+ pkt.flags |= AV_PKT_FLAG_KEY;
+
+ // Rescale output packet timestamp values from codec to stream timebase
+- pkt.pts = av_rescale_q_rnd( pkt.pts, audioCodecCtx->time_base, audioStream->time_base, (AVRounding) (AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX) );
+- pkt.dts = av_rescale_q_rnd( pkt.dts, audioCodecCtx->time_base, audioStream->time_base, (AVRounding) (AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX) );
++ if ( pkt.pts != AV_NOPTS_VALUE ) {
++ pkt.pts = av_rescale_q_rnd( pkt.pts, audioCodecCtx->time_base, audioStream->time_base, AV_ROUND_NEAR_INF );
++ }
++ if ( pkt.dts != AV_NOPTS_VALUE ) {
++ pkt.dts = av_rescale_q_rnd( pkt.dts, audioCodecCtx->time_base, audioStream->time_base, AV_ROUND_NEAR_INF );
++ }
+ pkt.duration = av_rescale_q( pkt.duration, audioCodecCtx->time_base, audioStream->time_base);
+
+ // And write the file
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin@steghoefer.eu>
+Date: Sat, 10 May 2014 01:04:56 +0200
+Subject: Fix segfault: AVFrame initialization (Libav/FFmpeg)
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Martin Steghöfer <martin@steghoefer.eu>
+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 one of those differences.
+In Libav the function avcodec_get_frame_defaults cannot be called on a
+completely uninitialized object. It expects at least some pointers inside
+the struct to be initialized to NULL. Otherwise (depending on the random
+pointer value) it may perform a free() on that random pointer. In Libav the
+preferred way to initialize an AVFrame object is by calling
+avcodec_alloc_frame(), which allocates the memory, initializes it to zero
+and then calls avcodec_get_frame_defaults itself. This involves changing
+"srcaudio" from a stack object to a heap object and freeing it after use.
+---
+ src/ffmpegvideoencoder.cpp | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp
+index bdf1730..ccfdc7c 100644
+--- a/src/ffmpegvideoencoder.cpp
++++ b/src/ffmpegvideoencoder.cpp
+@@ -685,12 +685,11 @@ int FFMpegVideoEncoderPriv::encodeImage( const QImage &img, qint64 )
+ }
+
+ // Initialize the frame
+- AVFrame srcaudio;
+- avcodec_get_frame_defaults( &srcaudio );
++ AVFrame *srcaudio = av_frame_alloc();
+
+ // Decode the original audio into the srcaudio frame
+ int got_audio;
+- err = avcodec_decode_audio4( m_aplayer->aCodecCtx, &srcaudio, &got_audio, &pkt );
++ err = avcodec_decode_audio4( m_aplayer->aCodecCtx, srcaudio, &got_audio, &pkt );
+
+ if ( err < 0 )
+ {
+@@ -710,9 +709,9 @@ int FFMpegVideoEncoderPriv::encodeImage( const QImage &img, qint64 )
+ NULL,
+ 0,
+ 0,
+- srcaudio.data,
++ srcaudio->data,
+ 0,
+- srcaudio.nb_samples )) < 0 )
++ srcaudio->nb_samples )) < 0 )
+ {
+ qWarning( "Error resampling decoded audio: %d", err );
+ return -1;
+@@ -777,6 +776,8 @@ int FFMpegVideoEncoderPriv::encodeImage( const QImage &img, qint64 )
+ av_free_packet( &pkt );
+ }
+ }
++
++ av_frame_free( &srcaudio );
+ }
+ }
+
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin@steghoefer.eu>
+Date: Sat, 10 May 2014 13:19:25 +0200
+Subject: Fix FP exception: Sample aspect ratio (Libav/FFmpeg)
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Martin Steghöfer <martin@steghoefer.eu>
+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 one of those differences.
+In Libav sample aspect ratio of a AVStream object is not automatically
+initialized to the one of its codec. So this has to be done manually.
+---
+ src/ffmpegvideoencoder.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp
+index ccfdc7c..3122f2a 100644
+--- a/src/ffmpegvideoencoder.cpp
++++ b/src/ffmpegvideoencoder.cpp
+@@ -399,6 +399,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ videoStream->codec = videoCodecCtx;
+
+ // Set the video stream timebase if not set
++ videoStream->sample_aspect_ratio = videoCodecCtx->sample_aspect_ratio;
+ if ( videoStream->time_base.den == 0 )
+ videoStream->time_base = videoCodecCtx->time_base;
+
diff --git a/media-sound/karlyriceditor/karlyriceditor-1.11.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.11.ebuild
new file mode 100644
index 00000000000..358c3c9d402
--- /dev/null
+++ b/media-sound/karlyriceditor/karlyriceditor-1.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats"
+HOMEPAGE="http://www.ulduzsoft.com/linux/karaoke-lyrics-editor/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="
+ dev-libs/openssl:0
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ media-libs/libsdl
+ libav? ( media-video/libav:= )
+ !libav? ( media-video/ffmpeg:= )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-libav.patch" )
+
+src_install() {
+ dodoc Changelog
+ dobin bin/${PN}
+ doicon packages/${PN}.png
+ make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
+}