Merge branch 'v0.21.x'

NEWS

@@ -32,6 +32,11 @@ ver 0.22 (not yet released)
 * switch to C++17
   - GCC 7 or clang 4 (or newer) recommended
 
+ver 0.21.17 (not yet released)
+* outputs
+  - jack: mark ports as terminal
+* fix build failure with -Ddatabase=false
+
 ver 0.21.16 (2019/10/16)
 * queue
   - fix relative destination offset when moving a range

android/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="39"
+          android:versionCode="40"
-          android:versionName="0.21.16">
+          android:versionName="0.21.17">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>
 

meson.build

@@ -401,8 +401,11 @@ endif
 if archive_glue_dep.found()
   sources += [
     'src/TagArchive.cxx',
-    'src/db/update/Archive.cxx',
   ]
+
+  if enable_database
+    sources += ['src/db/update/Archive.cxx']
+  endif
 endif
 
 if is_windows

python/build/libs.py

@@ -112,8 +112,8 @@ liblame = AutotoolsProject(
 )
 
 ffmpeg = FfmpegProject(
-    'http://ffmpeg.org/releases/ffmpeg-4.2.tar.xz',
+    'http://ffmpeg.org/releases/ffmpeg-4.2.1.tar.xz',
-    '023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe8524dac4fedecd5',
+    'cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4',
     'lib/libavcodec.a',
     [
         '--disable-shared', '--enable-static',
@@ -341,8 +341,8 @@ ffmpeg = FfmpegProject(
 )
 
 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.65.3.tar.xz',
+    'http://curl.haxx.se/download/curl-7.66.0.tar.xz',
-    'f2d98854813948d157f6a91236ae34ca4a1b4cb302617cebad263d79b0235fea',
+    'dbb48088193016d079b97c5c3efde8efa56ada2ebf336e8a97d04eb8e2ed98c1',
     'lib/libcurl.a',
     [
         '--disable-shared', '--enable-static',

src/SongUpdate.cxx

@@ -87,8 +87,6 @@ Song::UpdateFile(Storage &storage)
 	return true;
 }
 
-#endif
-
 #ifdef ENABLE_ARCHIVE
 
 SongPtr
@@ -130,6 +128,8 @@ Song::UpdateFileInArchive(ArchiveFile &archive) noexcept
 
 #endif
 
+#endif /* ENABLE_DATABASE */
+
 bool
 DetachedSong::LoadFile(Path path)
 {

src/lib/sqlite/meson.build

@@ -1,4 +1,9 @@
-sqlite_dep = dependency('sqlite3', version: '>= 3.7.3', required: get_option('sqlite'))
+if enable_database
+  sqlite_dep = dependency('sqlite3', version: '>= 3.7.3', required: get_option('sqlite'))
+else
+  sqlite_dep = dependency('', required: false)
+endif
+
 conf.set('ENABLE_SQLITE', sqlite_dep.found())
 if not sqlite_dep.found()
   subdir_done()

src/neighbor/meson.build

@@ -1,4 +1,4 @@
-if not get_option('neighbor')
+if not get_option('neighbor') or not enable_database
   conf.set('ENABLE_NEIGHBOR_PLUGINS', false)
   neighbor_glue_dep = dependency('', required: false)
   subdir_done()

src/output/plugins/JackOutputPlugin.cxx

@@ -405,10 +405,11 @@ JackOutput::Connect()
 	jack_on_info_shutdown(client, OnShutdown, this);
 
 	for (unsigned i = 0; i < num_source_ports; ++i) {
+		unsigned long portflags = JackPortIsOutput | JackPortIsTerminal;
 		ports[i] = jack_port_register(client,
 					      source_ports[i].c_str(),
 					      JACK_DEFAULT_AUDIO_TYPE,
-					      JackPortIsOutput, 0);
+					      portflags, 0);
 		if (ports[i] == nullptr) {
 			Disconnect();
 			throw FormatRuntimeError("Cannot register output port \"%s\"",