release v0.20.15

python/build/libs.py: disable even more FFmpeg modules
python/build/libs.py: update libogg to 1.3.3
2018-01-05 17:55:25 +01:00 · 2018-01-05 17:41:58 +01:00 · 2018-01-05 17:41:58 +01:00 · 2018-01-05 16:49:28 +01:00 · 2018-01-05 13:00:24 +01:00 · 2018-01-05 12:00:29 +01:00
24 changed files with 459 additions and 84 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -285,30 +285,62 @@ libmain_a_CPPFLAGS = $(AM_CPPFLAGS) -Iandroid/build/include

 src_mpd_LDADD += libandroid.a libjava.a

-all-local: android/build/bin/$(APK_NAME)-debug.apk
+all-local: android/build/$(APK_NAME)-debug.apk
 clean-local:
 	rm -rf android/build

 libmpd.so: $(filter %.a,$(src_mpd_LDADD)) libmain.a
 	$(AM_V_CXXLD)$(CXXLD) -shared -Wl,--no-undefined,-shared,-Bsymbolic -llog -lz -o $@ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) src/libmain_a-Main.o $(src_mpd_LDADD) $(LIBS)

-android/build/build.xml: android/AndroidManifest.xml
-	rm -rf android/build
-	mkdir -p android/build/include android/build/res android/build/src/org
-	ln -s $(abs_srcdir)/android/AndroidManifest.xml $(abs_srcdir)/android/custom_rules.xml android/build
-	ln -s $(abs_srcdir)/android/src android/build/src/org/musicpd
-	ln -s $(abs_srcdir)/android/res/values $(abs_srcdir)/android/res/layout android/build/res
-	$(ANDROID_SDK)/tools/android update project --path android/build --target android-17 --name $(APK_NAME)
+ANDROID_SDK_BUILD_TOOLS_VERSION = 20.0.0
+ANDROID_SDK_PLATFORM = android-17

-android/build/bin/classes/org/musicpd/Bridge.class: android/src/Bridge.java android/build/build.xml android/build/res/drawable/icon.png
-	cd android/build && ant compile-jni-classes
+ANDROID_BUILD_TOOLS_DIR = $(ANDROID_SDK)/build-tools/$(ANDROID_SDK_BUILD_TOOLS_VERSION)
+ANDROID_SDK_PLATFORM_DIR = $(ANDROID_SDK)/platforms/$(ANDROID_SDK_PLATFORM)

-android/build/include/org_musicpd_Bridge.h: android/build/bin/classes/org/musicpd/Bridge.class
-	javah -classpath $(ANDROID_SDK)/platforms/android-17/android.jar:android/build/bin/classes -d $(@D) org.musicpd.Bridge
+JAVAC = javac
+AAPT = $(ANDROID_BUILD_TOOLS_DIR)/aapt
+DX = $(ANDROID_BUILD_TOOLS_DIR)/dx
+ZIPALIGN = $(ANDROID_BUILD_TOOLS_DIR)/zipalign
+
+ANDROID_XML_RES := $(wildcard $(srcdir)/android/res/*/*.xml)
+ANDROID_XML_RES_COPIES := $(patsubst $(srcdir)/android/%,android/build/%,$(ANDROID_XML_RES))
+
+JAVA_SOURCE_NAMES = Bridge.java Loader.java Main.java
+JAVA_SOURCES = $(addprefix $(srcdir)/android/src/,$(JAVA_SOURCE_NAMES))
+
+JAVA_CLASSFILES_DIR = android/build/classes
+
+$(ANDROID_XML_RES_COPIES): $(ANDROID_XML_RES)
+	@$(MKDIR_P) $(dir $@)
+	cp $(patsubst android/build/%,$(srcdir)/android/%,$@) $@
+
+android/build/resources.apk: $(ANDROID_XML_RES_COPIES) android/build/res/drawable/icon.png
+	@$(MKDIR_P) android/build/gen
+	$(AAPT) package -f -m --auto-add-overlay \
+		--custom-package org.musicpd \
+		-M $(srcdir)/android/AndroidManifest.xml \
+		-S android/build/res \
+		-J android/build/gen \
+		-I $(ANDROID_SDK_PLATFORM_DIR)/android.jar \
+		-F android/build/resources.apk
+
+# R.java is generated by aapt, when resources.apk is generated
+android/build/gen/org/musicpd/R.java: android/build/resources.apk
+
+android/build/classes.dex: $(JAVA_SOURCES) android/build/gen/org/musicpd/R.java
+	@$(MKDIR_P) $(JAVA_CLASSFILES_DIR)
+	$(JAVAC) -source 1.5 -target 1.5 -Xlint:-options \
+		-cp $(ANDROID_SDK_PLATFORM_DIR)/android.jar:$(JAVA_CLASSFILES_DIR) \
+		-d $(JAVA_CLASSFILES_DIR) $^
+	$(DX) --dex --output $@ $(JAVA_CLASSFILES_DIR)
+
+android/build/include/org_musicpd_Bridge.h: android/build/classes.dex
+	javah -classpath $(ANDROID_SDK_PLATFORM_DIR)/android.jar:$(JAVA_CLASSFILES_DIR) -d $(@D) org.musicpd.Bridge

 BUILT_SOURCES = android/build/include/org_musicpd_Bridge.h

-android/build/libs/armeabi-v7a/libmpd.so: libmpd.so android/build/build.xml
+android/build/lib/armeabi-v7a/libmpd.so: libmpd.so
 	mkdir -p $(@D)
 	rm -f $@
 	$(STRIP) -o $@ $<
@@ -317,24 +349,19 @@ android/build/res/drawable/icon.png: mpd.svg
 	mkdir -p $(@D)
 	rsvg-convert --width=48 --height=48 $< -o $@

-APK_DEPS = android/build/res/drawable/icon.png \
-	android/build/libs/armeabi-v7a/libmpd.so \
-	$(wildcard $(srcdir)/android/src/*.java) \
-	android/build/build.xml
+.DELETE_ON_ERROR: android/build/unsigned.apk
+android/build/unsigned.apk: android/build/classes.dex android/build/resources.apk android/build/lib/armeabi-v7a/libmpd.so
+	cp android/build/resources.apk $@
+	cd $(dir $@) && zip -q -r $(notdir $@) classes.dex lib

-android/build/bin/$(APK_NAME)-debug.apk: $(APK_DEPS)
-	cd android/build && ant nodeps debug
+android/build/$(APK_NAME)-debug.apk: android/build/unsigned.apk
+	jarsigner -keystore $(HOME)/.android/debug.keystore -storepass android -signedjar $@ $< androiddebugkey

-android/build/bin/$(APK_NAME)-release-unsigned.apk: $(APK_DEPS)
-	cd android/build && ant nodeps release
-
-android/build/bin/$(APK_NAME)-release-unaligned.apk: android/build/bin/$(APK_NAME)-release-unsigned.apk
+android/build/$(APK_NAME)-release-unaligned.apk: android/build/unsigned.apk
 	jarsigner -digestalg SHA1 -sigalg MD5withRSA -storepass:env ANDROID_KEYSTORE_PASS -keystore $(ANDROID_KEYSTORE) -signedjar $@ $< $(ANDROID_KEY_ALIAS)

-ANDROID_SDK_BUILD_TOOLS_VERSION = 20.0.0
-
-android/build/bin/$(APK_NAME).apk: android/build/bin/$(APK_NAME)-release-unaligned.apk
-	$(ANDROID_SDK)/build-tools/$(ANDROID_SDK_BUILD_TOOLS_VERSION)/zipalign -f 4 $< $@
+android/build/$(APK_NAME).apk: android/build/$(APK_NAME)-release-unaligned.apk
+	$(ZIPALIGN) -f 4 $< $@

 endif

--- a/19
+++ b/19
@@ -1,3 +1,22 @@
+ver 0.20.15 (2018/01/05)
+* queue: fix crash after seek failure
+* resampler
+  - soxr: clear internal state after manual song change
+* state file
+  - make mount point restore errors non-fatal
+  - fix crash when restoring mounts with incompatible database plugin
+* Android
+  - build without Ant
+  - fix for SIGSYS crash
+
+ver 0.20.14 (2018/01/01)
+* database
+  - simple: fix file corruption in the presence of mount points
+* archive
+  - bz2: fix deadlock
+  - reduce lock contention, fixing lots of xrun problems
+* fix Solaris build failure
+
 ver 0.20.13 (2017/12/18)
 * output
  - osx: set up ring buffer to hold at least 100ms
--- a/android/build.py
+++ b/android/build.py
@@ -73,6 +73,8 @@ class AndroidNdkToolchain:
        self.cxx = os.path.join(llvm_bin, 'clang++')
        common_flags += ' -target ' + llvm_triple + ' -integrated-as -gcc-toolchain ' + toolchain_path

+        common_flags += ' -fvisibility=hidden -fdata-sections -ffunction-sections'
+
        self.ar = os.path.join(toolchain_bin, arch + '-ar')
        self.ranlib = os.path.join(toolchain_bin, arch + '-ranlib')
        self.nm = os.path.join(toolchain_bin, arch + '-nm')
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 AC_PREREQ(2.60)

-AC_INIT(mpd, 0.20.13, musicpd-dev-team@lists.sourceforge.net)
+AC_INIT(mpd, 0.20.15, musicpd-dev-team@lists.sourceforge.net)

 VERSION_MAJOR=0
 VERSION_MINOR=20
-VERSION_REVISION=13
+VERSION_REVISION=15
 VERSION_EXTRA=0

 AC_CONFIG_SRCDIR([src/Main.cxx])
--- a/doc/include/tags.xml
+++ b/doc/include/tags.xml
@@ -113,7 +113,7 @@
    <para>
      <varname>musicbrainz_artistid</varname>: the artist id in the
      <ulink
-      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
      database.
    </para>
  </listitem>
@@ -122,7 +122,7 @@
    <para>
      <varname>musicbrainz_albumid</varname>: the album id in the
      <ulink
-      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
      database.
    </para>
  </listitem>
@@ -131,7 +131,7 @@
    <para>
      <varname>musicbrainz_albumartistid</varname>: the album artist
      id in the <ulink
-      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
      database.
    </para>
  </listitem>
@@ -140,7 +140,7 @@
    <para>
      <varname>musicbrainz_trackid</varname>: the track id in the
      <ulink
-      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
      database.
    </para>
  </listitem>
@@ -149,7 +149,7 @@
    <para>
      <varname>musicbrainz_releasetrackid</varname>: the release track
      id in the <ulink
-      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
      database.
    </para>
  </listitem>
--- a/python/build/autotools.py
+++ b/python/build/autotools.py
@@ -1,21 +1,28 @@
-import os.path, subprocess
+import os.path, subprocess, sys

-from build.project import Project
+from build.makeproject import MakeProject

-class AutotoolsProject(Project):
+class AutotoolsProject(MakeProject):
    def __init__(self, url, md5, installed, configure_args=[],
                 autogen=False,
                 cppflags='',
+                 ldflags='',
+                 libs='',
                 **kwargs):
-        Project.__init__(self, url, md5, installed, **kwargs)
+        MakeProject.__init__(self, url, md5, installed, **kwargs)
        self.configure_args = configure_args
        self.autogen = autogen
        self.cppflags = cppflags
+        self.ldflags = ldflags
+        self.libs = libs

-    def build(self, toolchain):
+    def configure(self, toolchain):
        src = self.unpack(toolchain)
        if self.autogen:
-            subprocess.check_call(['libtoolize', '--force'], cwd=src)
+            if sys.platform == 'darwin':
+                subprocess.check_call(['glibtoolize', '--force'], cwd=src)
+            else:
+                subprocess.check_call(['libtoolize', '--force'], cwd=src)
            subprocess.check_call(['aclocal'], cwd=src)
            subprocess.check_call(['automake', '--add-missing', '--force-missing', '--foreign'], cwd=src)
            subprocess.check_call(['autoconf'], cwd=src)
@@ -29,8 +36,8 @@ class AutotoolsProject(Project):
            'CFLAGS=' + toolchain.cflags,
            'CXXFLAGS=' + toolchain.cxxflags,
            'CPPFLAGS=' + toolchain.cppflags + ' ' + self.cppflags,
-            'LDFLAGS=' + toolchain.ldflags,
-            'LIBS=' + toolchain.libs,
+            'LDFLAGS=' + toolchain.ldflags + ' ' + self.ldflags,
+            'LIBS=' + toolchain.libs + ' ' + self.libs,
            'AR=' + toolchain.ar,
            'RANLIB=' + toolchain.ranlib,
            'STRIP=' + toolchain.strip,
@@ -40,7 +47,8 @@ class AutotoolsProject(Project):
        ] + self.configure_args

        subprocess.check_call(configure, cwd=build, env=toolchain.env)
-        subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'],
-                              cwd=build, env=toolchain.env)
-        subprocess.check_call(['/usr/bin/make', '--quiet', 'install'],
-                              cwd=build, env=toolchain.env)
+        return build
+
+    def build(self, toolchain):
+        build = self.configure(toolchain)
+        MakeProject.build(self, toolchain, build)
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -1,3 +1,4 @@
+import re
 from build.project import Project
 from build.zlib import ZlibProject
 from build.autotools import AutotoolsProject
@@ -5,24 +6,33 @@ from build.ffmpeg import FfmpegProject
 from build.boost import BoostProject

 libogg = AutotoolsProject(
-    'http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.xz',
-    '5c3a34309d8b98640827e5d0991a4015',
+    'http://downloads.xiph.org/releases/ogg/libogg-1.3.3.tar.xz',
+    '4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08',
    'lib/libogg.a',
-    ['--disable-shared', '--enable-static'],
+    [
+        '--disable-shared', '--enable-static',
+    ],
 )

 libvorbis = AutotoolsProject(
    'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz',
    '28cb28097c07a735d6af56e598e1c90f',
    'lib/libvorbis.a',
-    ['--disable-shared', '--enable-static'],
+    [
+        '--disable-shared', '--enable-static',
+    ],
 )

 opus = AutotoolsProject(
    'https://archive.mozilla.org/pub/opus/opus-1.2.1.tar.gz',
    'cfafd339ccd9c5ef8d6ab15d7e1a412c054bf4cb4ecbbbcc78c12ef2def70732',
    'lib/libopus.a',
-    ['--disable-shared', '--enable-static'],
+    [
+        '--disable-shared', '--enable-static',
+    ],
+
+    # suppress "visibility default" from opus_defines.h
+    cppflags='-DOPUS_EXPORT=',
 )

 flac = AutotoolsProject(
@@ -45,15 +55,30 @@ libid3tag = AutotoolsProject(
    'ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.1b.tar.gz',
    'e5808ad997ba32c498803822078748c3',
    'lib/libid3tag.a',
-    ['--disable-shared', '--enable-static'],
+    [
+        '--disable-shared', '--enable-static',
+
+        # without this, libid3tag's configure.ac ignores -O* and -f*
+        '--disable-debugging',
+    ],
    autogen=True,
+
+    edits={
+        # fix bug in libid3tag's configure.ac which discards all but the last optimization flag
+        'configure.ac': lambda data: re.sub(r'optimize="\$1"', r'optimize="$optimize $1"', data, count=1),
+    }
 )

 libmad = AutotoolsProject(
    'ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz',
    '1be543bc30c56fb6bea1d7bf6a64e66c',
    'lib/libmad.a',
-    ['--disable-shared', '--enable-static'],
+    [
+        '--disable-shared', '--enable-static',
+
+        # without this, libmad's configure.ac ignores -O* and -f*
+        '--disable-debugging',
+    ],
    autogen=True,
 )

@@ -89,15 +114,223 @@ ffmpeg = FfmpegProject(
        '--disable-pixelutils',
        '--disable-network',
        '--disable-encoders',
+        '--disable-muxers',
        '--disable-protocols',
        '--disable-devices',
        '--disable-filters',
+        '--disable-filters',
        '--disable-v4l2_m2m',

-        # clang misinterprets the "B0" in hevc_mvs.c as binary
-        # literal, which breaks the build; but we don't need that
-        # video codec anyway
+        '--disable-parser=bmp',
+        '--disable-parser=cavsvideo',
+        '--disable-parser=dvbsub',
+        '--disable-parser=dvdsub',
+        '--disable-parser=dvd_nav',
+        '--disable-parser=flac',
+        '--disable-parser=g729',
+        '--disable-parser=gsm',
+        '--disable-parser=h261',
+        '--disable-parser=h263',
+        '--disable-parser=h264',
+        '--disable-parser=hevc',
+        '--disable-parser=mjpeg',
+        '--disable-parser=mlp',
+        '--disable-parser=mpeg4video',
+        '--disable-parser=mpegaudio',
+        '--disable-parser=mpegvideo',
+        '--disable-parser=opus',
+        '--disable-parser=vc1',
+        '--disable-parser=vp3',
+        '--disable-parser=vp8',
+        '--disable-parser=vp9',
+        '--disable-parser=png',
+        '--disable-parser=pnm',
+        '--disable-parser=xma',
+
+        '--disable-demuxer=aqtitle',
+        '--disable-demuxer=ass',
+        '--disable-demuxer=bethsoftvid',
+        '--disable-demuxer=bink',
+        '--disable-demuxer=cavsvideo',
+        '--disable-demuxer=cdxl',
+        '--disable-demuxer=dvbsub',
+        '--disable-demuxer=dvbtxt',
+        '--disable-demuxer=h261',
+        '--disable-demuxer=h263',
+        '--disable-demuxer=h264',
+        '--disable-demuxer=ico',
+        '--disable-demuxer=image2',
+        '--disable-demuxer=jacosub',
+        '--disable-demuxer=lrc',
+        '--disable-demuxer=microdvd',
+        '--disable-demuxer=mjpeg',
+        '--disable-demuxer=mjpeg_2000',
+        '--disable-demuxer=mpegps',
+        '--disable-demuxer=mpegvideo',
+        '--disable-demuxer=mpl2',
+        '--disable-demuxer=mpsub',
+        '--disable-demuxer=pjs',
+        '--disable-demuxer=rawvideo',
+        '--disable-demuxer=realtext',
+        '--disable-demuxer=sami',
+        '--disable-demuxer=scc',
+        '--disable-demuxer=srt',
+        '--disable-demuxer=stl',
+        '--disable-demuxer=subviewer',
+        '--disable-demuxer=subviewer1',
+        '--disable-demuxer=swf',
+        '--disable-demuxer=tedcaptions',
+        '--disable-demuxer=vobsub',
+        '--disable-demuxer=vplayer',
+        '--disable-demuxer=webvtt',
+        '--disable-demuxer=yuv4mpegpipe',
+
+        # we don't need these decoders, because we have the dedicated
+        # libraries
+        '--disable-decoder=flac',
+        '--disable-decoder=mp1',
+        '--disable-decoder=mp1float',
+        '--disable-decoder=mp2',
+        '--disable-decoder=mp2float',
+        '--disable-decoder=mp3',
+        '--disable-decoder=mp3adu',
+        '--disable-decoder=mp3adufloat',
+        '--disable-decoder=mp3float',
+        '--disable-decoder=mp3on4',
+        '--disable-decoder=mp3on4float',
+        '--disable-decoder=opus',
+        '--disable-decoder=vorbis',
+
+        # audio codecs nobody uses
+        '--disable-decoder=atrac1',
+        '--disable-decoder=atrac3',
+        '--disable-decoder=atrac3al',
+        '--disable-decoder=atrac3p',
+        '--disable-decoder=atrac3pal',
+        '--disable-decoder=binkaudio_dct',
+        '--disable-decoder=binkaudio_rdft',
+        '--disable-decoder=bmv_audio',
+        '--disable-decoder=dsicinaudio',
+        '--disable-decoder=dvaudio',
+        '--disable-decoder=metasound',
+        '--disable-decoder=paf_audio',
+        '--disable-decoder=ra_144',
+        '--disable-decoder=ra_288',
+        '--disable-decoder=ralf',
+        '--disable-decoder=qdm2',
+        '--disable-decoder=qdmc',
+
+        # disable lots of image and video codecs
+        '--disable-decoder=ass',
+        '--disable-decoder=asv1',
+        '--disable-decoder=asv2',
+        '--disable-decoder=apng',
+        '--disable-decoder=avrn',
+        '--disable-decoder=avrp',
+        '--disable-decoder=bethsoftvid',
+        '--disable-decoder=bink',
+        '--disable-decoder=bmp',
+        '--disable-decoder=bmv_video',
+        '--disable-decoder=cavs',
+        '--disable-decoder=ccaption',
+        '--disable-decoder=cdgraphics',
+        '--disable-decoder=clearvideo',
+        '--disable-decoder=dirac',
+        '--disable-decoder=dsicinvideo',
+        '--disable-decoder=dvbsub',
+        '--disable-decoder=dvdsub',
+        '--disable-decoder=dvvideo',
+        '--disable-decoder=exr',
+        '--disable-decoder=ffv1',
+        '--disable-decoder=ffvhuff',
+        '--disable-decoder=ffwavesynth',
+        '--disable-decoder=flic',
+        '--disable-decoder=flv',
+        '--disable-decoder=fraps',
+        '--disable-decoder=gif',
+        '--disable-decoder=h261',
+        '--disable-decoder=h263',
+        '--disable-decoder=h263i',
+        '--disable-decoder=h263p',
+        '--disable-decoder=h264',
        '--disable-decoder=hevc',
+        '--disable-decoder=hnm4_video',
+        '--disable-decoder=hq_hqa',
+        '--disable-decoder=hqx',
+        '--disable-decoder=idcin',
+        '--disable-decoder=iff_ilbm',
+        '--disable-decoder=indeo2',
+        '--disable-decoder=indeo3',
+        '--disable-decoder=indeo4',
+        '--disable-decoder=indeo5',
+        '--disable-decoder=interplay_video',
+        '--disable-decoder=jacosub',
+        '--disable-decoder=jpeg2000',
+        '--disable-decoder=jpegls',
+        '--disable-decoder=microdvd',
+        '--disable-decoder=mimic',
+        '--disable-decoder=mjpeg',
+        '--disable-decoder=mmvideo',
+        '--disable-decoder=mpl2',
+        '--disable-decoder=motionpixels',
+        '--disable-decoder=mpeg1video',
+        '--disable-decoder=mpeg2video',
+        '--disable-decoder=mpeg4',
+        '--disable-decoder=mpegvideo',
+        '--disable-decoder=mscc',
+        '--disable-decoder=msmpeg4_crystalhd',
+        '--disable-decoder=msmpeg4v1',
+        '--disable-decoder=msmpeg4v2',
+        '--disable-decoder=msmpeg4v3',
+        '--disable-decoder=msvideo1',
+        '--disable-decoder=mszh',
+        '--disable-decoder=mvc1',
+        '--disable-decoder=mvc2',
+        '--disable-decoder=on2avc',
+        '--disable-decoder=paf_video',
+        '--disable-decoder=png',
+        '--disable-decoder=qdraw',
+        '--disable-decoder=qpeg',
+        '--disable-decoder=rawvideo',
+        '--disable-decoder=realtext',
+        '--disable-decoder=roq',
+        '--disable-decoder=roq_dpcm',
+        '--disable-decoder=rscc',
+        '--disable-decoder=rv10',
+        '--disable-decoder=rv20',
+        '--disable-decoder=rv30',
+        '--disable-decoder=rv40',
+        '--disable-decoder=sami',
+        '--disable-decoder=sheervideo',
+        '--disable-decoder=snow',
+        '--disable-decoder=srt',
+        '--disable-decoder=stl',
+        '--disable-decoder=subrip',
+        '--disable-decoder=subviewer',
+        '--disable-decoder=subviewer1',
+        '--disable-decoder=svq1',
+        '--disable-decoder=svq3',
+        '--disable-decoder=tiff',
+        '--disable-decoder=mottiertexseqvideo',
+        '--disable-decoder=truemotion1',
+        '--disable-decoder=truemotion2',
+        '--disable-decoder=truemotion2rt',
+        '--disable-decoder=twinvq',
+        '--disable-decoder=utvideo',
+        '--disable-decoder=vc1',
+        '--disable-decoder=vmdvideo',
+        '--disable-decoder=vp3',
+        '--disable-decoder=vp5',
+        '--disable-decoder=vp6',
+        '--disable-decoder=vp7',
+        '--disable-decoder=vp8',
+        '--disable-decoder=vp9',
+        '--disable-decoder=vqa',
+        '--disable-decoder=webvtt',
+        '--disable-decoder=wmv1',
+        '--disable-decoder=wmv2',
+        '--disable-decoder=wmv3',
+        '--disable-decoder=yuv4',
    ],
 )

@@ -114,6 +347,7 @@ curl = AutotoolsProject(
        '--disable-ldap', '--disable-ldaps',
        '--disable-rtsp', '--disable-proxy', '--disable-dict', '--disable-telnet',
        '--disable-tftp', '--disable-pop3', '--disable-imap', '--disable-smtp',
+        '--disable-smb',
        '--disable-gopher',
        '--disable-manual',
        '--disable-threaded-resolver', '--disable-verbose', '--disable-sspi',
@@ -123,7 +357,7 @@ curl = AutotoolsProject(
 )

 boost = BoostProject(
-    'http://downloads.sourceforge.net/project/boost/boost/1.65.1/boost_1_65_1.tar.bz2',
-    '9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81',
+    'http://downloads.sourceforge.net/project/boost/boost/1.66.0/boost_1_66_0.tar.bz2',
+    '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9',
    'include/boost/version.hpp',
 )
--- a/python/build/makeproject.py
+++ b/python/build/makeproject.py
@@ -0,0 +1,28 @@
+import subprocess
+
+from build.project import Project
+
+class MakeProject(Project):
+    def __init__(self, url, md5, installed,
+                 install_target='install',
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.install_target = install_target
+
+    def get_simultaneous_jobs(self):
+        return 12
+
+    def get_make_args(self, toolchain):
+        return ['--quiet', '-j' + str(self.get_simultaneous_jobs())]
+
+    def get_make_install_args(self, toolchain):
+        return ['--quiet', self.install_target]
+
+    def make(self, toolchain, wd, args):
+        subprocess.check_call(['/usr/bin/make'] + args,
+                              cwd=wd, env=toolchain.env)
+
+    def build(self, toolchain, wd, install=True):
+        self.make(toolchain, wd, self.get_make_args(toolchain))
+        if install:
+            self.make(toolchain, wd, self.get_make_install_args(toolchain))
--- a/python/build/project.py
+++ b/python/build/project.py
@@ -7,6 +7,7 @@ from build.tar import untar
 class Project:
    def __init__(self, url, md5, installed, name=None, version=None,
                 base=None,
+                 edits=None,
                 use_cxx=False):
        if base is None:
            basename = os.path.basename(url)
@@ -28,6 +29,7 @@ class Project:
        self.md5 = md5
        self.installed = installed

+        self.edits = edits
        self.use_cxx = use_cxx

    def download(self, toolchain):
@@ -47,7 +49,18 @@ class Project:
            parent_path = toolchain.src_path
        else:
            parent_path = toolchain.build_path
-        return untar(self.download(toolchain), parent_path, self.base)
+        path = untar(self.download(toolchain), parent_path, self.base)
+
+        if self.edits is not None:
+            for filename, function in self.edits.items():
+                with open(os.path.join(path, filename), 'r+t') as f:
+                    old_data = f.read()
+                    new_data = function(old_data)
+                    f.seek(0)
+                    f.truncate(0)
+                    f.write(new_data)
+
+        return path

    def make_build_path(self, toolchain):
        path = os.path.join(toolchain.build_path, self.base)
--- a/src/archive/plugins/Bzip2ArchivePlugin.cxx
+++ b/src/archive/plugins/Bzip2ArchivePlugin.cxx
@@ -162,7 +162,7 @@ Bzip2InputStream::FillBuffer()
 	if (bzstream.avail_in > 0)
 		return true;

-	size_t count = archive->istream->Read(buffer, sizeof(buffer));
+	size_t count = archive->istream->LockRead(buffer, sizeof(buffer));
 	if (count == 0)
 		return false;

@@ -174,6 +174,8 @@ Bzip2InputStream::FillBuffer()
 size_t
 Bzip2InputStream::Read(void *ptr, size_t length)
 {
+	const ScopeUnlock unlock(mutex);
+
 	int bz_result;
 	size_t nbytes = 0;

@@ -224,4 +226,3 @@ const ArchivePlugin bz2_archive_plugin = {
 	bz2_open,
 	bz2_extensions,
 };
-
--- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
+++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
@@ -182,6 +182,8 @@ Iso9660ArchiveFile::OpenStream(const char *pathname,
 size_t
 Iso9660InputStream::Read(void *ptr, size_t read_size)
 {
+	const ScopeUnlock unlock(mutex);
+
 	int readed = 0;
 	int no_blocks, cur_block;
 	size_t left_bytes = statbuf->size - offset;
--- a/src/archive/plugins/ZzipArchivePlugin.cxx
+++ b/src/archive/plugins/ZzipArchivePlugin.cxx
@@ -138,6 +138,8 @@ ZzipArchiveFile::OpenStream(const char *pathname,
 size_t
 ZzipInputStream::Read(void *ptr, size_t read_size)
 {
+	const ScopeUnlock unlock(mutex);
+
 	int ret = zzip_file_read(file, ptr, read_size);
 	if (ret < 0)
 		throw std::runtime_error("zzip_file_read() has failed");
@@ -155,6 +157,8 @@ ZzipInputStream::IsEOF() noexcept
 void
 ZzipInputStream::Seek(offset_type new_offset)
 {
+	const ScopeUnlock unlock(mutex);
+
 	zzip_off_t ofs = zzip_seek(file, new_offset, SEEK_SET);
 	if (ofs < 0)
 		throw std::runtime_error("zzip_seek() has failed");
--- a/src/command/CommandError.cxx
+++ b/src/command/CommandError.cxx
@@ -123,6 +123,10 @@ ToAck(std::exception_ptr ep) noexcept
 		return ACK_ERROR_SYSTEM;
 	} catch (const std::invalid_argument &e) {
 		return ACK_ERROR_ARG;
+	} catch (const std::length_error &e) {
+		return ACK_ERROR_ARG;
+	} catch (const std::out_of_range &e) {
+		return ACK_ERROR_ARG;
 #ifdef GLIBCXX_49X
 	} catch (const std::exception &e) {
 #else
--- a/src/db/plugins/simple/DirectorySave.cxx
+++ b/src/db/plugins/simple/DirectorySave.cxx
@@ -82,10 +82,11 @@ directory_save(BufferedOutputStream &os, const Directory &directory)
 	}

 	for (const auto &child : directory.children) {
-		os.Format(DIRECTORY_DIR "%s\n", child.GetName());
+		if (child.IsMount())
+			continue;

-		if (!child.IsMount())
-			directory_save(os, child);
+		os.Format(DIRECTORY_DIR "%s\n", child.GetName());
+		directory_save(os, child);
 	}

 	for (const auto &song : directory.songs)
--- a/src/filter/Observer.cxx
+++ b/src/filter/Observer.cxx
@@ -73,6 +73,10 @@ public:
 		return filter;
 	}

+	void Reset() override {
+		filter->Reset();
+	}
+
 	ConstBuffer<void> FilterPCM(ConstBuffer<void> src) override {
 		return filter->FilterPCM(src);
 	}
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -266,6 +266,7 @@ CurlInputStream::OnData(ConstBuffer<void> data)
 void
 CurlInputStream::OnEnd()
 {
+	const std::lock_guard<Mutex> protect(mutex);
 	cond.broadcast();

 	AsyncInputStream::SetClosed();
@@ -274,6 +275,7 @@ CurlInputStream::OnEnd()
 void
 CurlInputStream::OnError(std::exception_ptr e)
 {
+	const std::lock_guard<Mutex> protect(mutex);
 	postponed_exception = std::move(e);

 	if (IsSeekPending())
--- a/src/output/plugins/HaikuOutputPlugin.cxx
+++ b/src/output/plugins/HaikuOutputPlugin.cxx
@@ -77,7 +77,6 @@ public:
 	void Close();

 	size_t Play(const void *chunk, size_t size);
-	void Cancel();

 	std::chrono::steady_clock::duration Delay() noexcept;

--- a/src/pcm/SampleFormat.hxx
+++ b/src/pcm/SampleFormat.hxx
@@ -122,7 +122,7 @@ sample_format_size(SampleFormat format)
 * @param format a #SampleFormat enum value
 * @return the string
 */
-gcc_pure gcc_malloc
+gcc_pure
 const char *
 sample_format_to_string(SampleFormat format) noexcept;

--- a/src/pcm/SoxrResampler.cxx
+++ b/src/pcm/SoxrResampler.cxx
@@ -139,6 +139,14 @@ SoxrPcmResampler::Close()
 	soxr_delete(soxr);
 }

+void
+SoxrPcmResampler::Reset()
+{
+#if SOXR_THIS_VERSION >= SOXR_VERSION(0,1,2)
+	soxr_clear(soxr);
+#endif
+}
+
 ConstBuffer<void>
 SoxrPcmResampler::Resample(ConstBuffer<void> src)
 {
--- a/src/pcm/SoxrResampler.hxx
+++ b/src/pcm/SoxrResampler.hxx
@@ -41,6 +41,7 @@ class SoxrPcmResampler final : public PcmResampler {
 public:
 	AudioFormat Open(AudioFormat &af, unsigned new_sample_rate) override;
 	void Close() override;
+	void Reset() override;
 	ConstBuffer<void> Resample(ConstBuffer<void> src) override;
 };

--- a/src/queue/PlaylistControl.cxx
+++ b/src/queue/PlaylistControl.cxx
@@ -212,8 +212,6 @@ playlist::SeekSongOrder(PlayerControl &pc, unsigned i, SongTime seek_time)
 {
 	assert(queue.IsValidOrder(i));

-	const DetachedSong *queued_song = GetQueuedSong();
-
 	pc.LockClearError();
 	stop_on_error = true;
 	error_count = 0;
@@ -226,8 +224,6 @@ playlist::SeekSongOrder(PlayerControl &pc, unsigned i, SongTime seek_time)

 		playing = true;
 		current = i;
-
-		queued_song = nullptr;
 	}

 	queued = -1;
@@ -235,7 +231,7 @@ playlist::SeekSongOrder(PlayerControl &pc, unsigned i, SongTime seek_time)
 	try {
 		pc.LockSeek(new DetachedSong(queue.GetOrder(i)), seek_time);
 	} catch (...) {
-		UpdateQueuedSong(pc, queued_song);
+		UpdateQueuedSong(pc, nullptr);
 		throw;
 	}

--- a/src/storage/StorageState.cxx
+++ b/src/storage/StorageState.cxx
@@ -35,7 +35,7 @@
 #include "IOThread.hxx"
 #include "Log.hxx"

-#include <list>
+#include <set>
 #include <boost/crc.hpp>

 #define MOUNT_STATE_BEGIN        "mount_begin"
@@ -48,6 +48,9 @@ static constexpr Domain storage_domain("storage");
 void
 storage_state_save(BufferedOutputStream &os, const Instance &instance)
 {
+	if (instance.storage == nullptr)
+		return;
+
 	const auto visitor = [&os](const char *mount_uri, const Storage &storage) {
 		std::string uri = storage.MapUTF8("");
 		if (uri.empty() || StringIsEmpty(mount_uri))
@@ -85,6 +88,12 @@ storage_state_restore(const char *line, TextFile &file, Instance &instance)
 			FormatError(storage_domain, "Unrecognized line in mountpoint state: %s", line);
 	}

+	if (instance.storage == nullptr)
+		/* without storage (a CompositeStorage instance), we
+		   cannot mount, and therefore we silently ignore the
+		   state file */
+		return true;
+
 	if (url.empty() || uri.empty()) {
 		LogError(storage_domain, "Missing value in mountpoint state.");	
 		return true;
@@ -99,16 +108,18 @@ storage_state_restore(const char *line, TextFile &file, Instance &instance)
 		return true;
 	}

-#ifdef ENABLE_DATABASE
 	Database *db = instance.database;
 	if (db != nullptr && db->IsPlugin(simple_db_plugin)) {
 		try {
 			((SimpleDatabase *)db)->Mount(uri.c_str(), url.c_str());
 		} catch (...) {
-			throw;
+			delete storage;
+			FormatError(std::current_exception(),
+				    "Failed to restore mount to %s",
+				    url.c_str());
+			return true;
 		}
 	}
-#endif

 	((CompositeStorage*)instance.storage)->Mount(uri.c_str(), storage);

@@ -118,16 +129,17 @@ storage_state_restore(const char *line, TextFile &file, Instance &instance)
 unsigned
 storage_state_get_hash(const Instance &instance)
 {
-	std::list<std::string> mounts;
+	if (instance.storage == nullptr)
+		return 0;
+
+	std::set<std::string> mounts;

 	const auto visitor = [&mounts](const char *mount_uri, const Storage &storage) {
-		mounts.push_back(std::string(mount_uri) + ":" + storage.MapUTF8(""));
+		mounts.emplace(std::string(mount_uri) + ":" + storage.MapUTF8(""));
 	};

 	((CompositeStorage*)instance.storage)->VisitMounts(visitor);

-	mounts.sort();
-
 	boost::crc_32_type result;

 	for (auto mount: mounts) {
--- a/src/thread/Util.cxx
+++ b/src/thread/Util.cxx
@@ -38,7 +38,7 @@
 #include <windows.h>
 #endif

-#ifdef __linux__
+#if defined(__linux__) && !defined(ANDROID)

 static int
 ioprio_set(int which, int who, int ioprio)
@@ -69,7 +69,11 @@ SetThreadIdlePriority()
 	sched_setscheduler(0, SCHED_IDLE, &sched_param);
 #endif

+#ifndef ANDROID
+	/* this system call is forbidden via seccomp on Android 8 and
+	   leads to crash (SIGSYS) */
 	ioprio_set_idle();
+#endif

 #elif defined(_WIN32)
 	SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_IDLE);
--- a/src/util/WStringAPI.hxx
+++ b/src/util/WStringAPI.hxx
@@ -103,11 +103,13 @@ UnsafeCopyStringP(wchar_t *dest, const wchar_t *src) noexcept
 {
 #if defined(_WIN32) || defined(__BIONIC__) || defined(__OpenBSD__) || \
 	defined(__NetBSD__)
-  /* emulate wcpcpy() */
-  UnsafeCopyString(dest, src);
-  return dest + StringLength(dest);
+	/* emulate wcpcpy() */
+	UnsafeCopyString(dest, src);
+	return dest + StringLength(dest);
+#elif defined(__sun) && defined (__SVR4)
+	return std::wcpcpy(dest, src);
 #else
-  return wcpcpy(dest, src);
+	return wcpcpy(dest, src);
 #endif
 }

@@ -140,7 +142,11 @@ gcc_malloc gcc_nonnull_all
 static inline wchar_t *
 DuplicateString(const wchar_t *p)
 {
+#if defined(__sun) && defined (__SVR4)
+	return std::wcsdup(p);
+#else
 	return wcsdup(p);
+#endif
 }

 #endif
Author	SHA1	Message	Date
Max Kellermann	ed4d0aa909	release v0.20.15	2018-01-05 17:55:25 +01:00
Max Kellermann	023ce4e720	python/build/libs.py: disable even more FFmpeg modules	2018-01-05 17:41:58 +01:00
Max Kellermann	368d9359dd	python/build/libs.py: update libogg to 1.3.3	2018-01-05 17:41:58 +01:00
Max Kellermann	d98c19d561	python/build/libs.py: disable more FFmpeg modules	2018-01-05 16:49:28 +01:00
Max Kellermann	cab77e35e0	queue/PlaylistControl: fix crash after seek failure This completes the bug fix commit 2065e3290452377b2931f3129b230c8cc536cbc8; if we clear "queued" then we must clear "queued_song" as well, or another variant of the assertion fails.	2018-01-05 13:00:24 +01:00
Max Kellermann	e3e90b4b93	python/build/libs.py: disable libcurl SMB support MPD doesn't use this feature anyway.	2018-01-05 12:00:29 +01:00
Max Kellermann	f8c69893e1	python/build/libs.py: disable lots of useless FFmpeg features	2018-01-05 11:11:20 +01:00
Max Kellermann	49678a0893	python/build/libs.py: suppress "visibility default" in libopus build	2018-01-05 10:33:53 +01:00
Max Kellermann	d667b5b48c	python/build/libs.py: work around libid3tag CFLAGS bug	2018-01-05 10:25:16 +01:00
Max Kellermann	9cba55b39c	python/build/project.py: add "edits" parameter to edit source files	2018-01-05 10:06:22 +01:00
Max Kellermann	c2cbb7b8ce	output/haiku: remove unimplemented Cancel() method	2018-01-05 10:05:14 +01:00
Felix Hädicke	8217d75ca1	build/python: refactoring: introduce new class MakeProject This introduces a the new class MakeProject, which is used as a base class for all Makefile based thirdparty libraries.	2018-01-05 08:17:17 +01:00
Max Kellermann	1ca70d9759	build/python/autotools: add properties "ldflags", "libs", "install_target"	2018-01-05 08:17:15 +01:00
Felix Hädicke	4303aaa9b8	build/python: use "glibtoolize", not "libtoolize" when compiling on OS X On OS X, the "libtoolize" command is some Apple tool. The libtoolize we want is named "glibtoolize" in Homebrew.	2018-01-05 07:55:59 +01:00
Max Kellermann	7b56bae289	python/build/libs.py: pass --disable-debugging to libid3tag and libmad	2018-01-05 07:30:09 +01:00
Max Kellermann	4183416b3e	python/build/libs.py: reindent arrays	2018-01-05 07:27:09 +01:00
Max Kellermann	a60dee57ce	python/libs: upgrade Boost to 1.66.0	2018-01-05 07:16:38 +01:00
Max Kellermann	5724656acb	android/build.py: enable function/data sections in static libraries .. and make all library symbols hidden by default. Saves big amounts of .text section size with --gc-sections, because only this allows discarding unused functions from those (static) third-party libraries.	2018-01-04 23:33:07 +01:00
Max Kellermann	329f9cd9fe	thread/Util: no ioprio_set() on Android due to seccomp/SIGSYS	2018-01-04 19:33:14 +01:00
Felix Hädicke	fbdb8b406e	Makefile.am: build Android APK package without Ant In current Android SDK releases, Ant support was removed. Move the necessary build steps from the former Ant build system to our Makefile, and call the required build tools from the Android SDK (aapt and dx), Java SDK (javac) and Info-ZIP (zip) directly. [mk: copied from Felix's commit e52b906dba971a1173f9e8f83d32b52ee9f89af3 in the XCSoar project)	2018-01-04 18:55:54 +01:00
Max Kellermann	85d0bbd957	Makefile.am: add variable ZIPALIGN	2018-01-04 18:55:45 +01:00
Max Kellermann	414f00d6ae	Makefile.am: add variable ANDROID_SDK_PLATFORM	2018-01-04 18:47:52 +01:00
Max Kellermann	17b0add058	filter/Observer: pass Reset() to underlying Filter Wohooooo, the method Filter::Reset() has been broken because no implementation of it has ever been called for a loooong time. And nobody ever noticed it. WTF.	2018-01-02 22:13:14 +01:00
Max Kellermann	c68ed40661	pcm/SoxrResampler: implement method Reset()	2018-01-02 21:53:09 +01:00
Max Kellermann	ff624075a8	storage/State: check if a CompositeStorage exists; fixes nullptr dereference Fixes another crash bug caused by commit `64d141f71e`	2018-01-02 14:13:26 +01:00
Max Kellermann	08db28469d	storage/State: make mount errors non-fatal Fixes crash bug caused by commit `64d141f71e`	2018-01-02 14:07:52 +01:00
Max Kellermann	a20b326807	storage/State: fix memory leak after database mount failure Caused by commit `64d141f71e` This wasn't a serious memory leak, because after a mount failure, MPD would abort anyway, which is subject to the next commit.	2018-01-02 14:05:07 +01:00
Max Kellermann	4db1b1b250	storage/State: remove useless #ifdef ENABLE_DATABASE This source file isn't compiled when the database is disabled.	2018-01-02 13:48:16 +01:00
Max Kellermann	ff6b263b48	increment version number to 0.20.15	2018-01-02 13:46:03 +01:00
Max Kellermann	c0bf052fa9	release v0.20.14	2018-01-01 17:55:38 +01:00
loujine	5419cff925	[doc] Fix outdated MusicBrainz URLs (closes #179 )	2018-01-01 17:30:24 +01:00
Max Kellermann	eee10ad2ed	input/curl: add missing mutex locks to OnEnd(), OnError()	2017-12-26 20:01:13 +01:00
Max Kellermann	98472a8104	pcm/SampleFormat: remove wrong "malloc" attribute	2017-12-23 08:38:22 +01:00
Max Kellermann	d094c168aa	archive/{iso9660,zzip}: unlock the mutex during I/O Similar to commit `31ab78ae8e`	2017-12-22 16:09:03 +01:00
Max Kellermann	4b18460bc6	archive/bz2: unlock the archive mutex and lock the file mutex Fixes deadlock because FileInputStream::Read() unlocks the mutex (which was not locked) and then locks it, keeping it locked. This can result in a deadlock. This happens because the archive and the file mutex are different.	2017-12-22 16:02:23 +01:00
Max Kellermann	412c0a965c	util/WStringAPI: fix indent	2017-12-21 18:45:26 +01:00
Ilya ilyxa Tyshchenko	2becf79223	correct action for compile on Solaris 11.3 X86	2017-12-21 18:42:36 +01:00
Max Kellermann	43ec96d4a0	command/Error: translate std::{length_error,out_of_range} to ACK_ERROR_ARG	2017-12-21 10:22:04 +01:00
Max Kellermann	3d1d779da7	storage/State: use std::set instead of sorting a std::list	2017-12-21 10:22:00 +01:00
Max Kellermann	c88056ba83	db/simple: fix file corruption in the presence of mount points If a directory is a mount point, omit the "directory: " as well. This bug is years old, but has become more visible now that mount points are persistent in the state file.	2017-12-21 10:16:52 +01:00
Max Kellermann	e769751221	increment version number to 0.20.14	2017-12-21 10:15:16 +01:00