[oe-commits] org.oe.dev mpd: add pulse support, fix mod support

[justinp commit]

mpd: add pulse support, fix mod support

Author: justinp at openembedded.org
Branch: org.openembedded.dev
Revision: 91c70ca153938f4106fec31e305c039a3d1cc93c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=91c70ca153938f4106fec31e305c039a3d1cc93c
Files:
1
packages/musicpd/mpd/fix-mod-support.patch
packages/musicpd/mpd_svn.bb
Diffs:

#
# mt diff -r9e02c22d85d1c335a961df43f5c9fa4d184bb6ff -r91c70ca153938f4106fec31e305c039a3d1cc93c
#
# 
# 
# add_file "packages/musicpd/mpd/fix-mod-support.patch"
#  content [391ded84893d74ea292968984c46e08113e4070b]
# 
# patch "packages/musicpd/mpd_svn.bb"
#  from [853738aa7e87ac585b6e5d5736085624740c1b9c]
#    to [49ff874915b9e1d64d122ef79d42e4f7720d41d9]
# 
============================================================
--- packages/musicpd/mpd/fix-mod-support.patch	391ded84893d74ea292968984c46e08113e4070b
+++ packages/musicpd/mpd/fix-mod-support.patch	391ded84893d74ea292968984c46e08113e4070b
@@ -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,
============================================================
--- packages/musicpd/mpd_svn.bb	853738aa7e87ac585b6e5d5736085624740c1b9c
+++ packages/musicpd/mpd_svn.bb	49ff874915b9e1d64d122ef79d42e4f7720d41d9
@@ -1,13 +1,14 @@ SECTION = "console/multimedia"
 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"