| 1 |
commit: 7ccae71f5079ffb1d8e288d63f7e246002f97ac8 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 30 13:46:37 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 30 13:46:37 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ccae71f |
| 7 |
|
| 8 |
[app-cdr/k3b] Remove, fixed in tree |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20 |
| 11 |
|
| 12 |
app-cdr/k3b/files/k3b-2.0.3-libav-11.patch | 138 ----------------------------- |
| 13 |
app-cdr/k3b/k3b-2.0.3-r2.ebuild | 113 ----------------------- |
| 14 |
2 files changed, 251 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index 9c5ac42..0000000 |
| 19 |
--- a/app-cdr/k3b/files/k3b-2.0.3-libav-11.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,138 +0,0 @@ |
| 22 |
-From 52d3d64863d2fab4128f524870851f18f5cae1fc Mon Sep 17 00:00:00 2001 |
| 23 |
-From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <oldium.pro@××××××.cz> |
| 24 |
-Date: Sat, 14 Feb 2015 15:31:07 +0100 |
| 25 |
-Subject: [PATCH] Fixed compilation with newer ffmpeg/libav. |
| 26 |
-MIME-Version: 1.0 |
| 27 |
-Content-Type: text/plain; charset=UTF-8 |
| 28 |
-Content-Transfer-Encoding: 8bit |
| 29 |
- |
| 30 |
-Signed-off-by: Oldřich Jedlička <oldium.pro@××××××.cz> |
| 31 |
---- |
| 32 |
- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 60 ++++++++++++++++++++++++----- |
| 33 |
- 1 file changed, 50 insertions(+), 10 deletions(-) |
| 34 |
- |
| 35 |
-diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp |
| 36 |
-index 5451fd3..2f80fd6 100644 |
| 37 |
---- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp |
| 38 |
-+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp |
| 39 |
-@@ -86,8 +86,12 @@ public: |
| 40 |
- K3b::Msf length; |
| 41 |
- |
| 42 |
- // for decoding. ffmpeg requires 16-byte alignment. |
| 43 |
-+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4 |
| 44 |
-+ ::AVFrame* frame; |
| 45 |
-+#else |
| 46 |
- char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15]; |
| 47 |
- char* alignedOutputBuffer; |
| 48 |
-+#endif |
| 49 |
- char* outputBufferPos; |
| 50 |
- int outputBufferSize; |
| 51 |
- ::AVPacket packet; |
| 52 |
-@@ -102,14 +106,29 @@ K3bFFMpegFile::K3bFFMpegFile( const QString& filename ) |
| 53 |
- d = new Private; |
| 54 |
- d->formatContext = 0; |
| 55 |
- d->codec = 0; |
| 56 |
-+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4 |
| 57 |
-+# if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1) |
| 58 |
-+ d->frame = avcodec_alloc_frame(); |
| 59 |
-+# else |
| 60 |
-+ d->frame = av_frame_alloc(); |
| 61 |
-+# endif |
| 62 |
-+#else |
| 63 |
- int offset = 0x10 - (reinterpret_cast<intptr_t>(&d->outputBuffer) & 0xf); |
| 64 |
- d->alignedOutputBuffer = &d->outputBuffer[offset]; |
| 65 |
-+#endif |
| 66 |
- } |
| 67 |
- |
| 68 |
- |
| 69 |
- K3bFFMpegFile::~K3bFFMpegFile() |
| 70 |
- { |
| 71 |
- close(); |
| 72 |
-+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4 |
| 73 |
-+# if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1) |
| 74 |
-+ av_free(d->frame); |
| 75 |
-+# else |
| 76 |
-+ av_frame_free(&d->frame); |
| 77 |
-+# endif |
| 78 |
-+#endif |
| 79 |
- delete d; |
| 80 |
- } |
| 81 |
- |
| 82 |
-@@ -326,26 +345,36 @@ int K3bFFMpegFile::fillOutputBuffer() |
| 83 |
- return 0; |
| 84 |
- } |
| 85 |
- |
| 86 |
-+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4 |
| 87 |
-+ int gotFrame = 0; |
| 88 |
-+ int len = ::avcodec_decode_audio4( |
| 89 |
-+#else |
| 90 |
- d->outputBufferPos = d->alignedOutputBuffer; |
| 91 |
- d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE; |
| 92 |
-- |
| 93 |
--#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 |
| 94 |
-+# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 |
| 95 |
- int len = ::avcodec_decode_audio3( |
| 96 |
--#else |
| 97 |
--# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2 |
| 98 |
-- int len = ::avcodec_decode_audio2( |
| 99 |
- # else |
| 100 |
-+# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2 |
| 101 |
-+ int len = ::avcodec_decode_audio2( |
| 102 |
-+# else |
| 103 |
- int len = ::avcodec_decode_audio( |
| 104 |
-+# endif |
| 105 |
- # endif |
| 106 |
- #endif |
| 107 |
- |
| 108 |
- FFMPEG_CODEC(d->formatContext->streams[0]), |
| 109 |
-+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4 |
| 110 |
-+ d->frame, |
| 111 |
-+ &gotFrame, |
| 112 |
-+ &d->packet ); |
| 113 |
-+#else |
| 114 |
- (short*)d->alignedOutputBuffer, |
| 115 |
- &d->outputBufferSize, |
| 116 |
--#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 |
| 117 |
-+# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 |
| 118 |
- &d->packet ); |
| 119 |
--#else |
| 120 |
-+# else |
| 121 |
- d->packetData, d->packetSize ); |
| 122 |
-+# endif |
| 123 |
- #endif |
| 124 |
- |
| 125 |
- if( d->packetSize <= 0 || len < 0 ) |
| 126 |
-@@ -355,6 +384,17 @@ int K3bFFMpegFile::fillOutputBuffer() |
| 127 |
- return -1; |
| 128 |
- } |
| 129 |
- |
| 130 |
-+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4 |
| 131 |
-+ if ( gotFrame ) { |
| 132 |
-+ d->outputBufferSize = ::av_samples_get_buffer_size( |
| 133 |
-+ NULL, |
| 134 |
-+ FFMPEG_CODEC(d->formatContext->streams[0])->channels, |
| 135 |
-+ d->frame->nb_samples, |
| 136 |
-+ FFMPEG_CODEC(d->formatContext->streams[0])->sample_fmt, |
| 137 |
-+ 1 ); |
| 138 |
-+ d->outputBufferPos = reinterpret_cast<char*>( d->frame->data[0] ); |
| 139 |
-+ } |
| 140 |
-+#endif |
| 141 |
- d->packetSize -= len; |
| 142 |
- d->packetData += len; |
| 143 |
- } |
| 144 |
-@@ -420,9 +460,9 @@ K3bFFMpegFile* K3bFFMpegWrapper::open( const QString& filename ) const |
| 145 |
- // mp3 being one of them sadly. Most importantly: allow the libsndfile decoder to do |
| 146 |
- // its thing. |
| 147 |
- // |
| 148 |
-- if( file->type() == CODEC_ID_WMAV1 || |
| 149 |
-- file->type() == CODEC_ID_WMAV2 || |
| 150 |
-- file->type() == CODEC_ID_AAC ) |
| 151 |
-+ if( file->type() == AV_CODEC_ID_WMAV1 || |
| 152 |
-+ file->type() == AV_CODEC_ID_WMAV2 || |
| 153 |
-+ file->type() == AV_CODEC_ID_AAC ) |
| 154 |
- #endif |
| 155 |
- return file; |
| 156 |
- } |
| 157 |
--- |
| 158 |
-2.0.5 |
| 159 |
- |
| 160 |
|
| 161 |
diff --git a/app-cdr/k3b/k3b-2.0.3-r2.ebuild b/app-cdr/k3b/k3b-2.0.3-r2.ebuild |
| 162 |
deleted file mode 100644 |
| 163 |
index afaaa09..0000000 |
| 164 |
--- a/app-cdr/k3b/k3b-2.0.3-r2.ebuild |
| 165 |
+++ /dev/null |
| 166 |
@@ -1,113 +0,0 @@ |
| 167 |
-# Copyright 1999-2015 Gentoo Foundation |
| 168 |
-# Distributed under the terms of the GNU General Public License v2 |
| 169 |
-# $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 $ |
| 170 |
- |
| 171 |
-EAPI=5 |
| 172 |
- |
| 173 |
-MULTIMEDIA_REQUIRED="always" |
| 174 |
-WEBKIT_REQUIRED="always" |
| 175 |
-KDE_HANDBOOK="optional" |
| 176 |
-KDE_SCM="git" |
| 177 |
- |
| 178 |
-# Translations are not available, since this is a snapshot |
| 179 |
-KDE_LINGUAS="ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et eu fi fr |
| 180 |
-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 |
| 181 |
-pt pt_BR ro ru se sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk |
| 182 |
-zh_CN zh_TW" |
| 183 |
- |
| 184 |
-SRC_URI="mirror://kde/stable/${PN}/${P}a.tar.xz" |
| 185 |
-DOCS=( FAQ PERMISSIONS README ) |
| 186 |
- |
| 187 |
-inherit kde4-base |
| 188 |
- |
| 189 |
-DESCRIPTION="The CD/DVD Kreator for KDE" |
| 190 |
-HOMEPAGE="http://www.k3b.org/" |
| 191 |
- |
| 192 |
-LICENSE="GPL-2 FDL-1.2" |
| 193 |
-SLOT="4" |
| 194 |
-KEYWORDS="~amd64 ~ppc ~x86" |
| 195 |
-IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis" |
| 196 |
- |
| 197 |
-CDEPEND=" |
| 198 |
- || ( kde-apps/libkcddb:4 $(add_kdebase_dep libkcddb) ) |
| 199 |
- media-libs/libsamplerate |
| 200 |
- dvd? ( media-libs/libdvdread ) |
| 201 |
- ffmpeg? ( |
| 202 |
- libav? ( media-video/libav:= ) |
| 203 |
- !libav? ( media-video/ffmpeg:0= ) |
| 204 |
- ) |
| 205 |
- flac? ( >=media-libs/flac-1.2[cxx] ) |
| 206 |
- mp3? ( media-sound/lame ) |
| 207 |
- mad? ( media-libs/libmad ) |
| 208 |
- musepack? ( >=media-sound/musepack-tools-444 ) |
| 209 |
- sndfile? ( media-libs/libsndfile ) |
| 210 |
- taglib? ( >=media-libs/taglib-1.5 ) |
| 211 |
- vorbis? ( media-libs/libvorbis ) |
| 212 |
-" |
| 213 |
-DEPEND="${CDEPEND} |
| 214 |
- sys-devel/gettext |
| 215 |
-" |
| 216 |
-RDEPEND="${CDEPEND} |
| 217 |
- $(add_kdebase_dep kdelibs 'udev,udisks(+)') |
| 218 |
- app-cdr/cdrdao |
| 219 |
- media-sound/cdparanoia |
| 220 |
- virtual/cdrtools |
| 221 |
- dvd? ( |
| 222 |
- >=app-cdr/dvd+rw-tools-7 |
| 223 |
- encode? ( media-video/transcode[dvd] ) |
| 224 |
- ) |
| 225 |
- emovix? ( media-video/emovix ) |
| 226 |
- sox? ( media-sound/sox ) |
| 227 |
- vcd? ( media-video/vcdimager ) |
| 228 |
-" |
| 229 |
- |
| 230 |
-DOCS+=( ChangeLog ) |
| 231 |
- |
| 232 |
-PATCHES=( |
| 233 |
- "${FILESDIR}/${PN}-2.0.3-libav-11.patch" #509332 |
| 234 |
-) |
| 235 |
- |
| 236 |
-REQUIRED_USE=" |
| 237 |
- mp3? ( encode ) |
| 238 |
- sox? ( encode ) |
| 239 |
-" |
| 240 |
- |
| 241 |
-src_configure() { |
| 242 |
- mycmakeargs=( |
| 243 |
- -DK3B_BUILD_API_DOCS=OFF |
| 244 |
- -DK3B_BUILD_K3BSETUP=OFF |
| 245 |
- -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON |
| 246 |
- -DK3B_ENABLE_HAL_SUPPORT=OFF |
| 247 |
- -DK3B_ENABLE_MUSICBRAINZ=OFF |
| 248 |
- $(cmake-utils_use debug K3B_DEBUG) |
| 249 |
- $(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING) |
| 250 |
- $(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN) |
| 251 |
- $(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN) |
| 252 |
- $(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN) |
| 253 |
- $(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN) |
| 254 |
- $(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN) |
| 255 |
- $(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN) |
| 256 |
- $(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN) |
| 257 |
- $(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN) |
| 258 |
- $(cmake-utils_use taglib K3B_ENABLE_TAGLIB) |
| 259 |
- $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN) |
| 260 |
- $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN) |
| 261 |
- ) |
| 262 |
- kde4-base_src_configure |
| 263 |
-} |
| 264 |
- |
| 265 |
-pkg_postinst() { |
| 266 |
- kde4-base_pkg_postinst |
| 267 |
- |
| 268 |
- echo |
| 269 |
- elog "We don't install k3bsetup anymore because Gentoo doesn't need it." |
| 270 |
- elog "If you get warnings on start-up, uncheck the \"Check system" |
| 271 |
- elog "configuration\" option in the \"Misc\" settings window." |
| 272 |
- echo |
| 273 |
- |
| 274 |
- local group=cdrom |
| 275 |
- use kernel_linux || group=operator |
| 276 |
- elog "Make sure you have proper read/write permissions on the cdrom device(s)." |
| 277 |
- elog "Usually, it is sufficient to be in the ${group} group." |
| 278 |
- echo |
| 279 |
-} |
Archives