Revision bump adds patch to fix build with libav-11, bug #509332. Thanks to Oldrich Jedlicka <oldium.pro@seznam.cz>.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 276 insertions, 17 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 76b2abee1492..ee53a485d5a7 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.293 2015/05/13 13:09:38 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.294 2015/05/30 13:40:46 johu Exp $
+
+*k3b-2.0.3-r2 (30 May 2015)
+
+  30 May 2015; Johannes Huber <johu@gentoo.org> +files/k3b-2.0.3-libav-11.patch,
+  +k3b-2.0.3-r2.ebuild:
+  Revision bump adds patch to fix build with libav-11, bug #509332. Thanks to
+  Oldrich Jedlicka <oldium.pro@seznam.cz>.
 
   13 May 2015; Michael Palimaka <kensington@gentoo.org>
   -files/k3b-2.0.2-ffmpeg.patch, -files/k3b-2.0.2-ffmpeg2.patch,
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index a2b3520fc9f6..99037d726d5f 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -2,25 +2,26 @@
 Hash: SHA256
 
 AUX k3b-2.0.3-libav-10.patch 608 SHA256 0123758e6694cef740ea0320c7ab6e7b335c32f8a16185ca7f3107cd318a5020 SHA512 22601ff0634516a68fb17723d16dadb438faf792b18a28ab5290db6796cfddd64777e504c39805e1949e31114e2604e460a7aabfc771b2ab97c188850e2b717c WHIRLPOOL aa1d7d791edf7e205a4c94279f821b043b1ebcf3cc7172a262c606d2a5a5acaa06997265eba38a947f2ae59332838e21463c710b877c123366b8949833d7dd7b
+AUX k3b-2.0.3-libav-11.patch 4270 SHA256 45f86ed4b058015d1153141a13f4d3be53fcc253a54ebf2fbdc06a25c630560f SHA512 d21bfab101f9a69aef57259fb39434859a5e935584bba15f83767f763c58be51285812e5328159a607a1e1b26f3e8945d85874ca26cd68b86d8859c10d88bbb6 WHIRLPOOL 1bbfbe65c90a5fa1df0da98d361f3df2c204c1fd22935e40ec7bb6a70e3acb32542285d09b7a291d0d66196c674eb0d7882138eec7c280746a65c6e427137995
 DIST k3b-2.0.3a.tar.xz 9864468 SHA256 2d0bb2746802c1d3ad7ddd10e29234cf2053074f376feb200306a5570c39c081 SHA512 008d69f3d60dfcd39c787c8fb0b50cdf7b29f1cf551c2c0aa0b6e995ec9d67b26edcb0670d5cd428afcc4e2a60c9e6170a9316b90978dfcc3693d27db98e7472 WHIRLPOOL 5cc63f7355ead8585295c6be8909a07fb0f34df77c8feff14c42daffc52679e27fbb28f1b1912c1bdf22e9c79b4369b2af6f3f8592f25af0f401a59e2b3a2c50
 EBUILD k3b-2.0.3-r1.ebuild 3292 SHA256 6c493966b82c4cc8e75241140a122f8de78b0ed2cad5fcdf2e4845b07d3909bd SHA512 f773c2f2bfb3398e982d434af9fa1bbbca49d5ef13f1abc396394447fde42b11bd934f485edd162acf2c35632bd83d692b7738ee486a576e6dd8b6d8de0ae5a9 WHIRLPOOL 646c9eda844faff35fd8c08be06612e1b6dc62cfb7efbe35d15a3bd0bb5d2a519270a232981bb34a8c1d2b256445b169d9fd2d3aef295f7826cfeba1e004fa4b
-MISC ChangeLog 42741 SHA256 a9af13955383a0002076bf473113c0c6ad259c5ad035e3be519443a1fb67e2e5 SHA512 021a8f59062c5949aa5480c3c69ebce25db629dd864cb40ed20c4bad4ca5e88b459d2ae39d8efe32ea15ae54561cac57e58e1aa3a8c2c89671d9a9f527167a55 WHIRLPOOL c6986744feda2cdc463f391df4b405ef31abfdfe259217ad42cfe811b979d905f0a2a9a9a147f889d2be7e9010bde46080abb809e4a1cdd1ffe5bd4ab26027c6
+EBUILD k3b-2.0.3-r2.ebuild 3287 SHA256 b4cada762e853d1edba676d4e5ae456fbc4b3efd14c21223b660e48ae65be0d5 SHA512 9877c345611eedca7aaeb5bc0043683d8e6e337c728e7e0b8f69338abc6bf0be896d44ab9c9641ea61b817cb35b40963cffb16f946e2cccc1ce3273e3c3d70bb WHIRLPOOL a402548603d48a07b31e2a04f47cbd51155f9f4c08bd21c8bb9d0569858230e3936718d1a3ed44f6175a45b6edcce804727def7f4e8d2b40d01d75b35f44eae7
+MISC ChangeLog 42991 SHA256 1e403eb046733b6bcb695545084b2c712f1713dd46561c60bacc65a5cfcea3d7 SHA512 2043855c679773fa27ad8479aefc79cad15b42606d29cc25679f753adf678eceec47eb4a2ce7dd48829098f78fd58df27a4ed3181ef3d261d5d9326f31c228fc WHIRLPOOL 2bf453313892ea9801aa005060bf8208f4d74e5c40ac5e4f25c3f0bc58558fcf1751311d5d509e259d1a36a0d134be9140eb44404d9f01a55bf48e74901b12f3
 MISC metadata.xml 270 SHA256 626a45824e1218e7191dc6155c7d0c4aff38ab026b33a62882bb8c6cddffcbb2 SHA512 2b3c0ef93291f5171a0ca7d307be7ebbabb52d10cee0d977fe72242dae3cef0a3071bbc3fb5284913e010ea044ecf75f88303ecca600747ef23bfaa6e1ccbb19 WHIRLPOOL 89b94a087e37cf86b8c84cc2c02fde6e53f8dea9bb24e7b4fea87f71d8094759a140c0a8428a265ef429dcd63f396c270c65789387c34e21e6f7a37b02669cd9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJVU00URRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7KEwD/93/VrrtatCIuzm6IKFqpVluHLE8fTz4CFe1QDCZq/5Y7aXMs8N4uMpSVOB
-drYByA5ZA8iQUs7Z1pIISc/xLlm7I8cnCCTvvkw3EqCc4AYozrvQojlNG0v4xZhF
-W4/Gyko57Ju33ziU+RTCr0nEuSPziRG+uI5Tho5vDIH3G2V6CKZrkQ0khjsx+dBw
-cNdMxuxEP4TFNmFCW6kUePazOczkq9AgYoE96zplv4330cDLzps2km4J8M0+e15I
-ZElImm69ca012qqNMAiZgfqMDDYV0Qj5w54XJUuu7xnSEP9ts0BsC6JkxNQevSvj
-85kCPVBoJ4QYaNeE+NAvDooXjcM8I5Adp3Q3u2El6FKo7Tm+HFOlZFahdJajXxcT
-7mHSx/21aYpNxCwhf1hfSM6F7jhom0CDWUQmZp0UXM/s9J9RN8KQdM1fSf8T066Q
-54x1r6vaNlF8QjOIf6K5XguQdqMQiVufFlT4I9Jd61i8alGHJanYWFXCf756D0f0
-6zPnjxlByOrkstczFFiF27tPekJE1Br2djkmJpxK07UljCDXB33SsRZINC1OKcDE
-J7NmVDcihTX3Lg3v7xKJxU+/juGOrPc9ecXP2z/lUSrRMzzm+kddieGEVvM/Jj7p
-hzR1o/SyEwgtCIeL9oKGstnVbyzuYsthwaT3OgxxrB0TUjCtxw==
-=j5uX
+iQIcBAEBCAAGBQJVab3iAAoJEGVpnaTzz9K9GAgQAJCMhTi76GazDC8RzJE1gw/1
+ygKRVt3nL+Iep/hvZ924wrqm3SCKUQDe/DoonabH/UUFbpuUUm2JlW02GFQE+rOg
+QdReEPu0zPKy/eL0skeC+ClmGtHd55eKyJ2IrkJEWU4Vv3OynXies/K1Ufurn+4f
+zN2c2dkrbgfKWH0XfbhzDRco/LZ3kvuajWz0AarGQgSHc5rM1R3jamfkxcngmDyt
+UTv7kXq31F6vYeVR7DmCgPTwVGKhJw2noeL7WNQf+sr4bnt1Nk0q69NrOk5Nm3qq
+ICmSbtNlkLuAlxF7sl4wB/gIS/FpawUmDZTbP0bBNXtNIK8nDT+hDjnQ3udKNxrk
+f85//gTaA4iauyIjSeq5K6mqVZAgmyKXutUW/dthlks1yBmYIUQ9vvOmn/ktE4Pi
+4SYPs+YzpFZmf6oQGnf1tnYXcbvE+AjDYjHen1tNbvsa3LMY/otBLiNdZJ/ViB5k
+QqJ9MLIDh2EKvuvrgVx1o2EpKYXK4q1AzsPmTJY2rkqa5DJ/wZmiIptruOwoy+5h
+UwVTdm9CWDaxn4IJcCRihtF6y4YMFuFEwIPrECi4gZ5Hux7FASIxaVB4dTqJ2vRo
+B5AZNaPHa2eE9G35fnBe4k0Maf5VG7ZO+6Wmg708F5Rpvj75hzKjTaO7e8HWpS7C
+weqXZbV4doHjEQjluil6
+=TuhL
 -----END PGP SIGNATURE-----
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 000000000000..9c5ac4205f79
--- /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 000000000000..770e1c792a39
--- /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-r2.ebuild,v 1.1 2015/05/30 13:40:46 johu 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"
+)
+
+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
+}