Tue Jul 3 18:21:48 2012 UTC ()
Fix linkage with GCC 4.6+ and Clang. Fix look up issues.


(joerg)
diff -r1.3 -r1.4 pkgsrc/audio/amarok-kde3/distinfo
diff -r0 -r1.1 pkgsrc/audio/amarok-kde3/patches/patch-amarok_src_actionclasses.cpp
diff -r0 -r1.1 pkgsrc/audio/amarok-kde3/patches/patch-amarok_src_metadata_rmff_rmff.h
diff -r1.1 -r1.2 pkgsrc/audio/amarok-kde3/patches/patch-amarok_src_engine_xine_xine-engine_cpp
cvs diff -r1.3 -r1.4 pkgsrc/audio/amarok-kde3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/amarok-kde3/Attic/distinfo 2012/04/07 23:20:42 1.3
+++ pkgsrc/audio/amarok-kde3/Attic/distinfo 2012/07/03 18:21:47 1.4
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1$NetBSD: distinfo,v 1.3 2012/04/07 23:20:42 dholland Exp $ 1$NetBSD: distinfo,v 1.4 2012/07/03 18:21:47 joerg Exp $
2 2
3SHA1 (amarok-1.4.10.tar.bz2) = cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd 3SHA1 (amarok-1.4.10.tar.bz2) = cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd
4RMD160 (amarok-1.4.10.tar.bz2) = f86c71dd0459e0cf1ff586cd6de240ca6501cf62 4RMD160 (amarok-1.4.10.tar.bz2) = f86c71dd0459e0cf1ff586cd6de240ca6501cf62
5Size (amarok-1.4.10.tar.bz2) = 12812583 bytes 5Size (amarok-1.4.10.tar.bz2) = 12812583 bytes
6SHA1 (patch-aa) = 53316f334f45a8a4780ae71061d528374a75cb5a 6SHA1 (patch-aa) = 53316f334f45a8a4780ae71061d528374a75cb5a
7SHA1 (patch-ab) = 91097c1d901fb66c5c8e593005c462b1874f50bf 7SHA1 (patch-ab) = 91097c1d901fb66c5c8e593005c462b1874f50bf
8SHA1 (patch-ac) = ea6900aafc3cd99069ac59929ae14296662d095f 8SHA1 (patch-ac) = ea6900aafc3cd99069ac59929ae14296662d095f
9SHA1 (patch-ad) = eea8105897ce4cd9d4a086430ec0588125b3517b 9SHA1 (patch-ad) = eea8105897ce4cd9d4a086430ec0588125b3517b
10SHA1 (patch-ae) = ceeccf0eaa9091bd2422354abdf98c34f8a9802b 10SHA1 (patch-ae) = ceeccf0eaa9091bd2422354abdf98c34f8a9802b
11SHA1 (patch-af) = 4c9f82603e8209ce1f598749b3d81dfaf8df5f46 11SHA1 (patch-af) = 4c9f82603e8209ce1f598749b3d81dfaf8df5f46
12SHA1 (patch-ag) = 7d3353973722af565b37d47e4dac360bee2e25bc 12SHA1 (patch-ag) = 7d3353973722af565b37d47e4dac360bee2e25bc
13SHA1 (patch-ah) = 9feed2c659c7c543ddd25568c79e3f853b1bb8e8 13SHA1 (patch-ah) = 9feed2c659c7c543ddd25568c79e3f853b1bb8e8
14SHA1 (patch-ai) = 8afc89b7511971012d2335d1032dc99fbc8df32c 14SHA1 (patch-ai) = 8afc89b7511971012d2335d1032dc99fbc8df32c
15SHA1 (patch-aj) = 667768476d217c78540368e450ca6048fa86d931 15SHA1 (patch-aj) = 667768476d217c78540368e450ca6048fa86d931
16SHA1 (patch-ak) = cc0b3d773af3441d99a0b3a5327ca694a0961d56 16SHA1 (patch-ak) = cc0b3d773af3441d99a0b3a5327ca694a0961d56
17SHA1 (patch-al) = f7cf6ade2fcdd4993287bde82cf41231dbb5b512 17SHA1 (patch-al) = f7cf6ade2fcdd4993287bde82cf41231dbb5b512
18SHA1 (patch-amarok_src_engine_xine_xine-engine_cpp) = 6319e5f6a902ae4d4b1372566e7ec4728a72297c 18SHA1 (patch-amarok_src_actionclasses.cpp) = e675638b6ec1c02d48fa53cd1bafba4bc57a95c2
 19SHA1 (patch-amarok_src_engine_xine_xine-engine_cpp) = a82389dcc7c18d8fb8d3652ee16f61ecbe33ce29
 20SHA1 (patch-amarok_src_metadata_rmff_rmff.h) = a15b8085e6250d4489c71c165e163abbc04f7149
File Added: pkgsrc/audio/amarok-kde3/patches/Attic/patch-amarok_src_actionclasses.cpp
$NetBSD: patch-amarok_src_actionclasses.cpp,v 1.1 2012/07/03 18:21:48 joerg Exp $

--- amarok/src/actionclasses.cpp.orig	2012-07-03 09:20:01.000000000 +0000
+++ amarok/src/actionclasses.cpp
@@ -168,10 +168,11 @@ Menu::instance()
     return &menu;
 }
 
+extern KAboutData aboutData;
+
 KPopupMenu*
 Menu::helpMenu( QWidget *parent ) //STATIC
 {
-    extern KAboutData aboutData;
 
     if ( s_helpMenu == 0 )
         s_helpMenu = new KHelpMenu( parent, &aboutData, Amarok::actionCollection() );
File Added: pkgsrc/audio/amarok-kde3/patches/Attic/patch-amarok_src_metadata_rmff_rmff.h
$NetBSD: patch-amarok_src_metadata_rmff_rmff.h,v 1.1 2012/07/03 18:21:48 joerg Exp $

--- amarok/src/metadata/rmff/rmff.h.orig	2008-08-13 21:21:51.000000000 +0000
+++ amarok/src/metadata/rmff/rmff.h
@@ -35,6 +35,8 @@
 
 namespace TagLib
 {
+   class AudioProperties;
+
    namespace RealMedia
    {
 #if SIZEOF_LONG == 4
@@ -278,7 +280,6 @@ namespace TagLib
          TagLib::ID3v1::Tag *m_id3tag;
       };
       
-      class TagLib::AudioProperties;
       
       class RealMediaFF
       {
cvs diff -r1.1 -r1.2 pkgsrc/audio/amarok-kde3/patches/Attic/patch-amarok_src_engine_xine_xine-engine_cpp (expand / switch to unified diff)

--- pkgsrc/audio/amarok-kde3/patches/Attic/patch-amarok_src_engine_xine_xine-engine_cpp 2012/04/07 23:20:42 1.1
+++ pkgsrc/audio/amarok-kde3/patches/Attic/patch-amarok_src_engine_xine_xine-engine_cpp 2012/07/03 18:21:48 1.2
@@ -1,15 +1,24 @@ @@ -1,15 +1,24 @@
1$NetBSD: patch-amarok_src_engine_xine_xine-engine_cpp,v 1.1 2012/04/07 23:20:42 dholland Exp $ 1$NetBSD: patch-amarok_src_engine_xine_xine-engine_cpp,v 1.2 2012/07/03 18:21:48 joerg Exp $
2 2
3Fix build with newer xine-lib. 3Fix build with newer xine-lib.
4 4
5--- amarok/src/engine/xine/xine-engine.cpp~ 2008-08-13 21:21:51.000000000 +0000 5--- amarok/src/engine/xine/xine-engine.cpp.orig 2008-08-13 21:21:51.000000000 +0000
6+++ amarok/src/engine/xine/xine-engine.cpp 6+++ amarok/src/engine/xine/xine-engine.cpp
7@@ -1131,7 +1131,7 @@ bool XineEngine::metaDataForUrl(const KU 7@@ -1131,7 +1131,7 @@ bool XineEngine::metaDataForUrl(const KU
8  8
9 bool XineEngine::getAudioCDContents(const QString &device, KURL::List &urls) 9 bool XineEngine::getAudioCDContents(const QString &device, KURL::List &urls)
10 { 10 {
11- char **xine_urls = NULL; 11- char **xine_urls = NULL;
12+ const char *const *xine_urls = NULL; 12+ const char *const *xine_urls = NULL;
13 int num; 13 int num;
14 int i = 0; 14 int i = 0;
15  15
 16@@ -1244,7 +1244,7 @@ Fader::run()
 17 elapsedUs += stepSizeUs;
 18
 19 // get volume (amarok main * equalizer preamp)
 20- float vol = Engine::Base::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp;
 21+ float vol = XineEngine::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp;
 22
 23 // compute the mix factor as the percentage of time spent since fade begun
 24 float mix = (elapsedUs / 1000.0) / (float)m_fadeLength;