* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/, app-cdr/k3b/files/
@ 2012-05-24 9:25 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2012-05-24 9:25 UTC (permalink / raw
To: gentoo-commits
commit: e6647114018e17749674aaa8d77cf8d8fc9189ea
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 09:24:45 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Thu May 24 09:24:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e6647114
[app-cdr/k3b] Fix missing patch issue.
(Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit)
---
app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch | 22 ++++++++++++++++++++++
app-cdr/k3b/k3b-9999.ebuild | 3 +--
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch b/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch
new file mode 100644
index 0000000..174a776
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch
@@ -0,0 +1,22 @@
+Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+===================================================================
+--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
+ close();
+
+ // open the file
+- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
++ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
+ if( err < 0 ) {
+ kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
+ return false;
+@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
+ }
+
+ // dump some debugging info
+- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
++ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
+
+ return true;
+ }
diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index ceae714..6bccd1d 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -62,8 +62,7 @@ RDEPEND="${DEPEND}
DOCS+=( ChangeLog )
PATCHES=(
- "${FILESDIR}/${P}-ffmpeg.patch"
- "${FILESDIR}/${P}-libavformat54.patch"
+ "${FILESDIR}/${PN}-2.0.2-libavformat54.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/, app-cdr/k3b/files/
@ 2012-08-28 6:21 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2012-08-28 6:21 UTC (permalink / raw
To: gentoo-commits
commit: 38dd98bf006e8d4aaf6b4b8945c9e8274cbe77e2
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 28 06:21:22 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Aug 28 06:21:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=38dd98bf
[app-cdr/k3b] Remove patch, applied upstream fixes bug #433020.
(Portage version: 2.2.0_alpha123/git/Linux x86_64, unsigned Manifest commit)
---
app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch | 22 ----------------------
app-cdr/k3b/k3b-9999.ebuild | 4 ----
2 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch b/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch
deleted file mode 100644
index 174a776..0000000
--- a/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-===================================================================
---- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
- close();
-
- // open the file
-- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
-+ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
- if( err < 0 ) {
- kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
- return false;
-@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
- }
-
- // dump some debugging info
-- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
-+ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
-
- return true;
- }
diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 14dc655..9039128 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -60,10 +60,6 @@ RDEPEND="${DEPEND}
DOCS+=( ChangeLog )
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.2-libavformat54.patch"
-)
-
REQUIRED_USE="
mp3? ( encode )
sox? ( encode )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/, app-cdr/k3b/files/
@ 2015-05-23 16:13 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2015-05-23 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 06b7fc2fe7d89b940e2eecb349d6f6f6d8717a75
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun May 17 10:01:51 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 23 16:12:47 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=06b7fc2f
[app-cdr/k3b] Add libav-11 fix
Package-Manager: portage-2.2.18
app-cdr/k3b/files/k3b-2.0.3-libav-11.patch | 138 +++++++++++++++++++++++++++++
app-cdr/k3b/k3b-2.0.3-r2.ebuild | 113 +++++++++++++++++++++++
2 files changed, 251 insertions(+)
diff --git a/app-cdr/k3b/files/k3b-2.0.3-libav-11.patch b/app-cdr/k3b/files/k3b-2.0.3-libav-11.patch
new file mode 100644
index 0000000..9c5ac42
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-2.0.3-libav-11.patch
@@ -0,0 +1,138 @@
+From 52d3d64863d2fab4128f524870851f18f5cae1fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <oldium.pro@seznam.cz>
+Date: Sat, 14 Feb 2015 15:31:07 +0100
+Subject: [PATCH] Fixed compilation with newer ffmpeg/libav.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
+---
+ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 60 ++++++++++++++++++++++++-----
+ 1 file changed, 50 insertions(+), 10 deletions(-)
+
+diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+index 5451fd3..2f80fd6 100644
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -86,8 +86,12 @@ public:
+ K3b::Msf length;
+
+ // for decoding. ffmpeg requires 16-byte alignment.
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++ ::AVFrame* frame;
++#else
+ char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15];
+ char* alignedOutputBuffer;
++#endif
+ char* outputBufferPos;
+ int outputBufferSize;
+ ::AVPacket packet;
+@@ -102,14 +106,29 @@ K3bFFMpegFile::K3bFFMpegFile( const QString& filename )
+ d = new Private;
+ d->formatContext = 0;
+ d->codec = 0;
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++# if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1)
++ d->frame = avcodec_alloc_frame();
++# else
++ d->frame = av_frame_alloc();
++# endif
++#else
+ int offset = 0x10 - (reinterpret_cast<intptr_t>(&d->outputBuffer) & 0xf);
+ d->alignedOutputBuffer = &d->outputBuffer[offset];
++#endif
+ }
+
+
+ K3bFFMpegFile::~K3bFFMpegFile()
+ {
+ close();
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++# if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1)
++ av_free(d->frame);
++# else
++ av_frame_free(&d->frame);
++# endif
++#endif
+ delete d;
+ }
+
+@@ -326,26 +345,36 @@ int K3bFFMpegFile::fillOutputBuffer()
+ return 0;
+ }
+
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++ int gotFrame = 0;
++ int len = ::avcodec_decode_audio4(
++#else
+ d->outputBufferPos = d->alignedOutputBuffer;
+ d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+-
+-#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
++# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
+ int len = ::avcodec_decode_audio3(
+-#else
+-# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2
+- int len = ::avcodec_decode_audio2(
+ # else
++# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2
++ int len = ::avcodec_decode_audio2(
++# else
+ int len = ::avcodec_decode_audio(
++# endif
+ # endif
+ #endif
+
+ FFMPEG_CODEC(d->formatContext->streams[0]),
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++ d->frame,
++ &gotFrame,
++ &d->packet );
++#else
+ (short*)d->alignedOutputBuffer,
+ &d->outputBufferSize,
+-#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
++# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
+ &d->packet );
+-#else
++# else
+ d->packetData, d->packetSize );
++# endif
+ #endif
+
+ if( d->packetSize <= 0 || len < 0 )
+@@ -355,6 +384,17 @@ int K3bFFMpegFile::fillOutputBuffer()
+ return -1;
+ }
+
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++ if ( gotFrame ) {
++ d->outputBufferSize = ::av_samples_get_buffer_size(
++ NULL,
++ FFMPEG_CODEC(d->formatContext->streams[0])->channels,
++ d->frame->nb_samples,
++ FFMPEG_CODEC(d->formatContext->streams[0])->sample_fmt,
++ 1 );
++ d->outputBufferPos = reinterpret_cast<char*>( d->frame->data[0] );
++ }
++#endif
+ d->packetSize -= len;
+ d->packetData += len;
+ }
+@@ -420,9 +460,9 @@ K3bFFMpegFile* K3bFFMpegWrapper::open( const QString& filename ) const
+ // mp3 being one of them sadly. Most importantly: allow the libsndfile decoder to do
+ // its thing.
+ //
+- if( file->type() == CODEC_ID_WMAV1 ||
+- file->type() == CODEC_ID_WMAV2 ||
+- file->type() == CODEC_ID_AAC )
++ if( file->type() == AV_CODEC_ID_WMAV1 ||
++ file->type() == AV_CODEC_ID_WMAV2 ||
++ file->type() == AV_CODEC_ID_AAC )
+ #endif
+ return file;
+ }
+--
+2.0.5
+
diff --git a/app-cdr/k3b/k3b-2.0.3-r2.ebuild b/app-cdr/k3b/k3b-2.0.3-r2.ebuild
new file mode 100644
index 0000000..afaaa09
--- /dev/null
+++ b/app-cdr/k3b/k3b-2.0.3-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.3-r1.ebuild,v 1.7 2015/05/13 09:31:09 ago Exp $
+
+EAPI=5
+
+MULTIMEDIA_REQUIRED="always"
+WEBKIT_REQUIRED="always"
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+
+# Translations are not available, since this is a snapshot
+KDE_LINGUAS="ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et eu fi fr
+ga gl he hi hne hr hu is it ja kk km ko ku lt lv mai mr ms nb nds nl nn oc pa pl
+pt pt_BR ro ru se sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk
+zh_CN zh_TW"
+
+SRC_URI="mirror://kde/stable/${PN}/${P}a.tar.xz"
+DOCS=( FAQ PERMISSIONS README )
+
+inherit kde4-base
+
+DESCRIPTION="The CD/DVD Kreator for KDE"
+HOMEPAGE="http://www.k3b.org/"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
+
+CDEPEND="
+ || ( kde-apps/libkcddb:4 $(add_kdebase_dep libkcddb) )
+ media-libs/libsamplerate
+ dvd? ( media-libs/libdvdread )
+ ffmpeg? (
+ libav? ( media-video/libav:= )
+ !libav? ( media-video/ffmpeg:0= )
+ )
+ flac? ( >=media-libs/flac-1.2[cxx] )
+ mp3? ( media-sound/lame )
+ mad? ( media-libs/libmad )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ sndfile? ( media-libs/libsndfile )
+ taglib? ( >=media-libs/taglib-1.5 )
+ vorbis? ( media-libs/libvorbis )
+"
+DEPEND="${CDEPEND}
+ sys-devel/gettext
+"
+RDEPEND="${CDEPEND}
+ $(add_kdebase_dep kdelibs 'udev,udisks(+)')
+ app-cdr/cdrdao
+ media-sound/cdparanoia
+ virtual/cdrtools
+ dvd? (
+ >=app-cdr/dvd+rw-tools-7
+ encode? ( media-video/transcode[dvd] )
+ )
+ emovix? ( media-video/emovix )
+ sox? ( media-sound/sox )
+ vcd? ( media-video/vcdimager )
+"
+
+DOCS+=( ChangeLog )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.0.3-libav-11.patch" #509332
+)
+
+REQUIRED_USE="
+ mp3? ( encode )
+ sox? ( encode )
+"
+
+src_configure() {
+ mycmakeargs=(
+ -DK3B_BUILD_API_DOCS=OFF
+ -DK3B_BUILD_K3BSETUP=OFF
+ -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
+ -DK3B_ENABLE_HAL_SUPPORT=OFF
+ -DK3B_ENABLE_MUSICBRAINZ=OFF
+ $(cmake-utils_use debug K3B_DEBUG)
+ $(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
+ $(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
+ $(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
+ $(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
+ $(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN)
+ $(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
+ $(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
+ $(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
+ $(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
+ $(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
+ $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
+ $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
+ )
+ kde4-base_src_configure
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ echo
+ elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
+ elog "If you get warnings on start-up, uncheck the \"Check system"
+ elog "configuration\" option in the \"Misc\" settings window."
+ echo
+
+ local group=cdrom
+ use kernel_linux || group=operator
+ elog "Make sure you have proper read/write permissions on the cdrom device(s)."
+ elog "Usually, it is sufficient to be in the ${group} group."
+ echo
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/, app-cdr/k3b/files/
@ 2015-06-19 14:47 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2015-06-19 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 7c2d0fb34fb61b69cbc60d1d038bb440e2cece22
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 14:35:46 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 14:35:46 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c2d0fb3
[app-cdr/k3b] Rename patch
Package-Manager: portage-2.2.20
.../files/{k3b-5.9999-tests-optional.patch => k3b-tests-optional.patch} | 0
app-cdr/k3b/k3b-5.9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-cdr/k3b/files/k3b-5.9999-tests-optional.patch b/app-cdr/k3b/files/k3b-tests-optional.patch
similarity index 100%
rename from app-cdr/k3b/files/k3b-5.9999-tests-optional.patch
rename to app-cdr/k3b/files/k3b-tests-optional.patch
diff --git a/app-cdr/k3b/k3b-5.9999.ebuild b/app-cdr/k3b/k3b-5.9999.ebuild
index a0ac01c..08a5e16 100644
--- a/app-cdr/k3b/k3b-5.9999.ebuild
+++ b/app-cdr/k3b/k3b-5.9999.ebuild
@@ -87,7 +87,7 @@ REQUIRED_USE="
src_prepare() {
# we have to patch first, because some doc sed magic in kde5.eclass will make the patch invalid
- epatch "${FILESDIR}/${PN}-5.9999-tests-optional.patch"
+ epatch "${FILESDIR}/${PN}-tests-optional.patch"
kde5_src_prepare
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-19 14:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-19 14:47 [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/, app-cdr/k3b/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2015-05-23 16:13 Michael Palimaka
2012-08-28 6:21 Johannes Huber
2012-05-24 9:25 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox