summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen2015-08-16 14:21:24 +0200
committereroen2015-08-16 14:57:46 +0200
commit8bcfb81e28ebb0523369c71b33e92c1ba355a653 (patch)
tree32d1c7c1b812621c742afb17b6e707b5a68fa92c
parente2c7c2c3479b2e67d398c0c2e6b0b56e796d4b50 (diff)
downloaderoen-overlay-8bcfb81e28ebb0523369c71b33e92c1ba355a653.tar.gz
eroen-overlay-8bcfb81e28ebb0523369c71b33e92c1ba355a653.tar.bz2
eroen-overlay-8bcfb81e28ebb0523369c71b33e92c1ba355a653.tar.xz
k3b - drop old
EAPI=4 no longer supported by kde4-base.eclass https://bugs.gentoo.org/show_bug.cgi?id=557664
-rw-r--r--app-cdr/k3b/Manifest1
-rw-r--r--app-cdr/k3b/files/k3b-2.0.2-ffmpeg.patch96
-rw-r--r--app-cdr/k3b/files/k3b-2.0.2-libav9.patch22
-rw-r--r--app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch22
-rw-r--r--app-cdr/k3b/k3b-2.0.2-r4.ebuild114
5 files changed, 0 insertions, 255 deletions
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 51c49fac..87c9f70b 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,2 +1 @@
-DIST k3b-2.0.2.tar.bz2 12833321 SHA256 af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd SHA512 e0a3d357decf7120a67d391d2311aaa5992f42cddbd20c5dc67f3d0e2ce15d6c53c0978cf2de6c09b96d57d273bca915fbbc0ca28547d708e2db20c795b86aa9 WHIRLPOOL 0dc975344962c98c20f9a03e3fb9225499668bed206ed61ea58b17ebe4594c2f71e237cdfc94e84a85e08b585cad6d1eee1415b129e998da3664d0544218a171
DIST k3b-2.0.2_p20140225.tar.xz 6297620 SHA256 562ea4335babd018e46d1d2bcc7567320ca8a888fb03562d4c14222dc2b68c33 SHA512 8d3450b4df42df9eef619b8ba05258e9e98d1197be4472f6b19d467c8c1d91436aacbf59d36c773d6576f3b179601dccff4cae695a73fada3504410c7f26af35 WHIRLPOOL e5d5bd692423027f40c7e6ff0ef7d27a518e95402f09988e7b8417bcb2dda9b9cdb187c033c006f27c3dac9fe34e3ba0e5d85e26c4ddd2fcb82a1065f4b58ad7
diff --git a/app-cdr/k3b/files/k3b-2.0.2-ffmpeg.patch b/app-cdr/k3b/files/k3b-2.0.2-ffmpeg.patch
deleted file mode 100644
index 2878b1ed..00000000
--- a/app-cdr/k3b/files/k3b-2.0.2-ffmpeg.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-commit 61ca30beb978f68e72257408777c6433f33129bd
-Author: Michal Malek <michalm@jabster.pl>
-Date: Sun Aug 28 20:18:53 2011 +0200
-
- Fixed compilation with new FFMPEG
-
- BUG: 274817
- FIXED-IN: 2.0.3
-
-diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-index 0ad59fc..0c5f366 100644
---- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
- #else
- ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec;
- #endif
-- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
-+ if( codecContext->codec_type !=
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+ AVMEDIA_TYPE_AUDIO)
-+#else
-+ CODEC_TYPE_AUDIO)
-+#endif
-+ {
- kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
- return false;
- }
-@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
- QString K3bFFMpegFile::title() const
- {
- // FIXME: is this UTF8 or something??
-- if( d->formatContext->title[0] != '\0' )
-- return QString::fromLocal8Bit( d->formatContext->title );
-+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
-+ if( ade == NULL )
-+ return QString();
-+ if( ade->value != '\0' )
-+ return QString::fromLocal8Bit( ade->value );
- else
- return QString();
- }
-@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const
- QString K3bFFMpegFile::author() const
- {
- // FIXME: is this UTF8 or something??
-- if( d->formatContext->author[0] != '\0' )
-- return QString::fromLocal8Bit( d->formatContext->author );
-+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
-+ if( ade == NULL )
-+ return QString();
-+ if( ade->value != '\0' )
-+ return QString::fromLocal8Bit( ade->value );
- else
- return QString();
- }
-@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const
- QString K3bFFMpegFile::comment() const
- {
- // FIXME: is this UTF8 or something??
-- if( d->formatContext->comment[0] != '\0' )
-- return QString::fromLocal8Bit( d->formatContext->comment );
-+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
-+ if( ade == NULL )
-+ return QString();
-+ if( ade->value != '\0' )
-+ return QString::fromLocal8Bit( ade->value );
- else
- return QString();
- }
-@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer()
- #if LIBAVCODEC_VERSION_MAJOR < 52
- int len = ::avcodec_decode_audio(
- #else
-+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+ int len = ::avcodec_decode_audio3(
-+ #else
- int len = ::avcodec_decode_audio2(
-+ #endif
- #endif
-+
- #ifdef FFMPEG_BUILD_PRE_4629
- &d->formatContext->streams[0]->codec,
- #else
-@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer()
- #endif
- (short*)d->alignedOutputBuffer,
- &d->outputBufferSize,
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+ &d->packet );
-+#else
- d->packetData, d->packetSize );
-+#endif
-
- if( d->packetSize <= 0 || len < 0 )
- ::av_free_packet( &d->packet );
diff --git a/app-cdr/k3b/files/k3b-2.0.2-libav9.patch b/app-cdr/k3b/files/k3b-2.0.2-libav9.patch
deleted file mode 100644
index 42ec6632..00000000
--- a/app-cdr/k3b/files/k3b-2.0.2-libav9.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 2013-04-22 17:46:13.523959500 +0200
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 18:40:49.890007513 +0200
-@@ -95,7 +95,7 @@ bool K3bFFMpegFile::open()
- }
-
- // analyze the streams
-- ::av_find_stream_info( d->formatContext );
-+ ::avformat_find_stream_info( d->formatContext, 0 );
-
- // we only handle files containing one audio stream
- if( d->formatContext->nb_streams != 1 ) {
-@@ -129,7 +129,7 @@ bool K3bFFMpegFile::open()
-
- // open the codec on our context
- kDebug() << "(K3bFFMpegFile) found codec for " << m_filename;
-- if( ::avcodec_open( codecContext, d->codec ) < 0 ) {
-+ if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) {
- kDebug() << "(K3bFFMpegDecoderFactory) could not open codec.";
- return false;
- }
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 174a776b..00000000
--- 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-2.0.2-r4.ebuild b/app-cdr/k3b/k3b-2.0.2-r4.ebuild
deleted file mode 100644
index 8b8c8419..00000000
--- a/app-cdr/k3b/k3b-2.0.2-r4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r4.ebuild,v 1.7 2013/08/06 21:29:26 aballier Exp $
-
-EAPI=4
-
-MULTIMEDIA_REQUIRED="always"
-WEBKIT_REQUIRED="always"
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-
-# Translations are only in the tarballs, not in the git repo
-if [[ ${PV} != *9999* ]]; then
- KDE_LINGUAS="ast be bg 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 km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
- se sk sl sv th tr uk zh_CN zh_TW"
-
- SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
- DOCS=( FAQ PERMISSIONS README )
- S=${WORKDIR}/${P/_*}
-else
- DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
-fi
-
-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 mad mp3 musepack sndfile sox taglib vcd vorbis"
-
-DEPEND="
- $(add_kdebase_dep libkcddb)
- media-libs/libsamplerate
- dvd? ( media-libs/libdvdread )
- ffmpeg? ( virtual/ffmpeg )
- 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 )
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep kdelibs 'udev')
- 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}/${P}-ffmpeg.patch"
- "${FILESDIR}/${P}-libavformat54.patch"
- "${FILESDIR}/${P}-libav9.patch"
- "${FILESDIR}/${P}-ffmpeg2.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
-}