- obsoleted

Changed files:
    amarok-disable_qtscriptbindings_check_fix.patch -> 1.2
    amarok-ffmpeg08.patch -> 1.4

diff --git a/amarok-disable_qtscriptbindings_check_fix.patch b/amarok-disable_qtscriptbindings_check_fix.patch
deleted file mode 100644 (file)
index 19d76c9..0000000
--- a/amarok-disable_qtscriptbindings_check_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Modestas Vainius <modestas@vainius.eu>
-Subject: [PATCH] Disable QtScriptBindings check
-
-QtScriptBindings is a runtime dependency which is not
-needed at build time. Disable cmake check.
-
-Signed-off-by: Modestas Vainius <modestas@vainius.eu>
-
----
- CMakeLists.txt |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4d830b2..e0dfdc0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,9 +38,6 @@ if( WITH_PLAYER )
- 
-     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.2.0" "" )
- 
--    find_package( QtScriptQtBindings REQUIRED )
--    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
--
-     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
- 
-     find_package(MySQLAmarok REQUIRED)
--- 
-tg: (d5becae..) debian/disable_qtscriptbindings_check_fix (depends on: upstream)

diff --git a/amarok-ffmpeg08.patch b/amarok-ffmpeg08.patch
deleted file mode 100644 (file)
index 71222c6..0000000
--- a/amarok-ffmpeg08.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- amarok-2.4.1/src/musicbrainz/MusicDNSAudioDecoder.cpp~     2011-05-05 21:06:53.000000000 +0200
-+++ amarok-2.4.1/src/musicbrainz/MusicDNSAudioDecoder.cpp      2011-07-01 14:57:41.811795115 +0200
-@@ -150,7 +150,7 @@
- 
-         audioStream = -1;
-         for(i = 0; i < ( int )pFormatCtx->nb_streams; i++ )
--            if( pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO )
-+            if( pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
-             {
-                 audioStream = i;
-                 break;
-@@ -198,7 +198,7 @@
-                     }
-
-                     outSize = bufferSize;
--                    decoderRet = avcodec_decode_audio2( pCodecCtx, ( qint16 * )buffer, &outSize, tmpPacket.data, tmpPacket.size );
-+                    decoderRet = avcodec_decode_audio3( pCodecCtx, ( qint16 * )buffer, &outSize, &tmpPacket );
-                     if( decoderRet < 0 )
-                     {
-                         debug() << "Error while decoding.";
-@@ -252,4 +252,4 @@
- }
- 
- 
--#include "MusicDNSAudioDecoder.moc"
-\ Brak znaku nowej linii na końcu pliku
-+#include "MusicDNSAudioDecoder.moc"