summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2007-01-27 22:32:20 +0000
committerJustin Patrin <papercrane@gmail.com>2007-01-27 22:32:20 +0000
commit5f953ef49e4be710792f1bd829d540d986a20952 (patch)
treee9e9e108726a8aa963332891039be7d32fae83c0 /packages
parent3e37a0c55a6f7232bc2e02ef81829dd9874a8c6e (diff)
mpd: add pulse support, fix mod support
Diffstat (limited to 'packages')
-rw-r--r--packages/musicpd/mpd/fix-mod-support.patch21
-rw-r--r--packages/musicpd/mpd_svn.bb9
2 files changed, 26 insertions, 4 deletions
diff --git a/packages/musicpd/mpd/fix-mod-support.patch b/packages/musicpd/mpd/fix-mod-support.patch
new file mode 100644
index 0000000000..bbf0513e58
--- /dev/null
+++ b/packages/musicpd/mpd/fix-mod-support.patch
@@ -0,0 +1,21 @@
+Index: trunk/src/inputPlugins/mod_plugin.c
+===================================================================
+--- trunk.orig/src/inputPlugins/mod_plugin.c
++++ trunk/src/inputPlugins/mod_plugin.c
+@@ -64,9 +64,13 @@ static MDRIVER drv_mpd = {
+ "MPD Output Driver v0.1",
+ 0,
+ 255,
+- "mpd",
+- NULL,
+- mod_mpd_IsThere,
++#if (LIBMIKMOD_VERSION > 0x030106)
++ "mpd", /* alias */
++ NULL, /* cmd help line*/
++#endif
++#if (LIBMIKMOD_VERSION >= 0x030200)
++ NULL, /*Command Line */
++#endif mod_mpd_IsThere,
+ VC_SampleLoad,
+ VC_SampleUnload,
+ VC_SampleSpace,
diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb
index bc10a923fb..a9c30b2104 100644
--- a/packages/musicpd/mpd_svn.bb
+++ b/packages/musicpd/mpd_svn.bb
@@ -2,12 +2,13 @@ DESCRIPTION = "Music Player Daemon (mpd)"
HOMEPAGE = "http://www.musicpd.org"
LICENSE = "GPLv2"
SECTION = "console/multimedia"
-DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2"
+DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio"
SRCDATE = "20070120"
PV = "0.12.1+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
-SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https"
+SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
+ file://fix-mod-support.patch;patch=1"
# file://save-volume-state.patch;patch=1"
S = "${WORKDIR}/trunk"
@@ -26,7 +27,7 @@ EXTRA_OECONF = "--enable-ogg \
--with-faad-libraries=${STAGING_LIBDIR} \
--with-faad-includes=${STAGING_INCDIR} \
--disable-jack \
- --disable-pulse \
+ --enable-pulse \
--enable-mod \
--disable-oggflac"