aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--multimedia/bmpx/Makefile3
-rw-r--r--multimedia/bmpx/distinfo6
-rw-r--r--multimedia/bmpx/files/patch-src-lastfm.cc33
-rw-r--r--multimedia/bmpx/pkg-plist12
4 files changed, 47 insertions, 7 deletions
diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index 524babd0243b..a7d0d4176ebb 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bmpx
-PORTVERSION= 0.40.0
+PORTVERSION= 0.40.1
CATEGORIES= multimedia
MASTER_SITES= http://files.beep-media-player.org/releases/0.40/
@@ -40,6 +40,7 @@ USE_GNOME= gtk20 libglade2 desktopfileutils
INSTALLS_ICONS= yes
USE_GSTREAMER= good mp3 ogg vorbis cdparanoia
USE_LDCONFIG= yes
+USE_SQLITE= 3
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \
--with-dbus-services-dir="${PREFIX}/share/dbus-1/services" \
diff --git a/multimedia/bmpx/distinfo b/multimedia/bmpx/distinfo
index 3cf04b5c3f35..8dec6de979b2 100644
--- a/multimedia/bmpx/distinfo
+++ b/multimedia/bmpx/distinfo
@@ -1,3 +1,3 @@
-MD5 (bmpx-0.40.0.tar.bz2) = acae0b6e42202ce6b3688725f6488e30
-SHA256 (bmpx-0.40.0.tar.bz2) = 57902bac23247bb987be91ed72b55a57aa2afb77219d397b9d12a396e58d9d62
-SIZE (bmpx-0.40.0.tar.bz2) = 1783485
+MD5 (bmpx-0.40.1.tar.bz2) = 0bcc992610a9c700b2fef4337e194f7a
+SHA256 (bmpx-0.40.1.tar.bz2) = ccbaf3b0520f993ec96e54912fcf15e9feef05d37456cb235f86821ca1f5dc67
+SIZE (bmpx-0.40.1.tar.bz2) = 1793356
diff --git a/multimedia/bmpx/files/patch-src-lastfm.cc b/multimedia/bmpx/files/patch-src-lastfm.cc
new file mode 100644
index 000000000000..daaa5e47a025
--- /dev/null
+++ b/multimedia/bmpx/files/patch-src-lastfm.cc
@@ -0,0 +1,33 @@
+--- src/lastfm.cc.orig 2007-08-13 11:41:28.000000000 +0200
++++ src/lastfm.cc 2007-08-13 11:41:17.000000000 +0200
+@@ -607,7 +607,7 @@
+ Radio::get_xspf_playlist ()
+ {
+ XSPF::Playlist playlist;
+- std::string uri ((boost::format ("http://%s/%s/xspf.php?sk=%s&discovery=%d&desktop=1.3.0.58")
++ std::string uri ((boost::format ("http://%s%s/xspf.php?sk=%s&discovery=%d&desktop=1.3.0.58")
+ % m_session.base_url
+ % m_session.base_path
+ % m_session.session
+@@ -618,6 +618,8 @@
+
+ if (code == 401)
+ {
++ m_connected = false;
++ signal_disconnected_.emit ();
+ throw LastFMStreamTuningError (_( "Invalid Session, please re-handshake." ));
+ }
+
+@@ -1023,6 +1025,12 @@
+ void
+ Scrobbler::scrobble_request_run ()
+ {
++ if (!Network::check_connected())
++ {
++ save_lqm (m_queue_filename);
++ return;
++ }
++
+ static boost::format
+ f_queue_head ("s=%s&");
+ static boost::format
diff --git a/multimedia/bmpx/pkg-plist b/multimedia/bmpx/pkg-plist
index c0e56a297ffb..06b504fb8521 100644
--- a/multimedia/bmpx/pkg-plist
+++ b/multimedia/bmpx/pkg-plist
@@ -6,6 +6,9 @@ bin/bmp-play-lastfm-2.0
bin/bmp2
include/bmp-2.0/bmp/bmp.hh
include/bmp-2.0/bmp/dbus.hh
+lib/libbmp_id3v2_reader.so.0
+lib/libbmp_id3v2_reader.so
+lib/libbmp_id3v2_reader.la
lib/bmpx/plugins/taglib/libtaglib_plugin_flac.la
lib/bmpx/plugins/taglib/libtaglib_plugin_flac.so
lib/bmpx/plugins/taglib/libtaglib_plugin_flac.so.0
@@ -15,15 +18,18 @@ lib/bmpx/plugins/taglib/libtaglib_plugin_mp3.so.0
%%MPEG4IP%%lib/bmpx/plugins/taglib/libtaglib_plugin_mp4.la
%%MPEG4IP%%lib/bmpx/plugins/taglib/libtaglib_plugin_mp4.so
%%MPEG4IP%%lib/bmpx/plugins/taglib/libtaglib_plugin_mp4.so.0
+lib/bmpx/plugins/taglib/libtaglib_plugin_mp4.la
+lib/bmpx/plugins/taglib/libtaglib_plugin_mp4.so
+lib/bmpx/plugins/taglib/libtaglib_plugin_mp4.so.0
lib/bmpx/plugins/taglib/libtaglib_plugin_mpc.la
lib/bmpx/plugins/taglib/libtaglib_plugin_mpc.so
lib/bmpx/plugins/taglib/libtaglib_plugin_mpc.so.0
lib/bmpx/plugins/taglib/libtaglib_plugin_ogg.la
lib/bmpx/plugins/taglib/libtaglib_plugin_ogg.so
lib/bmpx/plugins/taglib/libtaglib_plugin_ogg.so.0
-lib/bmpx/plugins/taglib/libtaglib_plugin_wma.la
-lib/bmpx/plugins/taglib/libtaglib_plugin_wma.so
-lib/bmpx/plugins/taglib/libtaglib_plugin_wma.so.0
+lib/bmpx/plugins/taglib/libtaglib_plugin_asf.la
+lib/bmpx/plugins/taglib/libtaglib_plugin_asf.so
+lib/bmpx/plugins/taglib/libtaglib_plugin_asf.so.0
lib/bmpx/plugins/vfs/container/libcontainer_folder.la
lib/bmpx/plugins/vfs/container/libcontainer_folder.so
lib/bmpx/plugins/vfs/container/libcontainer_folder.so.0