mpd: massive update

8 files changed, 59 insertions, 46 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 1b78cd0c2d..a3309b2e39 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -7254,6 +7254,10 @@ sha256=cacf881ccdbc3fe5568636bf279392b5d339a481a5fb2c03d5c70a2de58f7407
 md5=dbbb1880feb8b9c2493ece670520299b
 sha256=7b47fd0d2e5a2f2d626b3e9e903ff8a0c0ce7c926925944dcea1f9ca3e6cfda1
 
+[http://downloads.sourceforge.net/musicpd/gmpc-0.17.96.tar.gz]
+md5=8876ca25ae70a379b62b6b407dc4f5ba
+sha256=c04149c5ea4325bf63a847649d9ae5e0ed9b3b6b1804856753b756782e02329c
+
 [http://downloads.sourceforge.net/gmpy/gmpy-sources-101.zip]
 md5=7b2e951912d4bee9613c35244ca32673
 sha256=5cd061fa5d4906d6aa7183393c98d070dc689cbb946c13bebab6d6e4ecdc2231
@@ -12590,6 +12594,10 @@ sha256=ef2269cc4ba5c8574d38321349d76063c6b200857f0c9256ea97e608583e8857
 md5=7f7a060e83b4278acf4b77d7a7b9d2c0
 sha256=4bd54929a80850754f27b568d7891e1e3e1b8d2f208d371f27d1fda09e6f12a8
 
+[http://downloads.sourceforge.net/musicpd/libmpd-0.17.96.tar.gz]
+md5=dfbe478c4d4e9bf8e450c7349e104e2a
+sha256=f7e11c6137a1628d63985799ebcb78577832fca3ca4aeb2fc53d0e667cf699c0
+
 [http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.2.tar.gz]
 md5=54935c6cff42df2f1daada267b701392
 sha256=18f0e2df191219c29b47dc12b4b06b5be7eaeef34b3436156547e5a9f4eb51c1
@@ -15358,6 +15366,10 @@ sha256=55bdff5fefa619682c4da7cf25c8e1281f21f405e98580b24d3cfb7ff781a87d
 md5=a93a390315aacfec061c8df89fb5e35f
 sha256=76e151048a736cf490630ace4909f2d4b65f1afe2447c7fd794d270eb956e045
 
+[http://downloads.sourceforge.net/musicpd/mpc-0.15.tar.bz2]
+md5=48897aeb3a7ee5c64f30e56789f105a8
+sha256=7b549ca4af77fc5b0472df1ecd9e76d2f8415258ddcfb63dfa64a55a04e1e590
+
 [http://downloads.sourceforge.net/musicpd/mpd-0.11.2.tar.gz]
 md5=b6e913dc4b63b161bb1b96030763c3a7
 sha256=e784f78b3cce93367c105619c690465b78a88d3e4c616cc829f4cb5e66f2bbe0
@@ -15370,6 +15382,10 @@ sha256=30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
 md5=1a9a1a9d31f00a43838b3752024f7ebe
 sha256=30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
 
+[http://downloads.sourceforge.net/musicpd/mpd-0.14.2.tar.bz2]
+md5=66817a4b4c05454e6488f6b821f2a6a3
+sha256=0b3926a141873f179efc3c3b9d296b65d332dbb898340ac5e5d1dd0c3dd9fb20
+
 [http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.0b.tar.gz]
 md5=52d10ea80595ec83d8557ba7ac6dc8e6
 sha256=9416376952812e5b479745d67a2bf874fbcad10137517314ce7de37abb756df8
diff --git a/packages/musicpd/gmpc_0.13.0.bb b/packages/musicpd/gmpc_0.13.0.bb
deleted file mode 100644
index f8c99efb36..0000000000
--- a/packages/musicpd/gmpc_0.13.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "GTK+ Frontend for mpd"
-HOMEPAGE = "http://www.musicpd.org/gmpc.shtml"
-SECTION = "x11/multimedia"
-LICENSE = "GPLv2"
-DEPENDS = "libmpd gtk+ libglade gnome-vfs"
-PR = "r0"
-
-SRC_URI = "http://download.qballcow.nl/programs/gmpc-0.13/gmpc-${PV}.tar.gz"
-
-LDFLAGS += "-export-dynamic"
-
-inherit autotools
diff --git a/packages/musicpd/gmpc_0.17.96.bb b/packages/musicpd/gmpc_0.17.96.bb
new file mode 100644
index 0000000000..4f9e23d205
--- /dev/null
+++ b/packages/musicpd/gmpc_0.17.96.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "GTK+ Frontend for mpd"
+HOMEPAGE = "http://www.musicpd.org/gmpc.shtml"
+SECTION = "x11/multimedia"
+LICENSE = "GPLv2"
+DEPENDS = "curl libsexy gob2-native gob2 libmpd gtk+ libglade gnome-vfs"
+PR = "r0"
+
+inherit gnome
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/gmpc-${PV}.tar.gz"
+
+LDFLAGS += "-export-dynamic"
+
+do_configure() {
+	sed -i -e s:'head -1':'head -n1':g configure
+    gnu-configize
+	oe_runconf
+}
+
+FILES_${PN} += "${datadir}/icons"
+
+
diff --git a/packages/musicpd/libmpd_0.17.96.bb b/packages/musicpd/libmpd_0.17.96.bb
new file mode 100644
index 0000000000..0d325f604f
--- /dev/null
+++ b/packages/musicpd/libmpd_0.17.96.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Music Player Daemon (mpd) library"
+HOMEPAGE = "http://www.musicpd.org"
+SECTION = "libs/multimedia"
+LICENSE = "GPLv2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/libmpd-${PV}.tar.gz"
+
+inherit autotools_stage
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+
diff --git a/packages/musicpd/libmpd_svn.bb b/packages/musicpd/libmpd_svn.bb
deleted file mode 100644
index 4c78eb15f4..0000000000
--- a/packages/musicpd/libmpd_svn.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Music Player Daemon (mpd) library"
-HOMEPAGE = "http://www.musicpd.org"
-SECTION = "libs/multimedia"
-LICENSE = "GPLv2"
-SRCDATE = "20070120"
-PV = "0.0.0+svn${SRCDATE}"
-
-SRC_URI = "svn://svn.musicpd.org/libmpd;module=trunk;proto=https"
-S = "${WORKDIR}/trunk"
-
-inherit autotools pkgconfig
-
-do_stage_append() {
-    oe_libinstall -C src libmpd ${STAGING_LIBDIR}
-    install -d ${STAGING_INCDIR}/libmpd
-    cd src
-    for i in *.h; do
-        install -m 0644 $i ${STAGING_INCDIR}/libmpd/$i
-    done
-    cd ..
-}
diff --git a/packages/musicpd/mpc_0.12.1.bb b/packages/musicpd/mpc_0.15.bb
index ccd6926fcd..738b6d4be2 100644
--- a/packages/musicpd/mpc_0.12.1.bb
+++ b/packages/musicpd/mpc_0.15.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.musicpd.org/mpc.shtml"
 SECTION = "console/multimedia"
 LICENSE = "GPLv2"
 
-SRC_URI = "http://www.musicpd.org/uploads/files/mpc-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpc-${PV}.tar.bz2"
 EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \
 		--with-iconv-includes=${STAGING_INCDIR}"
 
diff --git a/packages/musicpd/mpd-alsa_svn.bb b/packages/musicpd/mpd-alsa_0.14.2.bb
index 9890c85831..696004e2d8 100644
--- a/packages/musicpd/mpd-alsa_svn.bb
+++ b/packages/musicpd/mpd-alsa_0.14.2.bb
@@ -5,15 +5,11 @@ LICENSE = "GPLv2"
 DEPENDS = "libvorbis libogg libao-alsa zlib flac audiofile virtual/libiconv faad2 \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
 RDEPENDS = "libao-alsa"
-PV = "0.11.5+svnr${SRCREV}"
-PR = "r2"
 
-SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
-		file://mpd/mpd.init"
-#           file://mpd/save-volume-state.patch;patch=1 \
-
-S = "${WORKDIR}/trunk"
+SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \
+file://mpd/mpd.init"
 
+S = "${WORKDIR}/mpd-${PV}"
 inherit autotools update-rc.d
 INITSCRIPT_NAME = "mpd"
 
@@ -52,6 +48,10 @@ EXTRA_OECONF = "\
 --disable-libmikmodtest \
 "
 
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+}
+
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 755 ${WORKDIR}/mpd/mpd.init ${D}${sysconfdir}/init.d/mpd
diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_0.14.2.bb
index c7d9a5b00a..80a4857bcb 100644
--- a/packages/musicpd/mpd_svn.bb
+++ b/packages/musicpd/mpd_0.14.2.bb
@@ -4,13 +4,9 @@ SECTION = "console/multimedia"
 LICENSE = "GPLv2"
 DEPENDS = "libvorbis libogg libao zlib libmikmod flac audiofile virtual/libiconv faad2 pulseaudio \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
-PV = "0.12.1+svn${SRCDATE}"
-PR = "r1"
 
-SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
+SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \
            file://mpd/mpd.init"
-#           file://save-volume-state.patch;patch=1"
-S = "${WORKDIR}/trunk"
 
 inherit autotools update-rc.d
 INITSCRIPT_NAME = "mpd"