From fa4d202e71e2ff59583e088d9512424e32d3d761 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Nov 2014 22:18:31 +0100 Subject: decoder/mp4v2: remove because of incompatible license libmp4v2 is licensed under MPL 1.1, which is incompatible with GPLv2. Unfortunately, this means that we must remove the plugin. More information can be found in the Debian bug report: http://bugs.debian.org/767504 --- Makefile.am | 8 -------- 1 file changed, 8 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 72b6a0ca4..874e37d10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -828,7 +828,6 @@ libdecoder_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(WAVPACK_CFLAGS) \ $(MAD_CFLAGS) \ $(MPG123_CFLAGS) \ - $(MP4V2_CFLAGS) \ $(OPUS_CFLAGS) \ $(FFMPEG_CFLAGS) \ $(MPCDEC_CFLAGS) \ @@ -848,7 +847,6 @@ DECODER_LIBS = \ $(WAVPACK_LIBS) \ $(MAD_LIBS) \ $(MPG123_LIBS) \ - $(MP4V2_LIBS) \ $(OPUS_LIBS) \ $(FFMPEG_LIBS2) \ $(MPCDEC_LIBS) \ @@ -963,12 +961,6 @@ noinst_LIBRARIES += libmodplug_decoder_plugin.a DECODER_LIBS += libmodplug_decoder_plugin.a $(MODPLUG_LIBS) endif -if HAVE_MP4V2 -libdecoder_a_SOURCES += \ - src/decoder/plugins/Mp4v2DecoderPlugin.cxx \ - src/decoder/plugins/Mp4v2DecoderPlugin.hxx -endif - if ENABLE_SIDPLAY libdecoder_a_SOURCES += \ src/decoder/plugins/SidplayDecoderPlugin.cxx \ -- cgit v1.2.3 From 0bc511715b409bf400de4d9053ff4978d2e8d7cb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 26 Nov 2014 20:10:00 +0100 Subject: Makefile.am: distribute Android sources --- Makefile.am | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 874e37d10..e8f459454 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2179,4 +2179,11 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \ $(wildcard scripts/*.sh) \ $(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \ systemd/mpd.socket \ + android/AndroidManifest.xml \ + android/build.py \ + android/custom_rules.xml \ + android/res/values/strings.xml \ + android/src/Bridge.java \ + android/src/Loader.java \ + android/src/Main.java \ src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico -- cgit v1.2.3