diff options
| -rw-r--r-- | audio/amarok/Makefile | 5 | ||||
| -rw-r--r-- | audio/amarok/PLIST | 153 | ||||
| -rw-r--r-- | audio/amarok/distinfo | 11 | ||||
| -rw-r--r-- | audio/amarok/options.mk | 3 | ||||
| -rw-r--r-- | audio/amarok/patches/patch-aa | 15 | ||||
| -rw-r--r-- | audio/amarok/patches/patch-ab | 4 |
6 files changed, 169 insertions, 22 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index 98062701eb3..5e2989c759e 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.86 2010/09/14 11:01:18 wiz Exp $ +# $NetBSD: Makefile,v 1.87 2010/09/20 21:29:15 wiz Exp $ # DISTNAME= amarok-${VERS} -VERS= 2.3.1 -PKGREVISION= 2 +VERS= 2.3.2 CATEGORIES= audio multimedia #MASTER_SITES= http://download.kde.org/unstable/amarok/${VERS}/src/ \ # ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/ diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST index 6e24c15311c..e4309dfd4c2 100644 --- a/audio/amarok/PLIST +++ b/audio/amarok/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.35 2010/06/13 23:39:26 wiz Exp $ +@comment $NetBSD: PLIST,v 1.36 2010/09/20 21:29:15 wiz Exp $ bin/amarok bin/amarok_afttagger bin/amarokcollectionscanner @@ -16,6 +16,7 @@ lib/kde4/amarok_containment_vertical.so lib/kde4/amarok_context_applet_albums.so lib/kde4/amarok_context_applet_currenttrack.so lib/kde4/amarok_context_applet_info.so +lib/kde4/amarok_context_applet_labels.so lib/kde4/amarok_context_applet_lyrics.so lib/kde4/amarok_context_applet_photos.so lib/kde4/amarok_context_applet_similarArtists.so @@ -24,6 +25,7 @@ lib/kde4/amarok_context_applet_videoclip.so lib/kde4/amarok_context_applet_wikipedia.so lib/kde4/amarok_data_engine_current.so lib/kde4/amarok_data_engine_info.so +lib/kde4/amarok_data_engine_labels.so lib/kde4/amarok_data_engine_lyrics.so lib/kde4/amarok_data_engine_photos.so lib/kde4/amarok_data_engine_similarArtists.so @@ -60,11 +62,129 @@ lib/libamarokpud.so.1.0.0 lib/strigi/strigita_audible.so lib/strigi/strigita_mp4.so share/applications/kde4/amarok.desktop +share/applications/kde4/amarok_containers.desktop share/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml share/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml share/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml share/dbus-1/interfaces/org.kde.amarok.Collection.xml share/dbus-1/interfaces/org.kde.amarok.SqlCollection.xml +share/doc/kde/HTML/de/amarok/common +share/doc/kde/HTML/de/amarok/index.cache.bz2 +share/doc/kde/HTML/de/amarok/index.docbook +share/doc/kde/HTML/en/amarok/Amarok2.1center.png +share/doc/kde/HTML/en/amarok/Amarok2.1contextviewconfig.png +share/doc/kde/HTML/en/amarok/Amarok2.1covermanager.png +share/doc/kde/HTML/en/amarok/Amarok2.1dynamicplaylist.png +share/doc/kde/HTML/en/amarok/Amarok2.1internetservices.png +share/doc/kde/HTML/en/amarok/Amarok2.1ipod.png +share/doc/kde/HTML/en/amarok/Amarok2.1left.png +share/doc/kde/HTML/en/amarok/Amarok2.1pleditor.png +share/doc/kde/HTML/en/amarok/Amarok2.1popup.png +share/doc/kde/HTML/en/amarok/Amarok2.1rating.png +share/doc/kde/HTML/en/amarok/Amarok2.1right.png +share/doc/kde/HTML/en/amarok/Amarok2.1scriptmanager.png +share/doc/kde/HTML/en/amarok/Amarok2.1svn965006.png +share/doc/kde/HTML/en/amarok/common +share/doc/kde/HTML/en/amarok/index.cache.bz2 +share/doc/kde/HTML/en/amarok/index.docbook +share/doc/kde/HTML/es/amarok/add_dynamic.png +share/doc/kde/HTML/es/amarok/advanced.docbook +share/doc/kde/HTML/es/amarok/amarok_playlist.png +share/doc/kde/HTML/es/amarok/analyzer.png +share/doc/kde/HTML/es/amarok/buttons.png +share/doc/kde/HTML/es/amarok/collection.png +share/doc/kde/HTML/es/amarok/common +share/doc/kde/HTML/es/amarok/config.docbook +share/doc/kde/HTML/es/amarok/config_appearance.png +share/doc/kde/HTML/es/amarok/config_collection.png +share/doc/kde/HTML/es/amarok/config_engine.png +share/doc/kde/HTML/es/amarok/config_general.png +share/doc/kde/HTML/es/amarok/config_osd.png +share/doc/kde/HTML/es/amarok/config_playback.png +share/doc/kde/HTML/es/amarok/config_scrobbler.png +share/doc/kde/HTML/es/amarok/coverman.png +share/doc/kde/HTML/es/amarok/dynamic_bar.png +share/doc/kde/HTML/es/amarok/dynamic_settings.png +share/doc/kde/HTML/es/amarok/equalizer.png +share/doc/kde/HTML/es/amarok/faq.docbook +share/doc/kde/HTML/es/amarok/file_browser.png +share/doc/kde/HTML/es/amarok/index.cache.bz2 +share/doc/kde/HTML/es/amarok/index.docbook +share/doc/kde/HTML/es/amarok/logo.png +share/doc/kde/HTML/es/amarok/media_device.png +share/doc/kde/HTML/es/amarok/menubar.png +share/doc/kde/HTML/es/amarok/musicbrainz.png +share/doc/kde/HTML/es/amarok/pl_tip1.png +share/doc/kde/HTML/es/amarok/play_list.png +share/doc/kde/HTML/es/amarok/player_window.png +share/doc/kde/HTML/es/amarok/playlist_browser.png +share/doc/kde/HTML/es/amarok/playlist_window.png +share/doc/kde/HTML/es/amarok/queue_manager.png +share/doc/kde/HTML/es/amarok/quick.docbook +share/doc/kde/HTML/es/amarok/requirements.docbook +share/doc/kde/HTML/es/amarok/rmb_menu.png +share/doc/kde/HTML/es/amarok/script_manager.png +share/doc/kde/HTML/es/amarok/status_bar.png +share/doc/kde/HTML/es/amarok/tab_lyrics.png +share/doc/kde/HTML/es/amarok/tab_music.png +share/doc/kde/HTML/es/amarok/tab_wiki.png +share/doc/kde/HTML/es/amarok/using.docbook +share/doc/kde/HTML/es/amarok/vis_window.png +share/doc/kde/HTML/fr/amarok/advanced.docbook +share/doc/kde/HTML/fr/amarok/common +share/doc/kde/HTML/fr/amarok/config.docbook +share/doc/kde/HTML/fr/amarok/faq.docbook +share/doc/kde/HTML/fr/amarok/index.cache.bz2 +share/doc/kde/HTML/fr/amarok/index.docbook +share/doc/kde/HTML/fr/amarok/quick.docbook +share/doc/kde/HTML/fr/amarok/requirements.docbook +share/doc/kde/HTML/fr/amarok/using.docbook +share/doc/kde/HTML/it/amarok/advanced.docbook +share/doc/kde/HTML/it/amarok/common +share/doc/kde/HTML/it/amarok/config.docbook +share/doc/kde/HTML/it/amarok/faq.docbook +share/doc/kde/HTML/it/amarok/index.cache.bz2 +share/doc/kde/HTML/it/amarok/index.docbook +share/doc/kde/HTML/it/amarok/quick.docbook +share/doc/kde/HTML/it/amarok/requirements.docbook +share/doc/kde/HTML/it/amarok/using.docbook +share/doc/kde/HTML/pt/amarok/common +share/doc/kde/HTML/pt/amarok/index.cache.bz2 +share/doc/kde/HTML/pt/amarok/index.docbook +share/doc/kde/HTML/pt_BR/amarok/advanced.docbook +share/doc/kde/HTML/pt_BR/amarok/common +share/doc/kde/HTML/pt_BR/amarok/config.docbook +share/doc/kde/HTML/pt_BR/amarok/faq.docbook +share/doc/kde/HTML/pt_BR/amarok/index.cache.bz2 +share/doc/kde/HTML/pt_BR/amarok/index.docbook +share/doc/kde/HTML/pt_BR/amarok/quick.docbook +share/doc/kde/HTML/pt_BR/amarok/requirements.docbook +share/doc/kde/HTML/pt_BR/amarok/using.docbook +share/doc/kde/HTML/sv/amarok/advanced.docbook +share/doc/kde/HTML/sv/amarok/common +share/doc/kde/HTML/sv/amarok/config.docbook +share/doc/kde/HTML/sv/amarok/faq.docbook +share/doc/kde/HTML/sv/amarok/index.cache.bz2 +share/doc/kde/HTML/sv/amarok/index.docbook +share/doc/kde/HTML/sv/amarok/quick.docbook +share/doc/kde/HTML/sv/amarok/requirements.docbook +share/doc/kde/HTML/sv/amarok/using.docbook +share/doc/kde/HTML/uk/amarok/Amarok2.1center.png +share/doc/kde/HTML/uk/amarok/Amarok2.1contextviewconfig.png +share/doc/kde/HTML/uk/amarok/Amarok2.1covermanager.png +share/doc/kde/HTML/uk/amarok/Amarok2.1dynamicplaylist.png +share/doc/kde/HTML/uk/amarok/Amarok2.1internetservices.png +share/doc/kde/HTML/uk/amarok/Amarok2.1ipod.png +share/doc/kde/HTML/uk/amarok/Amarok2.1left.png +share/doc/kde/HTML/uk/amarok/Amarok2.1pleditor.png +share/doc/kde/HTML/uk/amarok/Amarok2.1popup.png +share/doc/kde/HTML/uk/amarok/Amarok2.1rating.png +share/doc/kde/HTML/uk/amarok/Amarok2.1right.png +share/doc/kde/HTML/uk/amarok/Amarok2.1scriptmanager.png +share/doc/kde/HTML/uk/amarok/Amarok2.1svn965006.png +share/doc/kde/HTML/uk/amarok/common +share/doc/kde/HTML/uk/amarok/index.cache.bz2 +share/doc/kde/HTML/uk/amarok/index.docbook share/icons/hicolor/128x128/apps/amarok.png share/icons/hicolor/16x16/apps/amarok.png share/icons/hicolor/22x22/apps/amarok.png @@ -77,6 +197,7 @@ share/kde/apps/amarok/data/InfoAppletCustomStyle.css share/kde/apps/amarok/data/InfoParserLoading.html share/kde/apps/amarok/data/WikipediaCustomStyle.css share/kde/apps/amarok/data/bullet.gif +share/kde/apps/amarok/data/first_run_jingle.ogg share/kde/apps/amarok/data/hover_info_template.html share/kde/apps/amarok/data/info_frontpage.html share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-high-amarok.png @@ -123,9 +244,6 @@ share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-track-amarok.png share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-underscore-amarok.png share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-year-amarok.png share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-loved-radio-amarok.png -share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-my-friends-amarok.png -share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-my-neighbours-amarok.png -share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-my-tags-amarok.png share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-neighbour-radio-amarok.png share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-personal-radio-amarok.png share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-recommended-radio-amarok.png @@ -226,6 +344,9 @@ share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-magnatune-amarok share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-mp3tunes-amarok.png share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-opml-amarok.png share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-scripted-amarok.png +share/kde/apps/amarok/icons/hicolor/24x24/actions/lastfm-my-friends-amarok.png +share/kde/apps/amarok/icons/hicolor/24x24/actions/lastfm-my-neighbours-amarok.png +share/kde/apps/amarok/icons/hicolor/24x24/actions/lastfm-my-tags-amarok.png share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_artist.png share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_change_language.png share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_clock.png @@ -480,6 +601,7 @@ share/kde4/services/amarok-containment-vertical.desktop share/kde4/services/amarok-context-applet-albums.desktop share/kde4/services/amarok-context-applet-currenttrack.desktop share/kde4/services/amarok-context-applet-info.desktop +share/kde4/services/amarok-context-applet-labels.desktop share/kde4/services/amarok-context-applet-lyrics.desktop share/kde4/services/amarok-context-applet-photos.desktop share/kde4/services/amarok-context-applet-similarArtists.desktop @@ -488,6 +610,7 @@ share/kde4/services/amarok-context-applet-videoclip.desktop share/kde4/services/amarok-context-applet-wikipedia.desktop share/kde4/services/amarok-data-engine-current.desktop share/kde4/services/amarok-data-engine-info.desktop +share/kde4/services/amarok-data-engine-labels.desktop share/kde4/services/amarok-data-engine-lyrics.desktop share/kde4/services/amarok-data-engine-photos.desktop share/kde4/services/amarok-data-engine-similarArtists.desktop @@ -547,6 +670,9 @@ share/locale/de/LC_MESSAGES/amarok_scriptengine_qscript.mo share/locale/de/LC_MESSAGES/amarokcollectionscanner_qt.mo share/locale/de/LC_MESSAGES/amarokpkg.mo share/locale/el/LC_MESSAGES/amarok.mo +share/locale/el/LC_MESSAGES/amarok_scriptengine_qscript.mo +share/locale/el/LC_MESSAGES/amarokcollectionscanner_qt.mo +share/locale/el/LC_MESSAGES/amarokpkg.mo share/locale/en_GB/LC_MESSAGES/amarok.mo share/locale/en_GB/LC_MESSAGES/amarok_scriptengine_qscript.mo share/locale/en_GB/LC_MESSAGES/amarokcollectionscanner_qt.mo @@ -563,6 +689,10 @@ share/locale/fr/LC_MESSAGES/amarok.mo share/locale/fr/LC_MESSAGES/amarok_scriptengine_qscript.mo share/locale/fr/LC_MESSAGES/amarokcollectionscanner_qt.mo share/locale/fr/LC_MESSAGES/amarokpkg.mo +share/locale/ga/LC_MESSAGES/amarok.mo +share/locale/ga/LC_MESSAGES/amarok_scriptengine_qscript.mo +share/locale/ga/LC_MESSAGES/amarokcollectionscanner_qt.mo +share/locale/ga/LC_MESSAGES/amarokpkg.mo share/locale/hu/LC_MESSAGES/amarok.mo share/locale/hu/LC_MESSAGES/amarok_scriptengine_qscript.mo share/locale/hu/LC_MESSAGES/amarokcollectionscanner_qt.mo @@ -572,6 +702,9 @@ share/locale/it/LC_MESSAGES/amarok_scriptengine_qscript.mo share/locale/it/LC_MESSAGES/amarokcollectionscanner_qt.mo share/locale/it/LC_MESSAGES/amarokpkg.mo share/locale/ja/LC_MESSAGES/amarok.mo +share/locale/ja/LC_MESSAGES/amarok_scriptengine_qscript.mo +share/locale/ja/LC_MESSAGES/amarokcollectionscanner_qt.mo +share/locale/ja/LC_MESSAGES/amarokpkg.mo share/locale/lt/LC_MESSAGES/amarok.mo share/locale/lt/LC_MESSAGES/amarok_scriptengine_qscript.mo share/locale/lt/LC_MESSAGES/amarokcollectionscanner_qt.mo @@ -588,6 +721,10 @@ share/locale/nds/LC_MESSAGES/amarok.mo share/locale/nds/LC_MESSAGES/amarok_scriptengine_qscript.mo share/locale/nds/LC_MESSAGES/amarokcollectionscanner_qt.mo share/locale/nds/LC_MESSAGES/amarokpkg.mo +share/locale/nl/LC_MESSAGES/amarok.mo +share/locale/nl/LC_MESSAGES/amarok_scriptengine_qscript.mo +share/locale/nl/LC_MESSAGES/amarokcollectionscanner_qt.mo +share/locale/nl/LC_MESSAGES/amarokpkg.mo share/locale/pa/LC_MESSAGES/amarok.mo share/locale/pa/LC_MESSAGES/amarokcollectionscanner_qt.mo share/locale/pa/LC_MESSAGES/amarokpkg.mo @@ -637,10 +774,6 @@ share/locale/sv/LC_MESSAGES/amarokcollectionscanner_qt.mo share/locale/sv/LC_MESSAGES/amarokpkg.mo share/locale/th/LC_MESSAGES/amarok.mo share/locale/th/LC_MESSAGES/amarokpkg.mo -share/locale/tr/LC_MESSAGES/amarok.mo -share/locale/tr/LC_MESSAGES/amarok_scriptengine_qscript.mo -share/locale/tr/LC_MESSAGES/amarokcollectionscanner_qt.mo -share/locale/tr/LC_MESSAGES/amarokpkg.mo share/locale/uk/LC_MESSAGES/amarok.mo share/locale/uk/LC_MESSAGES/amarok_scriptengine_qscript.mo share/locale/uk/LC_MESSAGES/amarokcollectionscanner_qt.mo @@ -649,7 +782,3 @@ share/locale/zh_CN/LC_MESSAGES/amarok.mo share/locale/zh_CN/LC_MESSAGES/amarok_scriptengine_qscript.mo share/locale/zh_CN/LC_MESSAGES/amarokcollectionscanner_qt.mo share/locale/zh_CN/LC_MESSAGES/amarokpkg.mo -share/locale/zh_TW/LC_MESSAGES/amarok.mo -share/locale/zh_TW/LC_MESSAGES/amarok_scriptengine_qscript.mo -share/locale/zh_TW/LC_MESSAGES/amarokcollectionscanner_qt.mo -share/locale/zh_TW/LC_MESSAGES/amarokpkg.mo diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo index ec76cbbb63f..92add65105e 100644 --- a/audio/amarok/distinfo +++ b/audio/amarok/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.41 2010/06/13 23:39:26 wiz Exp $ +$NetBSD: distinfo,v 1.42 2010/09/20 21:29:15 wiz Exp $ -SHA1 (amarok-2.3.1.tar.bz2) = 00a596384df8d155b91b40bb2484ec0a7f51da80 -RMD160 (amarok-2.3.1.tar.bz2) = 70e581bd681361d7837f1ed295191174e92e9f8f -Size (amarok-2.3.1.tar.bz2) = 9823411 bytes -SHA1 (patch-ab) = 7ce50979a50448ffc645a281083105aa8b7fd723 +SHA1 (amarok-2.3.2.tar.bz2) = 594d6d3ad57832fb80ba4387459356132d37ace2 +RMD160 (amarok-2.3.2.tar.bz2) = 3c2a7868fb7b3f74e35e124cf3a8bad5d8653390 +Size (amarok-2.3.2.tar.bz2) = 13948250 bytes +SHA1 (patch-aa) = 981882a42a2857c8950ee6be3507fbdf33467747 +SHA1 (patch-ab) = 152a6c0516dcab316c4f90480f1bb7fb46eabfbe diff --git a/audio/amarok/options.mk b/audio/amarok/options.mk index 6eb6fca5c52..6a7b05f4b52 100644 --- a/audio/amarok/options.mk +++ b/audio/amarok/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2010/02/16 09:18:23 wiz Exp $ +# $NetBSD: options.mk,v 1.9 2010/09/20 21:29:15 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.amarok PKG_SUPPORTED_OPTIONS= libgpod libmp4v2 libmtp libvisual mp3tunes @@ -22,6 +22,7 @@ BUILDLINK_API_DEPENDS.libgpod+= libgpod>=0.6.0nb1 .endif .if !empty(PKG_OPTIONS:Mlibmtp) +BUILDLINK_API_DEPENDS.libmtp+= libmtp>=1.0 .include "../../devel/libmtp/buildlink3.mk" .endif diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa new file mode 100644 index 00000000000..3ef8bdd5245 --- /dev/null +++ b/audio/amarok/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.19 2010/09/20 21:29:15 wiz Exp $ + +BPM bugfix for FLAC fils, amarok commit ce57e426. + +--- utilities/collectionscanner/CollectionScanner.cpp.orig 2010-09-15 21:24:13.000000000 +0000 ++++ utilities/collectionscanner/CollectionScanner.cpp +@@ -701,7 +701,7 @@ CollectionScanner::readTags( const QStri + attributes["composer"] = TStringToQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() ).trimmed(); + + if ( !file->xiphComment()->fieldListMap()[ "BPM" ].isEmpty() ) +- attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed().toFloat(); ++ attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed(); + + if ( !file->xiphComment()->fieldListMap()[ "DISCNUMBER" ].isEmpty() ) + disc = TStringToQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() ).trimmed(); diff --git a/audio/amarok/patches/patch-ab b/audio/amarok/patches/patch-ab index 78b5feefb8b..600722af197 100644 --- a/audio/amarok/patches/patch-ab +++ b/audio/amarok/patches/patch-ab @@ -1,4 +1,6 @@ -$NetBSD: patch-ab,v 1.6 2010/06/13 23:39:26 wiz Exp $ +$NetBSD: patch-ab,v 1.7 2010/09/20 21:29:15 wiz Exp $ + +Add rpath for embedded mySQL library. --- src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt.orig 2010-03-10 23:12:15.000000000 +0000 +++ src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt |