Date: Sat, 3 Feb 2007 11:15:36 GMT From: Alex<goo@t72.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/108711: update audio/amarok to 1.4.5 Message-ID: <200702031115.l13BFaZx073961@www.freebsd.org> Resent-Message-ID: <200702031120.l13BKKo9011928@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 108711 >Category: ports >Synopsis: update audio/amarok to 1.4.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Feb 03 11:20:19 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Alex >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: >Description: from changelog VERSION 1.4.5 FEATURES: * Added support for custom song labels. Labels can be managed through the GUI or using new DCOP functions. (BR 89314) * New DCOP functions to make it easier for scripts to use Amarok's Dynamic Collection feature. * Download songs from Shared Music (DAAP) directly into the collection. * Fadeout for Helix engine when pressing Stop. * Guided editing of the collection/playlist/devices filters. Patch by Giovanni Venturi <giovanni@kde-it.org>. (BR 139292) * Added GUI options for fadeout and fadeout on exit. Both are now enabled by default. * Support for Speex (.spx), WavPack (.wv) and TrueAudio (.tta) files in the collection thanks to taglib plugins by Lukц║е║ Lalinskц╫ <lalinsky@gmail.com>. * Search inside of lyrics, by using "/" on Context Browser. Patch by Carles Pina i Estany <carles@pina.cat>. (BR 139210) * "Automatically show context browser" feature makes a return, as per popular request. It is however disabled by default. * Improved keyboard navigation: Space key is now a shortcut for Play/Pause, and cursor left/right seeks forward/backward. * Cover images are shown in collection browser. Patch by Trever Fischer <wm161@wm161.net>. (BR 91044) * Send cover art to MTP media devices if they support it. * Elapsed time can be shown in OSD. Patch by Christian Engels <s9chenge@stud.uni-sb.de>. (BR 120051) * New redownload manager for the Magnatune.com store. Allows re-download of any previous purchase free of charge (in any format). * New items in the playlist are colorized, as a visual cue. * Show rating as stars in flat collection view. Patch by Daniel Faust <hessijames@gmail.com>. (BR 133797) * Synchronize play count, last played time and date of modification to iPods. Patch by Michael <michael003@gmail.com>. (BR 136759) * Propose list of composers in collection when editing the composer tag from the playlist. (BR 137775) * Greatly improved sound quality for the xine equalizer. Patch by Tobias Knieper <tobias.knieper@gmail.com>. (BR 127307) * Fancy graphical volume slider for the OSD. Patch by Alexander Bechikov <goo@t72.ru>. * Shoutcast stream directory. Contributed by Adam Pigg <adam@piggz.co.uk>. * Support for %composer and %genre when guessing tags from filenames. * Cached lyrics are now AFT-enabled, and will follow your files around as you move and rename them. more changes and bugfixes >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN amarok.orig/Makefile amarok/Makefile --- amarok.orig/Makefile Tue Dec 26 20:00:46 2006 +++ amarok/Makefile Sat Feb 3 03:33:26 2007 @@ -5,8 +5,7 @@ # $FreeBSD: ports/audio/amarok/Makefile,v 1.62 2006/12/26 15:00:46 mich Exp $ PORTNAME= amarok -PORTVERSION= 1.4.4 -PORTREVISION= 2 +PORTVERSION= 1.4.5 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src @@ -32,7 +31,6 @@ OPTIONS= GPOD "iPod support" on \ NJB "Creative Nomad and Dell support" on \ MTP "MTP device support" on \ - XMMS "XMMS visualizations" off \ OPENGL "OpenGL support" on \ AMAZON "Amazon cover fetching support" on \ MYSQL "Use MySQL as collection backend" off \ @@ -74,15 +72,6 @@ PLIST_SUB+= MTP="" .endif -.if !defined(WITH_XMMS) -PLIST_SUB+= XMMS="@comment " -CONFIGURE_ARGS+=--without-xmms -.else -BUILD_DEPENDS+= xmms-config:${PORTSDIR}/multimedia/xmms -LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms -PLIST_SUB+= XMMS="" -.endif - .if defined(WITHOUT_OPENGL) CONFIGURE_ARGS+=--without-opengl .endif @@ -99,6 +88,11 @@ .if defined(WITH_POSTGRESQL) USE_PGSQL= yes CONFIGURE_ARGS+=--enable-postgresql +.endif + +.if defined(DEBUG) +CONFIGURE_ARGS+=--enable-debug=full +STRIP= # none .endif pre-extract: check-options-version diff -urN amarok.orig/distinfo amarok/distinfo --- amarok.orig/distinfo Wed Nov 8 19:25:40 2006 +++ amarok/distinfo Sat Feb 3 00:31:26 2007 @@ -1,3 +1,3 @@ -MD5 (amarok-1.4.4.tar.bz2) = 56a9aec42088c338b81252f8e0651781 -SHA256 (amarok-1.4.4.tar.bz2) = 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea -SIZE (amarok-1.4.4.tar.bz2) = 17635707 +MD5 (amarok-1.4.5.tar.bz2) = 81696ff44989334f0fc5dfd4142ded6d +SHA256 (amarok-1.4.5.tar.bz2) = a9d2214cab085ac9271c31354e0f797887f0a7cb6acd68ccbc7f94a71d805451 +SIZE (amarok-1.4.5.tar.bz2) = 18034058 diff -urN amarok.orig/files/patch-amarok_src_amarok__proxy.rb amarok/files/patch-amarok_src_amarok__proxy.rb --- amarok.orig/files/patch-amarok_src_amarok__proxy.rb Fri Dec 8 16:53:14 2006 +++ amarok/files/patch-amarok_src_amarok__proxy.rb Thu Jan 1 05:00:00 1970 @@ -1,26 +0,0 @@ - -$FreeBSD: ports/audio/amarok/files/patch-amarok_src_amarok__proxy.rb,v 1.1 2006/12/08 11:53:14 mich Exp $ - ---- amarok/src/amarok_proxy.rb.orig -+++ amarok/src/amarok_proxy.rb -@@ -117,6 +117,11 @@ - def cp_to_empty_outward( income, output ) - myputs "cp_to_empty_outward( income => #{income.inspect}, output => #{output.inspect}" - income.each_line do |data| -+ if data =~ /User-Agent: xine\/([0-9.]+)/ -+ version = $1.split(".").collect { |v| v.to_i } -+ myputs("Found xine user agent version #{version.join(".")}") -+ @xineworkaround = ( version[0] <= 1 && version[1] <= 1 && version[2] <= 2 ) -+ end - myputs( data ) - data.chomp! - safe_write( output, data ) -@@ -142,7 +147,7 @@ - - def cp_all_inward( income, output ) - myputs( "cp_all( income => #{income.inspect}, output => #{output.inspect}" ) -- if self.is_a?( LastFM ) and @engine == 'xine-engine' -+ if self.is_a?( LastFM ) and @xineworkaround - myputs( "Using buffer fill workaround." ) - filler = Array.new( 4096, 0 ) - safe_write( output, filler ) # HACK: Fill xine's buffer so that xine_open() won't block diff -urN amarok.orig/files/patch-amarok_src_lastfm.cpp amarok/files/patch-amarok_src_lastfm.cpp --- amarok.orig/files/patch-amarok_src_lastfm.cpp Wed Aug 2 18:09:59 2006 +++ amarok/files/patch-amarok_src_lastfm.cpp Sat Feb 3 00:46:49 2007 @@ -3,7 +3,7 @@ --- amarok/src/lastfm.cpp.orig +++ amarok/src/lastfm.cpp -@@ -729,7 +729,7 @@ +@@ -905,7 +905,7 @@ QCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest(); diff -urN amarok.orig/files/patch-amarok_src_mediadevice_generic_genericmediadevice.cpp amarok/files/patch-amarok_src_mediadevice_generic_genericmediadevice.cpp --- amarok.orig/files/patch-amarok_src_mediadevice_generic_genericmediadevice.cpp Thu Jan 18 17:52:52 2007 +++ amarok/files/patch-amarok_src_mediadevice_generic_genericmediadevice.cpp Thu Jan 1 05:00:00 1970 @@ -1,29 +0,0 @@ - -$FreeBSD: ports/audio/amarok/files/patch-amarok_src_mediadevice_generic_genericmediadevice.cpp,v 1.2 2007/01/18 12:52:52 mich Exp $ - ---- amarok/src/mediadevice/generic/genericmediadevice.cpp.orig -+++ amarok/src/mediadevice/generic/genericmediadevice.cpp -@@ -415,7 +415,13 @@ - if( m_medium.mountPoint() == (*mountiter)->mountPoint() ) - m_medium.setFsType( (*mountiter)->mountType() ); - } -- m_actuallyVfat = m_medium.fsType() == "vfat" ? true : false; -+ m_actuallyVfat = m_medium.fsType() == -+#ifdef __FreeBSD__ -+"msdosfs" -+#else -+"vfat" -+#endif -+ ? true : false; - m_connected = true; - m_transferDir = m_medium.mountPoint(); - m_initialFile = new GenericMediaFile( 0, m_medium.mountPoint(), this ); -@@ -457,7 +463,7 @@ - debug() << "Renaming: " << src << " to: " << dst << endl; - - //do we want a progress dialog? If so, set last false to true -- if( KIO::NetAccess::file_move( KURL::fromPathOrURL(src), KURL::fromPathOrURL(dst), -1, false, false, false ) ) -+ if( KIO::NetAccess::file_move( KURL::fromPathOrURL(src), KURL::fromPathOrURL(dst), -1, false, false, 0 ) ) - { - m_mfm.erase( m_mim[item]->getFullName() ); - m_mim[item]->setNamesFromBase( item->text(0) ); diff -urN amarok.orig/files/patch-amarok_src_sqlite_fts1.c amarok/files/patch-amarok_src_sqlite_fts1.c --- amarok.orig/files/patch-amarok_src_sqlite_fts1.c Thu Jan 1 05:00:00 1970 +++ amarok/files/patch-amarok_src_sqlite_fts1.c Sat Feb 3 02:42:39 2007 @@ -0,0 +1,11 @@ +--- amarok/src/sqlite/fts1.c.orig Thu Feb 1 23:14:17 2007 ++++ amarok/src/sqlite/fts1.c Sat Feb 3 01:51:38 2007 +@@ -19,7 +19,7 @@ + #endif + + #include <assert.h> +-#if !defined(__APPLE__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <malloc.h> + #else + #include <stdlib.h> diff -urN amarok.orig/files/patch-amarok_src_sqlite_fts1__porter.c amarok/files/patch-amarok_src_sqlite_fts1__porter.c --- amarok.orig/files/patch-amarok_src_sqlite_fts1__porter.c Thu Jan 1 05:00:00 1970 +++ amarok/files/patch-amarok_src_sqlite_fts1__porter.c Sat Feb 3 02:42:26 2007 @@ -0,0 +1,11 @@ +--- amarok/src/sqlite/fts1_porter.c.orig Thu Feb 1 23:14:17 2007 ++++ amarok/src/sqlite/fts1_porter.c Sat Feb 3 01:51:55 2007 +@@ -26,7 +26,7 @@ + + + #include <assert.h> +-#if !defined(__APPLE__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <malloc.h> + #else + #include <stdlib.h> diff -urN amarok.orig/files/patch-amarok_src_sqlite_fts1__tokenizer1.c amarok/files/patch-amarok_src_sqlite_fts1__tokenizer1.c --- amarok.orig/files/patch-amarok_src_sqlite_fts1__tokenizer1.c Thu Jan 1 05:00:00 1970 +++ amarok/files/patch-amarok_src_sqlite_fts1__tokenizer1.c Sat Feb 3 02:42:43 2007 @@ -0,0 +1,11 @@ +--- amarok/src/sqlite/fts1_tokenizer1.c.orig Thu Feb 1 23:14:17 2007 ++++ amarok/src/sqlite/fts1_tokenizer1.c Sat Feb 3 01:52:07 2007 +@@ -18,7 +18,7 @@ + + + #include <assert.h> +-#if !defined(__APPLE__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <malloc.h> + #else + #include <stdlib.h> diff -urN amarok.orig/files/patch-amarok_src_statusbar_statusbar.cpp amarok/files/patch-amarok_src_statusbar_statusbar.cpp --- amarok.orig/files/patch-amarok_src_statusbar_statusbar.cpp Thu Jan 1 05:00:00 1970 +++ amarok/files/patch-amarok_src_statusbar_statusbar.cpp Sat Feb 3 13:21:03 2007 @@ -0,0 +1,11 @@ +--- amarok/src/statusbar/statusbar.cpp.orig Mon Dec 18 00:17:13 2006 ++++ amarok/src/statusbar/statusbar.cpp Mon Dec 18 00:13:27 2006 +@@ -81,7 +81,7 @@ + m_slider->setMinimumWidth( m_timeLabel->width() ); + + m_timeLabel2 = new TimeLabel( positionBox ); +- m_slider->setMinimumWidth( m_timeLabel2->width() ); ++ m_slider->setMinimumWidth( m_timeLabel2->width() + 128 ); + + + // TODO Both labels need tooltips (string freeze?) diff -urN amarok.orig/pkg-plist amarok/pkg-plist --- amarok.orig/pkg-plist Tue Dec 19 19:28:17 2006 +++ amarok/pkg-plist Sat Feb 3 15:21:04 2007 @@ -3,11 +3,10 @@ bin/amarokcollectionscanner bin/amarok_daapserver.rb bin/amarok_proxy.rb -lib/libamarok.so -lib/libamarok.so.0 lib/libamarok.a lib/libamarok.la -%%XMMS%%bin/amarok_xmmswrapper2 +lib/libamarok.so +lib/libamarok.so.0 lib/kde3/konqsidebar_universalamarok.a lib/kde3/konqsidebar_universalamarok.la lib/kde3/konqsidebar_universalamarok.so @@ -56,7 +55,6 @@ share/apps/amarok/data/firstrun.m3u share/apps/amarok/data/grid.png share/apps/amarok/data/magnatune_logo.png -share/apps/amarok/data/magnatune_start_page.html share/apps/amarok/data/wirl1.png share/apps/amarok/data/wirl2.png share/apps/amarok/icons/crystalsvg/16x16/actions/covermanager.png @@ -436,7 +434,6 @@ share/apps/amarok/images/currenttrack_repeat_small.png share/apps/amarok/images/currenttrack_stop.png share/apps/amarok/images/currenttrack_stop_small.png -share/apps/amarok/images/description.png share/apps/amarok/images/eq_active2.png share/apps/amarok/images/eq_inactive2.png share/apps/amarok/images/lastfm.png @@ -474,6 +471,7 @@ share/apps/amarok/ruby_lib/mongrel/debug.rb share/apps/amarok/ruby_lib/mongrel/handlers.rb share/apps/amarok/ruby_lib/mongrel/init.rb +share/apps/amarok/ruby_lib/mongrel/mime_types.yml share/apps/amarok/ruby_lib/mongrel/stats.rb share/apps/amarok/ruby_lib/mongrel/tcphack.rb share/apps/amarok/ruby_lib/rbconfig/datadir.rb @@ -990,6 +988,7 @@ share/locale/en_GB/LC_MESSAGES/amarok.mo share/locale/es/LC_MESSAGES/amarok.mo share/locale/et/LC_MESSAGES/amarok.mo +share/locale/fa/LC_MESSAGES/amarok.mo share/locale/fi/LC_MESSAGES/amarok.mo share/locale/fr/LC_MESSAGES/amarok.mo share/locale/ga/LC_MESSAGES/amarok.mo @@ -1016,6 +1015,7 @@ share/locale/ru/LC_MESSAGES/amarok.mo share/locale/rw/LC_MESSAGES/amarok.mo share/locale/sl/LC_MESSAGES/amarok.mo +share/locale/se/LC_MESSAGES/amarok.mo share/locale/sk/LC_MESSAGES/amarok.mo share/locale/sq/LC_MESSAGES/amarok.mo share/locale/sr/LC_MESSAGES/amarok.mo @@ -1072,12 +1072,20 @@ @dirrmtry share/locale/rw @dirrmtry share/locale/sl/LC_MESSAGES @dirrmtry share/locale/sl +@dirrmtry share/locale/se/LC_MESSAGES +@dirrmtry share/locale/se @dirrmtry share/locale/sk/LC_MESSAGES @dirrmtry share/locale/sk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr @dirrmtry share/locale/tg/LC_MESSAGES @dirrmtry share/locale/tg @dirrmtry share/locale/uk/LC_MESSAGES @dirrmtry share/locale/uk +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrm share/doc/HTML/sv/amarok @dirrm share/doc/HTML/ru/amarok @dirrm share/doc/HTML/pt_BR/amarok >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702031115.l13BFaZx073961>