diff options
author | joerg <joerg@pkgsrc.org> | 2012-07-03 18:21:47 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2012-07-03 18:21:47 +0000 |
commit | bdfa864ec533cfc264cee73f90d1f20bd7ea0921 (patch) | |
tree | b2b033b48f2448671641d91ddc3ab597c2cc4e70 | |
parent | 1c2d1b8debdee27136278864281bd54d1a5d65fb (diff) | |
download | pkgsrc-bdfa864ec533cfc264cee73f90d1f20bd7ea0921.tar.gz |
Fix linkage with GCC 4.6+ and Clang. Fix look up issues.
4 files changed, 53 insertions, 4 deletions
diff --git a/audio/amarok-kde3/distinfo b/audio/amarok-kde3/distinfo index 25eb24857d3..df74931b4b5 100644 --- a/audio/amarok-kde3/distinfo +++ b/audio/amarok-kde3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2012/04/07 23:20:42 dholland Exp $ +$NetBSD: distinfo,v 1.4 2012/07/03 18:21:47 joerg Exp $ SHA1 (amarok-1.4.10.tar.bz2) = cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd RMD160 (amarok-1.4.10.tar.bz2) = f86c71dd0459e0cf1ff586cd6de240ca6501cf62 @@ -15,4 +15,6 @@ SHA1 (patch-ai) = 8afc89b7511971012d2335d1032dc99fbc8df32c SHA1 (patch-aj) = 667768476d217c78540368e450ca6048fa86d931 SHA1 (patch-ak) = cc0b3d773af3441d99a0b3a5327ca694a0961d56 SHA1 (patch-al) = f7cf6ade2fcdd4993287bde82cf41231dbb5b512 -SHA1 (patch-amarok_src_engine_xine_xine-engine_cpp) = 6319e5f6a902ae4d4b1372566e7ec4728a72297c +SHA1 (patch-amarok_src_actionclasses.cpp) = e675638b6ec1c02d48fa53cd1bafba4bc57a95c2 +SHA1 (patch-amarok_src_engine_xine_xine-engine_cpp) = a82389dcc7c18d8fb8d3652ee16f61ecbe33ce29 +SHA1 (patch-amarok_src_metadata_rmff_rmff.h) = a15b8085e6250d4489c71c165e163abbc04f7149 diff --git a/audio/amarok-kde3/patches/patch-amarok_src_actionclasses.cpp b/audio/amarok-kde3/patches/patch-amarok_src_actionclasses.cpp new file mode 100644 index 00000000000..0186b14fc0e --- /dev/null +++ b/audio/amarok-kde3/patches/patch-amarok_src_actionclasses.cpp @@ -0,0 +1,17 @@ +$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() ); diff --git a/audio/amarok-kde3/patches/patch-amarok_src_engine_xine_xine-engine_cpp b/audio/amarok-kde3/patches/patch-amarok_src_engine_xine_xine-engine_cpp index 0ec877edc96..4b4fe3d6154 100644 --- a/audio/amarok-kde3/patches/patch-amarok_src_engine_xine_xine-engine_cpp +++ b/audio/amarok-kde3/patches/patch-amarok_src_engine_xine_xine-engine_cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-amarok_src_engine_xine_xine-engine_cpp,v 1.1 2012/04/07 23:20:42 dholland Exp $ +$NetBSD: patch-amarok_src_engine_xine_xine-engine_cpp,v 1.2 2012/07/03 18:21:48 joerg Exp $ Fix build with newer xine-lib. ---- amarok/src/engine/xine/xine-engine.cpp~ 2008-08-13 21:21:51.000000000 +0000 +--- amarok/src/engine/xine/xine-engine.cpp.orig 2008-08-13 21:21:51.000000000 +0000 +++ amarok/src/engine/xine/xine-engine.cpp @@ -1131,7 +1131,7 @@ bool XineEngine::metaDataForUrl(const KU @@ -13,3 +13,12 @@ Fix build with newer xine-lib. int num; int i = 0; +@@ -1244,7 +1244,7 @@ Fader::run() + elapsedUs += stepSizeUs; + + // get volume (amarok main * equalizer preamp) +- float vol = Engine::Base::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp; ++ float vol = XineEngine::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp; + + // compute the mix factor as the percentage of time spent since fade begun + float mix = (elapsedUs / 1000.0) / (float)m_fadeLength; diff --git a/audio/amarok-kde3/patches/patch-amarok_src_metadata_rmff_rmff.h b/audio/amarok-kde3/patches/patch-amarok_src_metadata_rmff_rmff.h new file mode 100644 index 00000000000..0bad230dde7 --- /dev/null +++ b/audio/amarok-kde3/patches/patch-amarok_src_metadata_rmff_rmff.h @@ -0,0 +1,21 @@ +$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 + { |