Date: Saturday, November 12, 2011 @ 12:15:19 Author: ibiru Revision: 142625
db-move: moved k3b from [testing] to [extra] (i686) Added: k3b/repos/extra-i686/PKGBUILD (from rev 142606, k3b/repos/testing-i686/PKGBUILD) k3b/repos/extra-i686/k3b-2.0.2-ffmpeg.patch (from rev 142606, k3b/repos/testing-i686/k3b-2.0.2-ffmpeg.patch) k3b/repos/extra-i686/k3b.install (from rev 142606, k3b/repos/testing-i686/k3b.install) Deleted: k3b/repos/extra-i686/PKGBUILD k3b/repos/extra-i686/fix-crash-with-qt-4.7.0.patch k3b/repos/extra-i686/k3b.install k3b/repos/testing-i686/ -------------------------------+ PKGBUILD | 79 ++++++++++++++++---------------- fix-crash-with-qt-4.7.0.patch | 37 --------------- k3b-2.0.2-ffmpeg.patch | 96 ++++++++++++++++++++++++++++++++++++++++ k3b.install | 25 +++++----- 4 files changed, 149 insertions(+), 88 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-11-12 17:15:18 UTC (rev 142624) +++ extra-i686/PKGBUILD 2011-11-12 17:15:19 UTC (rev 142625) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -# Contributor: jlvsimoes -# Contributor: damir <da...@archlinux.org> - -pkgname=k3b -pkgver=2.0.2 -pkgrel=1 -depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad' - 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' - 'shared-mime-info' 'libxft') -makedepends=('cmake' 'pkgconfig' 'automoc4' ) -pkgdesc="Feature-rich and easy to handle CD burning application" -url="http://k3b.sourceforge.net/" -arch=("i686" "x86_64") -license=('GPL') -install="${pkgname}.install" -optdepends=('dvd+rw-tools: for dvd burning support' - 'vcdimager: for vcd burning support' - 'transcode: for advanced mpeg conversion support' - 'emovix: for bootable multimedia cd/dvd support') -options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} -md5sums=('c86113af31a2032e57fd2f302b5f637a') Copied: k3b/repos/extra-i686/PKGBUILD (from rev 142606, k3b/repos/testing-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-11-12 17:15:19 UTC (rev 142625) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Eric BĂ©langer <e...@archlinux.org> +# Contributor: damir <da...@archlinux.org> + +pkgname=k3b +pkgver=2.0.2 +pkgrel=4 +pkgdesc="Feature-rich and easy to handle CD burning application" +arch=('i686' 'x86_64') +url="http://k3b.org/" +license=('GPL') +depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' + 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' 'libxft') +makedepends=('cmake' 'automoc4' 'docbook-xml') +optdepends=('dvd+rw-tools: for dvd burning support' + 'vcdimager: for vcd burning support' + 'transcode: for advanced mpeg conversion support' + 'emovix: for bootable multimedia cd/dvd support') +options=('!libtool') +install=k3b.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ + k3b-2.0.2-ffmpeg.patch) +sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' + '8120c0e22e6c41ea285ca6060be13723ed91c52b') + +build() { + cd "${srcdir}" + (cd ${pkgname}-${pkgver}; patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch") + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/fix-crash-with-qt-4.7.0.patch =================================================================== --- extra-i686/fix-crash-with-qt-4.7.0.patch 2011-11-12 17:15:18 UTC (rev 142624) +++ extra-i686/fix-crash-with-qt-4.7.0.patch 2011-11-12 17:15:19 UTC (rev 142625) @@ -1,37 +0,0 @@ -Index: src/option/k3bpluginoptiontab.cpp -=================================================================== ---- src/option/k3bpluginoptiontab.cpp (revision 1168967) -+++ src/option/k3bpluginoptiontab.cpp (working copy) -@@ -43,12 +43,28 @@ - layout->addWidget( label ); - layout->addWidget( pluginSelector ); - -+ // find all categories -+ QHash<QString, QString> categoryNames; -+ - foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) { -- kDebug() << "Adding plugin" << plugin->pluginInfo().name(); -- pluginSelector->addPlugins( QList<KPluginInfo>() << plugin->pluginInfo(), -+ categoryNames[ plugin->category() ] = plugin->categoryName(); -+ } -+ -+ // add all plugins in each category -+ foreach( const QString &category, categoryNames.keys() ) { -+ QList<KPluginInfo> plugins; -+ -+ foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) { -+ if ( plugin->category() == category ) { -+ plugins << plugin->pluginInfo(); -+ kDebug() << "Adding plugin" << plugin->pluginInfo().name(); -+ } -+ } -+ pluginSelector->addPlugins( plugins, - KPluginSelector::ReadConfigFile, -- plugin->categoryName(), -- plugin->category() ); -+ categoryNames[ category ], -+ category -+ ); - } - } - Copied: k3b/repos/extra-i686/k3b-2.0.2-ffmpeg.patch (from rev 142606, k3b/repos/testing-i686/k3b-2.0.2-ffmpeg.patch) =================================================================== --- extra-i686/k3b-2.0.2-ffmpeg.patch (rev 0) +++ extra-i686/k3b-2.0.2-ffmpeg.patch 2011-11-12 17:15:19 UTC (rev 142625) @@ -0,0 +1,96 @@ +commit 61ca30beb978f68e72257408777c6433f33129bd +Author: Michal Malek <mich...@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 ); Deleted: extra-i686/k3b.install =================================================================== --- extra-i686/k3b.install 2011-11-12 17:15:18 UTC (rev 142624) +++ extra-i686/k3b.install 2011-11-12 17:15:19 UTC (rev 142625) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: k3b/repos/extra-i686/k3b.install (from rev 142606, k3b/repos/testing-i686/k3b.install) =================================================================== --- extra-i686/k3b.install (rev 0) +++ extra-i686/k3b.install 2011-11-12 17:15:19 UTC (rev 142625) @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}