musicpd: update to 0.12.1

5 files changed, 6 insertions, 70 deletions

diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb
deleted file mode 100644
index 8d3eaa183a..0000000000
--- a/packages/musicpd/mpc_0.11.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client"
-HOMEPAGE = "http://www.musicpd.org/mpc.shtml"
-SECTION = "console/multimedia"
-LICENSE = "GPLv2"
-PR = "r1"
-
-SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz"
-EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \
-		--with-iconv-includes=${STAGING_INCDIR}"
-
-inherit autotools
diff --git a/packages/musicpd/mpc_0.12.0.bb b/packages/musicpd/mpc_0.12.1.bb
index ccd6926fcd..ccd6926fcd 100644
--- a/packages/musicpd/mpc_0.12.0.bb
+++ b/packages/musicpd/mpc_0.12.1.bb
diff --git a/packages/musicpd/mpd_0.11.2.bb b/packages/musicpd/mpd_0.11.2.bb
deleted file mode 100644
index 9d3c5f90b0..0000000000
--- a/packages/musicpd/mpd_0.11.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Music Player Daemon (mpd)"
-HOMEPAGE = "http://www.musicpd.org"
-SECTION = "console/multimedia"
-LICENSE = "GPLv2"
-DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz"
-
-inherit autotools
-
-# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
-# be built, instead we use the OE built versions which should be installed
-# in staging - remove the --with and replace with --enable to use the local
-# versions.
-
-EXTRA_OECONF = "--enable-ogg \
-		--with-id3tag-libraries=${STAGING_LIBDIR} \
-		--with-id3tag-includes=${STAGING_INCDIR} \
-		--with-mad-libraries=${STAGING_LIBDIR} \
-		--with-mad-includes=${STAGING_INCDIR} \
-		--without-faad"
diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb
deleted file mode 100644
index 7a1d17ef5d..0000000000
--- a/packages/musicpd/mpd_0.11.5.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Music Player Daemon (mpd)"
-HOMEPAGE = "http://www.musicpd.org"
-SECTION = "console/multimedia"
-LICENSE = "GPLv2"
-DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2"
-PR = "r8"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
-           file://save-volume-state.patch;patch=1"
-
-inherit autotools
-
-# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
-# be built, instead we use the OE built versions which should be installed
-# in staging - remove the --with and replace with --enable to use the local
-# versions.
-
-EXTRA_OECONF = "--enable-ogg \
-		--with-iconv-libraries=${STAGING_LIBDIR} \
-		--with-iconv-includes=${STAGING_INCDIR} \
-		--with-vorbis-libraries=${STAGING_LIBDIR} \
-		--with-vorbis-includes=${STAGING_INCDIR} \
-		--with-ogg-libraries=${STAGING_LIBDIR} \
-		--with-ogg-includes=${STAGING_INCDIR} \
-		--with-ao-libraries=${STAGING_LIBDIR} \
-		--with-ao-includes=${STAGING_INCDIR} \
-		--with-id3tag-libraries=${STAGING_LIBDIR} \
-		--with-id3tag-includes=${STAGING_INCDIR} \
-		--with-mad-libraries=${STAGING_LIBDIR} \
-		--with-mad-includes=${STAGING_INCDIR} \
-        --with-faad-libraries=${STAGING_LIBDIR} \
-		--with-faad-includes=${STAGING_INCDIR}"
diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb
index 04ddf8fdc3..673ff03b98 100644
--- a/packages/musicpd/mpd_svn.bb
+++ b/packages/musicpd/mpd_svn.bb
@@ -3,23 +3,24 @@ HOMEPAGE = "http://www.musicpd.org"
 SECTION = "console/multimedia"
 LICENSE = "GPLv2"
 DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio"
-SRCDATE = "20070120"
 PV = "0.12.1+svn${SRCDATE}"
-PR = "r2"
+PR = "r0"
 
 SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
-           file://fix-mod-support.patch;patch=1;maxdate=20070302"
+           file://mpd/mpd.init"
 #           file://save-volume-state.patch;patch=1"
 S = "${WORKDIR}/trunk"
 
-inherit autotools
+inherit autotools update-rc.d
+INITSCRIPT_NAME = "mpd"
 
 # Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
 # be built, instead we use the OE built versions which should be installed
 # in staging - remove the --with and replace with --enable to use the local
 # versions.
 
-EXTRA_OECONF = "--enable-ogg \
+EXTRA_OECONF = "\
+		--enable-ogg \
 		--with-id3tag-libraries=${STAGING_LIBDIR} \
 		--with-id3tag-includes=${STAGING_INCDIR} \
 		--with-mad-libraries=${STAGING_LIBDIR} \