xmms2: adopted and updated

3 files changed, 44 insertions, 49 deletions

diff --git a/xmms2/.footprint b/xmms2/.footprint
index f4aadae30..b7fe1a8db 100644
--- a/xmms2/.footprint
+++ b/xmms2/.footprint
@@ -1,9 +1,13 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/nyxmms2
+-rwxr-xr-x	root/root	usr/bin/vistest
+-rwxr-xr-x	root/root	usr/bin/vistest-fft
 -rwxr-xr-x	root/root	usr/bin/xmms2
 -rwxr-xr-x	root/root	usr/bin/xmms2-et
 -rwxr-xr-x	root/root	usr/bin/xmms2-launcher
 -rwxr-xr-x	root/root	usr/bin/xmms2-mlib-updater
+-rwxr-xr-x	root/root	usr/bin/xmms2-ripper
 -rwxr-xr-x	root/root	usr/bin/xmms2d
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/xmms2/
@@ -23,10 +27,9 @@ drwxr-xr-x	root/root	usr/include/xmms2/xmms/
 -rw-r--r--	root/root	usr/include/xmms2/xmms/xmms_util.h
 -rw-r--r--	root/root	usr/include/xmms2/xmms/xmms_xformplugin.h
 drwxr-xr-x	root/root	usr/include/xmms2/xmmsc/
--rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsc_coll.h
+-rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsc_compiler.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsc_errorcodes.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsc_idnumbers.h
--rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsc_inline.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsc_ipc_msg.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsc_ipc_transport.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsc_sockets.h
@@ -36,6 +39,9 @@ drwxr-xr-x	root/root	usr/include/xmms2/xmmsc/
 -rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsc_strlist.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsc_unistd.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsc_util.h
+-rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsc_visualization.h
+-rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsv.h
+-rw-r--r--	root/root	usr/include/xmms2/xmmsc/xmmsv_coll.h
 drwxr-xr-x	root/root	usr/include/xmms2/xmmsclient/
 -rw-r--r--	root/root	usr/include/xmms2/xmmsclient/xmmsclient++-glib.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsclient/xmmsclient++.h
@@ -60,69 +66,58 @@ drwxr-xr-x	root/root	usr/include/xmms2/xmmsclient/xmmsclient++/
 -rw-r--r--	root/root	usr/include/xmms2/xmmsclient/xmmsclient++/typedefs.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsclient/xmmsclient++/xform.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsclient/xmmsclient-cf.h
+-rw-r--r--	root/root	usr/include/xmms2/xmmsclient/xmmsclient-ecore.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsclient/xmmsclient-glib.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsclient/xmmsclient-qt.h
 -rw-r--r--	root/root	usr/include/xmms2/xmmsclient/xmmsclient.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libxmmsclient++-glib.so -> libxmmsclient++-glib.so.1
+lrwxrwxrwx	root/root	usr/lib/libxmmsclient++-glib.so -> libxmmsclient++-glib.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/libxmmsclient++-glib.so.1 -> libxmmsclient++-glib.so.1.0.0
 -rw-r--r--	root/root	usr/lib/libxmmsclient++-glib.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libxmmsclient-glib.so -> libxmmsclient-glib.so.1
+lrwxrwxrwx	root/root	usr/lib/libxmmsclient-glib.so -> libxmmsclient-glib.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/libxmmsclient-glib.so.1 -> libxmmsclient-glib.so.1.0.0
 -rw-r--r--	root/root	usr/lib/libxmmsclient-glib.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libxmmsclient.so -> libxmmsclient.so.4
-lrwxrwxrwx	root/root	usr/lib/libxmmsclient.so.4 -> libxmmsclient.so.4.0.0
--rw-r--r--	root/root	usr/lib/libxmmsclient.so.4.0.0
+lrwxrwxrwx	root/root	usr/lib/libxmmsclient.so -> libxmmsclient.so.5.0.0
+lrwxrwxrwx	root/root	usr/lib/libxmmsclient.so.5 -> libxmmsclient.so.5.0.0
+-rw-r--r--	root/root	usr/lib/libxmmsclient.so.5.0.0
 drwxr-xr-x	root/root	usr/lib/perl5/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/Audio/
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/Audio/XMMSClient.pm
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/Audio/XMMSClient/
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/Audio/XMMSClient/Collection.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/Audio/XMMSClient/Glib.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/Audio/XMMSClient/Sync.pm
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/Audio/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/Audio/XMMSClient/
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/Audio/XMMSClient/XMMSClient.so
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux-thread-multi/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux-thread-multi/Audio/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux-thread-multi/Audio/Collection.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux-thread-multi/Audio/Glib.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux-thread-multi/Audio/Sync.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux-thread-multi/Audio/XMMSClient.pm
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux-thread-multi/auto/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux-thread-multi/auto/Audio/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux-thread-multi/auto/Audio/XMMSClient/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux-thread-multi/auto/Audio/XMMSClient/XMMSClient.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmms2-client-cpp-glib.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmms2-client-glib.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmms2-client.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmms2-plugin.pc
-drwxr-xr-x	root/root	usr/lib/ruby/
-drwxr-xr-x	root/root	usr/lib/ruby/site_ruby/
-drwxr-xr-x	root/root	usr/lib/ruby/site_ruby/1.8/
-drwxr-xr-x	root/root	usr/lib/ruby/site_ruby/1.8/linux/
--rw-r--r--	root/root	usr/lib/ruby/site_ruby/1.8/linux/xmmsclient_ext.so
--rw-r--r--	root/root	usr/lib/ruby/site_ruby/1.8/linux/xmmsclient_glib.so
--rw-r--r--	root/root	usr/lib/ruby/site_ruby/1.8/xmmsclient.rb
-drwxr-xr-x	root/root	usr/lib/ruby/site_ruby/1.8/xmmsclient/
--rw-r--r--	root/root	usr/lib/ruby/site_ruby/1.8/xmmsclient/async.rb
--rw-r--r--	root/root	usr/lib/ruby/site_ruby/1.8/xmmsclient/sync.rb
 drwxr-xr-x	root/root	usr/lib/xmms2/
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_airplay.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_alsa.so
+-rw-r--r--	root/root	usr/lib/xmms2/libxmms_apefile.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_asf.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_asx.so
--rw-r--r--	root/root	usr/lib/xmms2/libxmms_avcodec.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_cue.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_curl.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_daap.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_diskwrite.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_equalizer.so
--rw-r--r--	root/root	usr/lib/xmms2/libxmms_faad.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_file.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_flac.so
+-rw-r--r--	root/root	usr/lib/xmms2/libxmms_flv.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_gme.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_gvfs.so
+-rw-r--r--	root/root	usr/lib/xmms2/libxmms_html.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_icymetaint.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_id3v2.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_karaoke.so
--rw-r--r--	root/root	usr/lib/xmms2/libxmms_lastfm.so
--rw-r--r--	root/root	usr/lib/xmms2/libxmms_lastfmeta.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_m3u.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_mad.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_mp4.so
@@ -131,16 +126,16 @@ drwxr-xr-x	root/root	usr/lib/xmms2/
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_nulstripper.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_oss.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_pls.so
--rw-r--r--	root/root	usr/lib/xmms2/libxmms_pulse.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_replaygain.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_rss.so
--rw-r--r--	root/root	usr/lib/xmms2/libxmms_samba.so
+-rw-r--r--	root/root	usr/lib/xmms2/libxmms_tta.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_vorbis.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_wave.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_xml.so
 -rw-r--r--	root/root	usr/lib/xmms2/libxmms_xspf.so
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/nyxmms2.1.gz
 -rw-r--r--	root/root	usr/man/man1/xmms2-et.1.gz
 -rw-r--r--	root/root	usr/man/man1/xmms2-launcher.1.gz
 -rw-r--r--	root/root	usr/man/man1/xmms2.1.gz
diff --git a/xmms2/.md5sum b/xmms2/.md5sum
index 8c59e5f4c..71124aeb1 100644
--- a/xmms2/.md5sum
+++ b/xmms2/.md5sum
@@ -1,2 +1 @@
-7cb8831f1e3cc01444b249a79ebd91fb  avcodec.patch
-9033ef15be9069ef43aeb4b6360a4d36  xmms2-0.5DrLecter.tar.bz2
+954fb9c76b5db5e324a105e81b273200  xmms2-0.6DrMattDestruction.tar.bz2
diff --git a/xmms2/Pkgfile b/xmms2/Pkgfile
index e1d116d26..f06932f1d 100644
--- a/xmms2/Pkgfile
+++ b/xmms2/Pkgfile
@@ -1,21 +1,22 @@
 # Description: Second generation of the XMMS music player
-# URL: http://xmms2.sourceforge.net
-# Maintainer: Rene Lengwinat, rugek at dirtyhack dot net
-# Depends on: libmad, sqlite3, python, ffmpeg, faad2
-# Nice to have: alsa-lib, curl, ecore, pyrex, ruby, samba
+# URL:         http://xmms2.sourceforge.net
+# Maintainer:  Bartlomiej Palmowski, rotwang at crux dot org dot pl
+# Packager:    Rene Lengwinat, rugek at dirtyhack dot net
+# Depends on:  libmad sqlite3 python 
+# Nice2have:   ecore pyrex ruby samba ffmpeg faad2
+# Comment:     ffmpeg and faad2 are broken at the moment because of libmp4v2
 
 name=xmms2
-version=0.5DrLecter
+version=0.6
 release=1
+_codename=DrMattDestruction
 
-source=(http://heanet.dl.sourceforge.net/sourceforge/xmms2/$name-$version.tar.bz2 \
-avcodec.patch)
+source=(http://dfn.dl.sourceforge.net/project/$name/$name/${version}%20$_codename/$name-$version$_codename.tar.bz2)
 
 build () {
-  cd $name-$version
-  patch -p1 < $SRC/avcodec.patch
+    cd $name-$version$_codename
 
-  ./waf --prefix=/usr --with-mandir=/usr/man configure
-  ./waf build
-  ./waf --destdir=$PKG install
+    ./waf --prefix=/usr --with-mandir=/usr/man -p configure
+    ./waf build
+    ./waf --destdir=$PKG install
 }