[oe-commits] org.oe.oz354x mpd: fix mod patch

[justinp commit]

mpd: fix mod patch

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

#
# mt diff -raee04d125b0924614671ed6514dc4cc8136d36e3 -r27a4e0ca15d5c696b0c286bade691ba7ac47895f
#
# 
# 
# patch "packages/musicpd/mpd/fix-mod-support.patch"
#  from [391ded84893d74ea292968984c46e08113e4070b]
#    to [5b1ccdc5341f804b1cb646b02f3cd49eba57cfbf]
# 
# patch "packages/musicpd/mpd_svn.bb"
#  from [2c1609d44e5d7e8d7176e74db13c5773246c78da]
#    to [43be5f332243d59053b753ebcab76539642001d8]
# 
============================================================
--- packages/musicpd/mpd/fix-mod-support.patch	391ded84893d74ea292968984c46e08113e4070b
+++ packages/musicpd/mpd/fix-mod-support.patch	5b1ccdc5341f804b1cb646b02f3cd49eba57cfbf
@@ -1,21 +1,23 @@
-Index: trunk/src/inputPlugins/mod_plugin.c
+Index: mpd/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.orig/src/inputPlugins/mod_plugin.c
++++ mpd/src/inputPlugins/mod_plugin.c
+@@ -62,10 +62,16 @@ static MDRIVER drv_mpd = {
+ 	NULL,
+ 	"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,
++#endif
+ 	mod_mpd_IsThere,
  	VC_SampleLoad,
  	VC_SampleUnload,
- 	VC_SampleSpace,
============================================================
--- packages/musicpd/mpd_svn.bb	2c1609d44e5d7e8d7176e74db13c5773246c78da
+++ packages/musicpd/mpd_svn.bb	43be5f332243d59053b753ebcab76539642001d8
@@ -6,7 +6,7 @@ PV = "0.12.1+svn${SRCDATE}"
 DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2"
 SRCDATE = "20070120"
 PV = "0.12.1+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
            file://fix-mod-support.patch;patch=1"