Merge branch 'v0.15.x'

NEWS

@@ -72,10 +72,17 @@ ver 0.16 (20??/??/??)
 
 
 ver 0.15.6 (2009/??/??)
+* input:
+  - lastfm: fixed variable name in GLib<2.16 code path
+  - input/mms: require libmms 0.4
+* archive:
+  - zzip: require libzzip 0.13
 * decoders:
   - ffmpeg: convert metadata
 * output_thread: check again if output is open on PAUSE
 * update: delete ignored symlinks from database
+* database: increased maximum line length to 32 kB
+* sticker: added fallback for sqlite3_prepare_v2()
 
 
 ver 0.15.5 (2009/10/18)

configure.ac

@@ -322,7 +322,7 @@ AC_ARG_ENABLE(mms,
 		[enable the MMS protocol with libmms]),,
 	[enable_mms=auto])
 
-MPD_AUTO_PKG(mms, MMS, [libmms],
+MPD_AUTO_PKG(mms, MMS, [libmms >= 0.4],
 	[libmms mms:// protocol support], [libmms not found])
 if test x$enable_mms = xyes; then
 	AC_DEFINE(ENABLE_MMS, 1,
@@ -358,7 +358,7 @@ AC_ARG_ENABLE(zip,
 		[enable zip archive support (default: disabled)]),,
 	enable_zip=no)
 
-MPD_AUTO_PKG(zip, ZZIP, [zziplib],
+MPD_AUTO_PKG(zip, ZZIP, [zziplib >= 0.13],
 	[libzzip archive library], [libzzip not found])
 
 AM_CONDITIONAL(HAVE_ZIP, test x$enable_zip = xyes)

src/sticker.c

@@ -27,6 +27,10 @@
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "sticker"
 
+#if SQLITE_VERSION_NUMBER < 3003009
+#define sqlite3_prepare_v2 sqlite3_prepare
+#endif
+
 struct sticker {
 	GHashTable *table;
 };