mpd: massive update

7 files changed, 43 insertions, 46 deletions

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"