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

[justinp commit]

mpd: fix mod patch

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

#
# mt diff -r41c933161d6d6b9287bca90aac6dda99f5c4afbe -rd4eb4ca83d3c296c262477a5a3f77d388d7a8ceb
#
# 
# 
# patch "packages/musicpd/mpd/fix-mod-support.patch"
#  from [391ded84893d74ea292968984c46e08113e4070b]
#    to [5b1ccdc5341f804b1cb646b02f3cd49eba57cfbf]
# 
# patch "packages/musicpd/mpd_svn.bb"
#  from [49ff874915b9e1d64d122ef79d42e4f7720d41d9]
#    to [5ce60606bda6d90729bed6457ccef52801bfbd3c]
# 
============================================================
--- 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	49ff874915b9e1d64d122ef79d42e4f7720d41d9
+++ packages/musicpd/mpd_svn.bb	5ce60606bda6d90729bed6457ccef52801bfbd3c
@@ -5,7 +5,7 @@ PV = "0.12.1+svn${SRCDATE}"
 DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio"
 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"