Tue Mar 16 19:28:50 2010 UTC ()
Update to 2.3.0, switch to mysql51-server for providing the embedded
mysql server.
Changes:
Team Amarok is proud to announce Amarok 2.3.0. It contains many
improvements and bugfixes over Amarok 2.2.2 as well as many new
features. Areas such as podcast support and saved playlists have
seen huge improvements, as has the support for USB mass storage
devices (including generic MP3 players).
With large parts of Amarok 2 becoming quite mature, it was also
time to start looking forward again. Therefore, this release also
contains a number of new features of a slightly more experimental
nature. These include a new main toolbar and a rewritten and much
simpler file browser. These parts are brand new and based on user
feedback, and they will change and improve over the next few
releases. The old slim toolbar is still available should you prefer
that, but we encourage you to try out the new toolbar and tell us
what you think. The file browser's look and feel now aligns more
closely with the rest of Amarok with improvements such as breadcrumb
navigation, and it is now focused on being a way to find and play
music instead of being a multi-purpose file manager.
The context menu of tracks in your playlist now offers a "show in
media sources" option, making it easier to find the same track
again in the collection browser for editing, moving or deleting
the file.
Podcasts have received a configuration dialog allowing you to change
the update interval as well as the location to store new downloaded
episodes. Podcasts and saved playlists are now also grouped by
source, and a merged view is available just like in your local
collection - perfect for those that don't care where their music
is coming from but simply want to listen to it. Now, when a new
source of playlists or podcasts becomes available, Amarok will
switch off merged view and show a collapsible list of your new
listening sources.
The Wikipedia applet now looks better and links have been fixed.
Internal links to other pages on Wikipedia will display in the
applet, and external links open a browser window.
In short, Team Amarok has been focusing hard on furthering our
long-term goal: making Amarok the best tool for immersing yourself
in music, no matter where it comes from.
(wiz)
diff -r1.79 -r1.80 pkgsrc/audio/amarok/Makefile
diff -r1.32 -r1.33 pkgsrc/audio/amarok/PLIST
diff -r1.38 -r1.39 pkgsrc/audio/amarok/distinfo
diff -r1.15 -r0 pkgsrc/audio/amarok/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/audio/amarok/patches/patch-ab
diff -r1.4 -r0 pkgsrc/audio/amarok/patches/patch-ac
--- pkgsrc/audio/amarok/Makefile 2010/02/16 09:01:46 1.79
+++ pkgsrc/audio/amarok/Makefile 2010/03/16 19:28:50 1.80
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.79 2010/02/16 09:01:46 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2010/03/16 19:28:50 wiz Exp $
#
DISTNAME= amarok-${VERS}
-VERS= 2.2.2
-PKGREVISION= 3
+VERS= 2.3.0
CATEGORIES= audio multimedia
#MASTER_SITES= http://download.kde.org/unstable/amarok/${VERS}/src/ \
# ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/
@@ -25,19 +24,19 @@
USE_LANGUAGES= c c++
USE_TOOLS+= msgfmt pkg-config
-CMAKE_ARGS+= -DMYSQL_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.mysql-embedded}/mysqld/include/mysql
-CMAKE_ARGS+= -DMYSQL_EMBEDDED_LIBRARIES:PATH=${BUILDLINK_PREFIX.mysql-embedded}/mysqld/lib/mysql/libmysqld.a
+CMAKE_ARGS+= -DMYSQL_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.mysql-client}/include/mysql
+CMAKE_ARGS+= -DMYSQL_EMBEDDED_LIBRARIES:PATH=${BUILDLINK_PREFIX.mysql-server}/lib/mysql/libmysqld.a
CMAKE_ARGS+= -DMYSQL_EMBEDDED_FOUND:BOOL=TRUE
CMAKE_ARGS+= -DHAVE_MYSQL_OPT_EMBEDDED_CONNECTION:BOOL=TRUE
-CMAKE_ARGS+= -DMYSQL_LIBRARIES:PATH=${BUILDLINK_PREFIX.mysql-embedded}/mysqld/lib/mysql/libmysqlclient.so
+CMAKE_ARGS+= -DMYSQL_LIBRARIES:PATH=${BUILDLINK_PREFIX.mysql-client}/lib/mysql/libmysqlclient.so
SUBST_CLASSES+= mysql
SUBST_STAGE.mysql= post-patch
SUBST_MESSAGE.mysql= Fixup paths for MySQL embedded
SUBST_FILES.mysql= cmake/modules/FindMySQLAmarok.cmake
-SUBST_FILES.mysql+= src/collection/mysqlecollection/CMakeLists.txt
-SUBST_SED.mysql= -e s:/opt/mysqle/:${BUILDLINK_PREFIX.mysql-embedded}/mysqld:
-SUBST_SED.mysql+= -e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-embedded}/mysqld/lib/mysql:
+SUBST_FILES.mysql+= src/collection/sqlcollection/mysqlecollection/CMakeLists.txt
+SUBST_SED.mysql= -e s:/opt/mysqle/:${BUILDLINK_PREFIX.mysql-server}:
+SUBST_SED.mysql+= -e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-server}/lib/mysql:
.include "options.mk"
@@ -45,7 +44,10 @@
BUILDLINK_API_DEPENDS.taglib+= taglib>=1.6nb1
.include "../../audio/taglib/buildlink3.mk"
.include "../../audio/taglib-extras/buildlink3.mk"
-.include "../../databases/mysql51-embedded/buildlink3.mk"
+BUILDLINK_API_DEPENDS.mysql-client+= mysql-client>=5.1.44nb1
+.include "../../databases/mysql51-client/buildlink3.mk"
+BUILDLINK_API_DEPENDS.mysql-server+= mysql-server>=5.1.44nb1
+.include "../../databases/mysql51-server/buildlink3.mk"
.include "../../devel/qtscriptgenerator/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../meta-pkgs/kde4/kde4.mk"
--- pkgsrc/audio/amarok/PLIST 2010/02/16 09:01:46 1.32
+++ pkgsrc/audio/amarok/PLIST 2010/03/16 19:28:50 1.33
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2010/02/16 09:01:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.33 2010/03/16 19:28:50 wiz Exp $
bin/amarok
bin/amarok_afttagger
bin/amarokcollectionscanner
@@ -38,6 +38,9 @@
lib/kde4/kcm_amarok_service_lastfm.so
lib/kde4/kcm_amarok_service_magnatunestore.so
lib/kde4/kcm_amarok_service_mp3tunes.so
+lib/libamarok-sqlcollection.so
+lib/libamarok-sqlcollection.so.1
+lib/libamarok-sqlcollection.so.1.0.0
lib/libamaroklib.so
lib/libamaroklib.so.1
lib/libamaroklib.so.1.0.0
@@ -491,11 +494,13 @@
share/kde4/services/amarok_service_mp3tunes.desktop
share/kde4/services/amarok_service_mp3tunes_config.desktop
share/kde4/services/amarok_service_opmldirectory.desktop
+share/kde4/services/amarokitpc.protocol
share/kde4/services/amaroklastfm.protocol
share/kde4/servicetypes/amarok_codecinstall.desktop
share/kde4/servicetypes/amarok_context_applet.desktop
share/kde4/servicetypes/amarok_data_engine.desktop
share/kde4/servicetypes/amarok_plugin.desktop
+share/locale/af/LC_MESSAGES/amarok.mo
share/locale/bg/LC_MESSAGES/amarok.mo
share/locale/bg/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/bg/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -504,6 +509,10 @@
share/locale/ca/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/ca/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/ca/LC_MESSAGES/amarokpkg.mo
+share/locale/ca@valencia/LC_MESSAGES/amarok.mo
+share/locale/ca@valencia/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/ca@valencia/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/ca@valencia/LC_MESSAGES/amarokpkg.mo
share/locale/cs/LC_MESSAGES/amarok.mo
share/locale/cs/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/cs/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -542,10 +551,6 @@
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/km/LC_MESSAGES/amarok.mo
-share/locale/km/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/km/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/km/LC_MESSAGES/amarokpkg.mo
share/locale/lv/LC_MESSAGES/amarok.mo
share/locale/lv/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/lv/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -577,10 +582,18 @@
share/locale/pt_BR/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/pt_BR/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/pt_BR/LC_MESSAGES/amarokpkg.mo
+share/locale/ro/LC_MESSAGES/amarok.mo
+share/locale/ro/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/ro/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/ro/LC_MESSAGES/amarokpkg.mo
share/locale/ru/LC_MESSAGES/amarok.mo
share/locale/ru/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/ru/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/ru/LC_MESSAGES/amarokpkg.mo
+share/locale/sk/LC_MESSAGES/amarok.mo
+share/locale/sk/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/sk/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/sk/LC_MESSAGES/amarokpkg.mo
share/locale/sl/LC_MESSAGES/amarok.mo
share/locale/sl/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/sl/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -589,11 +602,17 @@
share/locale/sr/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/sr/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/sr/LC_MESSAGES/amarokpkg.mo
+share/locale/sr@ijekavian/LC_MESSAGES/amarok.mo
+share/locale/sr@ijekavian/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/sr@ijekavian/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/sr@ijekavian/LC_MESSAGES/amarokpkg.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/sr@latin/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/sv/LC_MESSAGES/amarok.mo
share/locale/sv/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/sv/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/sv/LC_MESSAGES/amarokpkg.mo
+share/locale/th/LC_MESSAGES/amarok.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
--- pkgsrc/audio/amarok/distinfo 2010/02/16 09:01:46 1.38
+++ pkgsrc/audio/amarok/distinfo 2010/03/16 19:28:50 1.39
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.38 2010/02/16 09:01:46 wiz Exp $
+$NetBSD: distinfo,v 1.39 2010/03/16 19:28:50 wiz Exp $
-SHA1 (amarok-2.2.2.tar.bz2) = 2075299b856477cf55cba8ba983ea25a93dc139b
+SHA1 (amarok-2.3.0.tar.bz2) = 64856a21907d1ba7d198149a8a46276fc4cda7a6
-RMD160 (amarok-2.2.2.tar.bz2) = 0782c4b032d318179bd8bb91353f8e33772d2912
+RMD160 (amarok-2.3.0.tar.bz2) = ff2a7cea8ffbd0e6b08a9b37ab7529e1b1d43a37
-Size (amarok-2.2.2.tar.bz2) = 8788107 bytes
+Size (amarok-2.3.0.tar.bz2) = 9391281 bytes
-SHA1 (patch-aa) = 524a9563db17cbf5e234f2ebe261820326e5d30d
+SHA1 (patch-ab) = 91e6bf8a84d63832641b6270c6f5215baa8f139e
-SHA1 (patch-ab) = 62beea32f17ce6e138702e740d089c6257ddfced
-SHA1 (patch-ac) = c8c111d0927efe56a07ce89b2ec788a6364257aa
--- pkgsrc/audio/amarok/patches/Attic/patch-ab 2010/02/16 09:01:46 1.4
+++ pkgsrc/audio/amarok/patches/Attic/patch-ab 2010/03/16 19:28:50 1.5
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2010/02/16 09:01:46 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2010/03/16 19:28:50 wiz Exp $
---- src/collection/mysqlecollection/CMakeLists.txt.orig 2009-09-28 17:34:03.000000000 +0000
-+++ src/collection/mysqlecollection/CMakeLists.txt
-@@ -82,6 +82,7 @@ if(APPLE)
+--- src/collection/sqlcollection/mysqlecollection/CMakeLists.txt.orig 2010-03-10 23:12:15.000000000 +0000
++++ src/collection/sqlcollection/mysqlecollection/CMakeLists.txt
+@@ -49,6 +49,7 @@ if(APPLE)
SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
endif(APPLE)
+SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES LINK_FLAGS "@@WLR@@")
install(TARGETS amarok_collection-mysqlecollection DESTINATION ${PLUGIN_INSTALL_DIR} )
- install(FILES ../sqlcollection/org.kde.amarok.SqlCollection.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
+ install(FILES amarok_collection-mysqlecollection.desktop DESTINATION ${SERVICES_INSTALL_DIR})