aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-11-10 21:13:03 +0100
committerMax Kellermann <max@duempel.org>2009-11-10 21:13:03 +0100
commitde57c21a3bec43bffb3fc6a85197f5489e18168f (patch)
tree07486adadd9a580f2a883fc1f6617790f6408b39
parent84917721c77badab9101a47c92702f6d0e1950ca (diff)
parent93a13b42dd3d792a32c5e256d5172cf7647a3fc5 (diff)
downloadmpd-de57c21a3bec43bffb3fc6a85197f5489e18168f.tar.gz
mpd-de57c21a3bec43bffb3fc6a85197f5489e18168f.tar.xz
mpd-de57c21a3bec43bffb3fc6a85197f5489e18168f.zip
Merge branch 'v0.15.x'
Conflicts: src/input/lastfm_input_plugin.c src/song_save.c
-rw-r--r--NEWS7
-rw-r--r--configure.ac4
-rw-r--r--src/sticker.c4
3 files changed, 13 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 43731fcb7..bc571c032 100644
--- a/NEWS
+++ b/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)
diff --git a/configure.ac b/configure.ac
index fb2f6a916..8366a0a55 100644
--- a/configure.ac
+++ b/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)
diff --git a/src/sticker.c b/src/sticker.c
index 4cccd9399..4135e6293 100644
--- a/src/sticker.c
+++ b/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;
};