diff options
| -rw-r--r-- | audio/amarok/Makefile | 10 | ||||
| -rw-r--r-- | audio/amarok/PLIST | 170 | ||||
| -rw-r--r-- | audio/amarok/distinfo | 8 | ||||
| -rw-r--r-- | audio/amarok/patches/patch-aa | 33 |
4 files changed, 101 insertions, 120 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index 0a726c03cf4..842c5ce64b1 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/01/17 09:45:44 seb Exp $ +# $NetBSD: Makefile,v 1.2 2005/02/20 20:41:40 wiz Exp $ -DISTNAME= amarok-1.1.1 +DISTNAME= amarok-1.2 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amarok/} EXTRACT_SUFX= .tar.bz2 @@ -20,9 +20,9 @@ CONFIGURE_ARGS+= --without-mas LIBS+= ${LIBOSSAUDIO} -BUILDLINK_DEPENDS.taglib+= taglib>=1.3 -BUILDLINK_DEPENDS.gst-plugins+= gst-plugins>=0.8.1 -BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.8.1 +BUILDLINK_DEPENDS.taglib+= taglib>=1.3.1 +BUILDLINK_DEPENDS.gst-plugins+= gst-plugins>=0.8.4 +BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.8.4 BUILDLINK_DEPENDS.arts+= arts>=1.2 .include "../../audio/arts/buildlink3.mk" diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST index 59caa306aa6..b708537ef31 100644 --- a/audio/amarok/PLIST +++ b/audio/amarok/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/17 09:45:45 seb Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/02/20 20:41:40 wiz Exp $ bin/amarok bin/amarok_libvisual bin/amarok_xmmswrapper2 bin/amarokapp bin/release_amarok +lib/kde3/konqsidebar_universalamarok.la lib/kde3/libamarok_artsengine_plugin.la lib/kde3/libamarok_gstengine_plugin.la lib/kde3/libamarok_void-engine_plugin.la @@ -14,108 +15,52 @@ lib/mcop/Amarok/Synth_STEREO_XFADE.mcopclass lib/mcop/amarokarts.mcopclass lib/mcop/amarokarts.mcoptype share/applications/kde/amarok.desktop -share/doc/kde/HTML/da/amarok/common -share/doc/kde/HTML/da/amarok/index.cache.bz2 -share/doc/kde/HTML/da/amarok/index.docbook share/doc/kde/HTML/en/amarok/advanced.docbook share/doc/kde/HTML/en/amarok/analyzer.png share/doc/kde/HTML/en/amarok/buttons.png share/doc/kde/HTML/en/amarok/collection.png share/doc/kde/HTML/en/amarok/common share/doc/kde/HTML/en/amarok/config.docbook -share/doc/kde/HTML/en/amarok/config_colors.png +share/doc/kde/HTML/en/amarok/config_appearance.png +share/doc/kde/HTML/en/amarok/config_collection.png share/doc/kde/HTML/en/amarok/config_engine.png -share/doc/kde/HTML/en/amarok/config_fonts.png share/doc/kde/HTML/en/amarok/config_general.png share/doc/kde/HTML/en/amarok/config_osd.png share/doc/kde/HTML/en/amarok/config_playback.png +share/doc/kde/HTML/en/amarok/config_scrobbler.png share/doc/kde/HTML/en/amarok/context.png share/doc/kde/HTML/en/amarok/coverman.png -share/doc/kde/HTML/en/amarok/develop.docbook +share/doc/kde/HTML/en/amarok/equalizer.png share/doc/kde/HTML/en/amarok/faq.docbook +share/doc/kde/HTML/en/amarok/feature_guide.docbook share/doc/kde/HTML/en/amarok/file_browser.png -share/doc/kde/HTML/en/amarok/hidden.docbook share/doc/kde/HTML/en/amarok/index.cache.bz2 share/doc/kde/HTML/en/amarok/index.docbook share/doc/kde/HTML/en/amarok/logo.png +share/doc/kde/HTML/en/amarok/media_device.png +share/doc/kde/HTML/en/amarok/menubar.png +share/doc/kde/HTML/en/amarok/musicbrainz.png share/doc/kde/HTML/en/amarok/pl_browser.png share/doc/kde/HTML/en/amarok/pl_tip1.png share/doc/kde/HTML/en/amarok/play_list.png share/doc/kde/HTML/en/amarok/player_window.png share/doc/kde/HTML/en/amarok/playlist_window.png +share/doc/kde/HTML/en/amarok/quick.docbook share/doc/kde/HTML/en/amarok/requirements.docbook share/doc/kde/HTML/en/amarok/rmb_menu.png -share/doc/kde/HTML/en/amarok/search.png share/doc/kde/HTML/en/amarok/status_bar.png share/doc/kde/HTML/en/amarok/using.docbook share/doc/kde/HTML/en/amarok/vis_window.png -share/doc/kde/HTML/et/amarok/advanced.docbook -share/doc/kde/HTML/et/amarok/common -share/doc/kde/HTML/et/amarok/config.docbook -share/doc/kde/HTML/et/amarok/develop.docbook -share/doc/kde/HTML/et/amarok/faq.docbook -share/doc/kde/HTML/et/amarok/howto.docbook -share/doc/kde/HTML/et/amarok/index.cache.bz2 -share/doc/kde/HTML/et/amarok/index.docbook -share/doc/kde/HTML/et/amarok/plugin.docbook -share/doc/kde/HTML/et/amarok/requirements.docbook -share/doc/kde/HTML/et/amarok/using.docbook -share/doc/kde/HTML/fr/amarok/common -share/doc/kde/HTML/fr/amarok/index.cache.bz2 -share/doc/kde/HTML/fr/amarok/index.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/develop.docbook -share/doc/kde/HTML/it/amarok/faq.docbook -share/doc/kde/HTML/it/amarok/hidden.docbook -share/doc/kde/HTML/it/amarok/index.cache.bz2 -share/doc/kde/HTML/it/amarok/index.docbook -share/doc/kde/HTML/it/amarok/plugin.docbook -share/doc/kde/HTML/it/amarok/requirements.docbook -share/doc/kde/HTML/it/amarok/using.docbook -share/doc/kde/HTML/pt/amarok/advanced.docbook -share/doc/kde/HTML/pt/amarok/common -share/doc/kde/HTML/pt/amarok/config.docbook -share/doc/kde/HTML/pt/amarok/develop.docbook -share/doc/kde/HTML/pt/amarok/faq.docbook -share/doc/kde/HTML/pt/amarok/hidden.docbook -share/doc/kde/HTML/pt/amarok/index.cache.bz2 -share/doc/kde/HTML/pt/amarok/index.docbook -share/doc/kde/HTML/pt/amarok/plugin.docbook -share/doc/kde/HTML/pt/amarok/requirements.docbook -share/doc/kde/HTML/pt/amarok/using.docbook -share/doc/kde/HTML/sv/amarok/advanced.docbook -share/doc/kde/HTML/sv/amarok/buttons.png -share/doc/kde/HTML/sv/amarok/collection.png -share/doc/kde/HTML/sv/amarok/common -share/doc/kde/HTML/sv/amarok/config.docbook -share/doc/kde/HTML/sv/amarok/config_colors.png -share/doc/kde/HTML/sv/amarok/config_fonts.png -share/doc/kde/HTML/sv/amarok/config_general.png -share/doc/kde/HTML/sv/amarok/config_osd.png -share/doc/kde/HTML/sv/amarok/config_playback.png -share/doc/kde/HTML/sv/amarok/context.png -share/doc/kde/HTML/sv/amarok/develop.docbook -share/doc/kde/HTML/sv/amarok/faq.docbook -share/doc/kde/HTML/sv/amarok/file_browser.png -share/doc/kde/HTML/sv/amarok/hidden.docbook -share/doc/kde/HTML/sv/amarok/index.cache.bz2 -share/doc/kde/HTML/sv/amarok/index.docbook -share/doc/kde/HTML/sv/amarok/pl_browser.png -share/doc/kde/HTML/sv/amarok/pl_tip1.png -share/doc/kde/HTML/sv/amarok/play_list.png -share/doc/kde/HTML/sv/amarok/player_window.png -share/doc/kde/HTML/sv/amarok/playlist_window.png -share/doc/kde/HTML/sv/amarok/plugin.docbook -share/doc/kde/HTML/sv/amarok/requirements.docbook -share/doc/kde/HTML/sv/amarok/scripts_window.png -share/doc/kde/HTML/sv/amarok/search.png -share/doc/kde/HTML/sv/amarok/status_bar.png -share/doc/kde/HTML/sv/amarok/streams.png -share/doc/kde/HTML/sv/amarok/using.docbook -share/doc/kde/HTML/sv/amarok/vis_window.png -share/doc/kde/HTML/sv/amarok/welcome.png +share/doc/kde/HTML/ru/amarok/advanced.docbook +share/doc/kde/HTML/ru/amarok/common +share/doc/kde/HTML/ru/amarok/config.docbook +share/doc/kde/HTML/ru/amarok/faq.docbook +share/doc/kde/HTML/ru/amarok/feature_guide.docbook +share/doc/kde/HTML/ru/amarok/index.cache.bz2 +share/doc/kde/HTML/ru/amarok/index.docbook +share/doc/kde/HTML/ru/amarok/quick.docbook +share/doc/kde/HTML/ru/amarok/requirements.docbook +share/doc/kde/HTML/ru/amarok/using.docbook share/kde/apps/amarok/amarokui.rc share/kde/apps/amarok/amarokui_xmms.rc share/kde/apps/amarok/data/Cool-Streams.m3u @@ -124,17 +69,27 @@ share/kde/apps/amarok/data/dot.png share/kde/apps/amarok/data/grid.png share/kde/apps/amarok/data/wirl1.png share/kde/apps/amarok/data/wirl2.png +share/kde/apps/amarok/icons/crystalsvg/16x16/actions/player_playlist_2.png +share/kde/apps/amarok/icons/crystalsvg/16x16/actions/random.png +share/kde/apps/amarok/icons/crystalsvg/16x16/actions/repeat_playlist.png +share/kde/apps/amarok/icons/crystalsvg/16x16/actions/repeat_track.png +share/kde/apps/amarok/icons/crystalsvg/22x22/actions/player_playlist_2.png +share/kde/apps/amarok/icons/crystalsvg/32x32/actions/player_playlist_2.png +share/kde/apps/amarok/icons/crystalsvg/48x48/actions/player_playlist_2.png share/kde/apps/amarok/images/amarok_cut.png share/kde/apps/amarok/images/amarok_rocks.jpg +share/kde/apps/amarok/images/audioscrobbler.png share/kde/apps/amarok/images/b_next.png share/kde/apps/amarok/images/b_pause.png share/kde/apps/amarok/images/b_play.png share/kde/apps/amarok/images/b_prev.png share/kde/apps/amarok/images/b_stop.png +share/kde/apps/amarok/images/babelfish.png share/kde/apps/amarok/images/bucky.png -share/kde/apps/amarok/images/context_gradient.png share/kde/apps/amarok/images/covermanager.png +share/kde/apps/amarok/images/currenttrack_pause.png share/kde/apps/amarok/images/currenttrack_play.png +share/kde/apps/amarok/images/currenttrack_repeat.png share/kde/apps/amarok/images/description.png share/kde/apps/amarok/images/eq_active2.png share/kde/apps/amarok/images/eq_inactive2.png @@ -152,19 +107,28 @@ share/kde/apps/amarok/images/time_plus.png share/kde/apps/amarok/images/vol_speaker.png share/kde/apps/amarok/images/wizard_compact.png share/kde/apps/amarok/images/wizard_xmms.png +share/kde/apps/amarok/scripts/alarm/README +share/kde/apps/amarok/scripts/alarm/alarm.py +share/kde/apps/amarok/scripts/playlist2html/Playlist.py +share/kde/apps/amarok/scripts/playlist2html/PlaylistServer.py +share/kde/apps/amarok/scripts/playlist2html/playlist2html.py +share/kde/apps/amarok/scripts/templates/amarok.rb +share/kde/apps/amarok/scripts/templates/python_qt_template.py +share/kde/apps/amarok/scripts/templates/ruby_qt_template.rb +share/kde/apps/amarok/themes/flat/stylesheet.css +share/kde/apps/konqsidebartng/add/amarok.desktop share/kde/apps/konqueror/servicemenus/amarok_append.desktop +share/kde/apps/profiles/amarok.profile.xml share/kde/config.kcfg/amarok.kcfg share/kde/config.kcfg/gstconfig.kcfg share/kde/config/amarokrc -share/kde/icons/crystalsvg/16x16/actions/player_playlist_2.png +share/kde/icons/crystalsvg/128x128/apps/amarok.png share/kde/icons/crystalsvg/16x16/apps/amarok.png -share/kde/icons/crystalsvg/22x22/actions/player_playlist_2.png share/kde/icons/crystalsvg/22x22/apps/amarok.png -share/kde/icons/crystalsvg/32x32/actions/player_playlist_2.png share/kde/icons/crystalsvg/32x32/apps/amarok.png -share/kde/icons/crystalsvg/48x48/actions/player_playlist_2.png share/kde/icons/crystalsvg/48x48/apps/amarok.png share/kde/icons/crystalsvg/64x64/apps/amarok.png +share/kde/icons/crystalsvg/scalable/apps/amarok.svgz share/kde/services/amarok_artsengine_plugin.desktop share/kde/services/amarok_gstengine_plugin.desktop share/kde/services/amarok_void-engine_plugin.desktop @@ -172,6 +136,7 @@ share/kde/services/amarok_xine-engine.desktop share/kde/services/amarok_xineengine_plugin.desktop share/kde/servicetypes/amarok_plugin.desktop ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/amarok.mo +${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/br/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/amarok.mo @@ -189,6 +154,8 @@ ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/amarok.mo +${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/amarok.mo +${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/amarok.mo @@ -198,42 +165,51 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/amarok.mo +${PKGLOCALEDIR}/locale/tg/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/amarok.mo +${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/uz/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/xx/LC_MESSAGES/amarok.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/amarok.mo @comment in kde: @dirrm share/kde/servicetypes @comment in kde: @dirrm share/kde/services +@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/apps @comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps @comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps -@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/actions @comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps -@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/actions @comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/apps -@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/actions @comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/apps -@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/actions +@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/apps @comment in kde: @dirrm share/kde/config.kcfg @comment in kde: @dirrm share/kde/config +@comment in kde: @dirrm share/kde/apps/profiles @comment in kde: @dirrm share/kde/apps/konqueror/servicemenus +@comment in kdebase: dirrm share/kde/apps/konqsidebartng/add +@dirrm share/kde/apps/amarok/themes/flat +@dirrm share/kde/apps/amarok/themes +@dirrm share/kde/apps/amarok/scripts/templates +@dirrm share/kde/apps/amarok/scripts/playlist2html +@dirrm share/kde/apps/amarok/scripts/alarm +@dirrm share/kde/apps/amarok/scripts @dirrm share/kde/apps/amarok/images +@dirrm share/kde/apps/amarok/icons/crystalsvg/48x48/actions +@dirrm share/kde/apps/amarok/icons/crystalsvg/48x48 +@dirrm share/kde/apps/amarok/icons/crystalsvg/32x32/actions +@dirrm share/kde/apps/amarok/icons/crystalsvg/32x32 +@dirrm share/kde/apps/amarok/icons/crystalsvg/22x22/actions +@dirrm share/kde/apps/amarok/icons/crystalsvg/22x22 +@dirrm share/kde/apps/amarok/icons/crystalsvg/16x16/actions +@dirrm share/kde/apps/amarok/icons/crystalsvg/16x16 +@dirrm share/kde/apps/amarok/icons/crystalsvg +@dirrm share/kde/apps/amarok/icons @dirrm share/kde/apps/amarok/data @dirrm share/kde/apps/amarok @comment in kde: @dirrm share/kde/apps -@dirrm share/doc/kde/HTML/sv/amarok -@comment in kde: @dirrm share/doc/kde/HTML/sv -@dirrm share/doc/kde/HTML/pt/amarok -@comment in kde: @dirrm share/doc/kde/HTML/pt -@dirrm share/doc/kde/HTML/it/amarok -@comment in kde: @dirrm share/doc/kde/HTML/it -@dirrm share/doc/kde/HTML/fr/amarok -@comment in kde: @dirrm share/doc/kde/HTML/fr -@dirrm share/doc/kde/HTML/et/amarok -@comment in kde: @dirrm share/doc/kde/HTML/et +@dirrm share/doc/kde/HTML/ru/amarok +@comment in kde: @dirrm share/doc/kde/HTML/ru @dirrm share/doc/kde/HTML/en/amarok @comment in kde: @dirrm share/doc/kde/HTML/en -@dirrm share/doc/kde/HTML/da/amarok -@comment in kde: @dirrm share/doc/kde/HTML/da @comment in kde: @dirrm share/applications/kde @dirrm lib/mcop/Amarok +@comment in arts: @dirrm lib/mcop @comment in kde: @dirrm lib/kde3 diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo index 02f740539d9..93784822c66 100644 --- a/audio/amarok/distinfo +++ b/audio/amarok/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/01/17 09:45:44 seb Exp $ +$NetBSD: distinfo,v 1.2 2005/02/20 20:41:40 wiz Exp $ -SHA1 (amarok-1.1.1.tar.bz2) = 35a838d96718104cd4208375d061d9b722126624 -Size (amarok-1.1.1.tar.bz2) = 2888815 bytes -SHA1 (patch-aa) = b137f67bd956421385154584562bb0f58d4c07c7 +SHA1 (amarok-1.2.tar.bz2) = a5358f2b3ee11b66d60b852553d17eb25c3a8655 +Size (amarok-1.2.tar.bz2) = 5449066 bytes +SHA1 (patch-aa) = ab5f884612e3e25633c4fab6227849142b960b39 diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa index 3e773035eb6..a733f4fe3de 100644 --- a/audio/amarok/patches/patch-aa +++ b/audio/amarok/patches/patch-aa @@ -1,18 +1,23 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/01/17 09:45:45 seb Exp $ +$NetBSD: patch-aa,v 1.2 2005/02/20 20:41:40 wiz Exp $ ---- amarok/src/vis/libvisual/libvisual.cpp.orig 2004-10-09 12:52:12.000000000 +0000 -+++ amarok/src/vis/libvisual/libvisual.cpp -@@ -267,11 +267,11 @@ namespace SDL - break; +--- amarok/src/amarokcore/crashhandler.cpp.orig 2005-02-13 14:01:30.000000000 +0100 ++++ amarok/src/amarokcore/crashhandler.cpp +@@ -42,15 +42,15 @@ namespace amaroK + runCommand( const QCString &command ) + { + static const uint SIZE = 40960; //40 KiB +- static char stdout[ SIZE ]; ++ static char amarok_stdout[ SIZE ]; - case SDL_MOUSEBUTTONDOWN: -- visual_event_queue_add_mousebutton (vevent, event.button.button, VISUAL_MOUSE_DOWN); -+ visual_event_queue_add_mousebutton (vevent, event.button.button, VISUAL_MOUSE_DOWN, 0, 0); - break; + debug() << "Running: " << command << endl; - case SDL_MOUSEBUTTONUP: -- visual_event_queue_add_mousebutton (vevent, event.button.button, VISUAL_MOUSE_UP); -+ visual_event_queue_add_mousebutton (vevent, event.button.button, VISUAL_MOUSE_UP, 0, 0); - break; + FILE *process = ::popen( command, "r" ); +- stdout[ std::fread( (void*)stdout, sizeof(char), SIZE-1, process ) ] = '\0'; ++ amarok_stdout[ std::fread( (void*)amarok_stdout, sizeof(char), SIZE-1, process ) ] = '\0'; + ::pclose( process ); - case SDL_QUIT: +- return QString::fromLocal8Bit( stdout ); ++ return QString::fromLocal8Bit( amarok_stdout ); + } + + void |