- up to 2.0.3

diff --git a/ffmpeg2.patch b/ffmpeg2.patch
deleted file mode 100644 (file)
index 81115e9..0000000
--- a/ffmpeg2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.h~       2011-01-15 21:47:29.000000000 +0100
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.h        2013-08-29 21:14:40.621518962 +0200
-@@ -18,7 +18,9 @@
- 
- #include "k3bmsf.h"
- 
--
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-+#endif
- 
- /**
-  * Create with K3bFFMpegWrapper::open
---- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp~     2013-08-29 21:10:02.754685572 +0200
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp      2013-08-29 21:15:11.658576297 +0200
-@@ -129,7 +129,7 @@
- 
-     // 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, NULL ) < 0 ) {
-         kDebug() << "(K3bFFMpegDecoderFactory) could not open codec.";
-         return false;
-     }

diff --git a/k3b-2.0.2-ffmpeg.patch b/k3b-2.0.2-ffmpeg.patch
deleted file mode 100644 (file)
index 4dc85f1..0000000
--- a/k3b-2.0.2-ffmpeg.patch
+++ /dev/null
@@ -1,116 +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 );
---- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.org  2014-10-08 09:20:42.493085826 +0200
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp      2014-10-08 09:22:45.357371074 +0200
-@@ -95,7 +95,7 @@
-     }
- 
-     // analyze the streams
--    ::av_find_stream_info( d->formatContext );
-+    ::avformat_find_stream_info( d->formatContext, NULL );
- 
-     // we only handle files containing one audio stream
-     if( d->formatContext->nb_streams != 1 ) {
-@@ -165,7 +165,7 @@
-     }
- 
-     if( d->formatContext ) {
--        ::av_close_input_file( d->formatContext );
-+        ::avformat_close_input( &d->formatContext );
-         d->formatContext = 0;
-     }
- }

diff --git a/k3b-2.0.2-libavformat54.patch b/k3b-2.0.2-libavformat54.patch
deleted file mode 100644 (file)
index 174a776..0000000
--- a/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/k3b.spec b/k3b.spec
index e1299be0e58b0f05aca7c57cac42c659a4653384..37e5cb53040d7c916375f4d74d730b709077a766 100644 (file)
--- a/k3b.spec
+++ b/k3b.spec
@@ -13,16 +13,13 @@ Summary:    The CD Kreator
 Summary(hu.UTF-8):     CD Kreator
 Summary(pl.UTF-8):     Kreator CD
 Name:          k3b
-Version:       2.0.2
-Release:       9
+Version:       2.0.3
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Libraries
-Source0:       http://downloads.sourceforge.net/k3b/%{name}-%{version}.tar.bz2
-# Source0-md5: c86113af31a2032e57fd2f302b5f637a
-Patch0:                k3b-2.0.2-ffmpeg.patch
-Patch1:                k3b-2.0.2-libavformat54.patch
-Patch2:                ffmpeg2.patch
+Source0:       http://download.kde.org/stable/k3b/%{name}-%{version}.tar.xz
+# Source0-md5: dacad4e06be1c6fcb5efd3ac8ecd61f1
 URL:           http://k3b.plainblack.com/
 BuildRequires: Qt3Support-devel >= %{qtver}
 BuildRequires: QtNetwork-devel >= %{qtver}
@@ -142,9 +139,6 @@ Pliki nagłówkowe biblioteki libk3bcore.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 install -d build
@@ -205,7 +199,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/kde4/libexec/k3bsetuphelper
 %{_desktopdir}/kde4/k3b.desktop
 %{_datadir}/apps/k3b
-#%{_iconsdir}/hicolor/*x*/apps/k3b.png
+%{_iconsdir}/hicolor/*x*/apps/k3b.png
+%{_iconsdir}/hicolor/scalable/apps/k3b.svgz
 
 %{_datadir}/apps/solid/actions/k3b_audiocd_rip.desktop
 %{_datadir}/apps/solid/actions/k3b_copy_disc.desktop