[arch-commits] Commit in k3b/trunk (4 files)

Eric Bélanger eric at archlinux.org
Wed Nov 5 03:02:57 UTC 2014


    Date: Wednesday, November 5, 2014 @ 04:02:57
  Author: eric
Revision: 225631

upgpkg: k3b 2.0.3-1

Upstream update, Remove old patches

Modified:
  k3b/trunk/PKGBUILD
Deleted:
  k3b/trunk/k3b-2.0.2-ffmpeg.patch
  k3b/trunk/k3b-2.0.2-libav9.patch
  k3b/trunk/k3b-2.0.2-libavformat54.patch

-------------------------------+
 PKGBUILD                      |   16 ++----
 k3b-2.0.2-ffmpeg.patch        |   96 ----------------------------------------
 k3b-2.0.2-libav9.patch        |   42 -----------------
 k3b-2.0.2-libavformat54.patch |   38 ---------------
 4 files changed, 5 insertions(+), 187 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-05 02:59:55 UTC (rev 225630)
+++ PKGBUILD	2014-11-05 03:02:57 UTC (rev 225631)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=k3b
-pkgver=2.0.2
-pkgrel=11
+pkgver=2.0.3
+pkgrel=1
 pkgdesc="Feature-rich and easy to handle CD burning application"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/k3b/"
@@ -18,18 +18,12 @@
             'cdrdao: for disk-at-once (DAO) mode support'
             'cdparanoia: for cd ripping support')
 install=k3b.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-        k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch k3b-2.0.2-libav9.patch)
-sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
-          '8120c0e22e6c41ea285ca6060be13723ed91c52b'
-          '2951518013192f6eefd0754e74dee494e32def24'
-          '02db0666db8d793860c93ef9e2f19a00c9451945')
+source=(http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('0886c0fb9f9bdc4f50dee0e20d1de80962738f49')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch"
-  patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch"
-  patch -p1 -i "${srcdir}/k3b-2.0.2-libav9.patch"
+  sed -i 's/K3B_VERSION_RELEASE 2/K3B_VERSION_RELEASE 3/' CMakeLists.txt
 }
 
 build() {

Deleted: k3b-2.0.2-ffmpeg.patch
===================================================================
--- k3b-2.0.2-ffmpeg.patch	2014-11-05 02:59:55 UTC (rev 225630)
+++ k3b-2.0.2-ffmpeg.patch	2014-11-05 03:02:57 UTC (rev 225631)
@@ -1,96 +0,0 @@
-commit 61ca30beb978f68e72257408777c6433f33129bd
-Author: Michal Malek <michalm at 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: k3b-2.0.2-libav9.patch
===================================================================
--- k3b-2.0.2-libav9.patch	2014-11-05 02:59:55 UTC (rev 225630)
+++ k3b-2.0.2-libav9.patch	2014-11-05 03:02:57 UTC (rev 225631)
@@ -1,42 +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;
-     }
---- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig	2013-07-12 23:05:37.371157123 -0400
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2013-07-12 23:12:01.649948739 -0400
-@@ -55,7 +55,7 @@
-     K3b::Msf length;
- 
-     // for decoding. ffmpeg requires 16-byte alignment.
--    char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15];
-+    char outputBuffer[192000 + 15];
-     char* alignedOutputBuffer;
-     char* outputBufferPos;
-     int outputBufferSize;
-@@ -319,7 +319,7 @@
-         }
- 
-         d->outputBufferPos = d->alignedOutputBuffer;
--        d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+        d->outputBufferSize = 192000;
- 
- #if LIBAVCODEC_VERSION_MAJOR < 52
-         int len = ::avcodec_decode_audio(

Deleted: k3b-2.0.2-libavformat54.patch
===================================================================
--- k3b-2.0.2-libavformat54.patch	2014-11-05 02:59:55 UTC (rev 225630)
+++ k3b-2.0.2-libavformat54.patch	2014-11-05 03:02:57 UTC (rev 225631)
@@ -1,38 +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 -Naur k3b-2.0.2-orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
---- k3b-2.0.2-orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2014-09-15 14:35:16.345772461 -0400
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2014-09-15 14:36:38.645637478 -0400
-@@ -165,7 +165,11 @@
-     }
- 
-     if( d->formatContext ) {
--        ::av_close_input_file( d->formatContext );
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
-+      ::avformat_close_input(&d->formatContext);
-+#else
-+      ::av_close_input_file( d->formatContext );
-+#endif
-         d->formatContext = 0;
-     }
- }


More information about the arch-commits mailing list