1100101 · dgeelen · Oct 21, 2016 · Feb 15, 2017 · Feb 15, 2017 · Mar 16, 2017
diff --git a/Makefile.am b/Makefile.am
@@ -25,29 +25,43 @@ minidlnad_SOURCES = minidlna.c upnphttp.c upnpdescgen.c upnpsoap.c \
 			upnpreplyparse.c minixml.c clients.c \
 			getifaddr.c process.c upnpglobalvars.c \
 			options.c minissdp.c uuid.c upnpevents.c \
-			sql.c utils.c metadata.c scanner.c inotify.c \
+			sql.c utils.c metadata.c scanner.c monitor.c \
 			tivo_utils.c tivo_beacon.c tivo_commands.c \
-			playlist.c image_utils.c albumart.c log.c \
-			containers.c tagutils/tagutils.c
+			playlist.c image_utils.c albumart.c log.c video_thumb.c \
+			containers.c avahi.c tagutils/tagutils.c
 
-#if NEED_VORBIS
-vorbisflag = -lvorbis
-#endif
+if HAVE_KQUEUE
+minidlnad_SOURCES += kqueue.c monitor_kqueue.c
+else
+minidlnad_SOURCES += select.c
+endif
 
-#if NEED_OGG
-flacoggflag = -logg
-#endif
+if HAVE_VORBISFILE
+vorbislibs = -lvorbis -logg
+else
+if NEED_OGG
+flacogglibs = -logg
+endif
+endif
+
+if TIVO_SUPPORT
+if HAVE_AVAHI
+avahilibs = -lavahi-client -lavahi-common
+endif
+endif
 
 minidlnad_LDADD = \
 	@LIBJPEG_LIBS@ \
 	@LIBID3TAG_LIBS@ \
 	@LIBSQLITE3_LIBS@ \
-	@LIBAVFORMAT_LIBS@ \
 	@LIBAVUTIL_LIBS@ \
+	@LIBAVCODEC_LIBS@ \
+	@LIBAVFORMAT_LIBS@ \
+	@LIBSWSCALE_LIBS@ \
 	@LIBEXIF_LIBS@ \
 	@LIBINTL@ \
 	@LIBICONV@ \
-	-lpthread  -lFLAC  $(vorbisflag) $(flacoggflag)
+	-lFLAC $(flacogglibs) $(vorbislibs) $(avahilibs)
 
 minidlnad_LDFLAGS = @STATIC_LDFLAGS@
 
@@ -59,7 +73,7 @@ testupnpdescgen_LDADD = \
 	@LIBAVFORMAT_LIBS@ \
 	@LIBAVUTIL_LIBS@ \
 	@LIBEXIF_LIBS@ \
-	-lFLAC  $(flacoggflag) $(vorbisflag)
+	-lFLAC $(flacogglibs) $(vorbislibs) $(avahilibs)
 
 SUFFIXES = .tmpl .
 

diff --git a/NEWS b/NEWS
@@ -1,3 +1,23 @@
+1.2.1 - Released 24-Aug-2017
+--------------------------------
+- Added Movian client detection and subtitle support.
+- Fixed an issue with discovery on non-Linux systems.
+- Fixed Bonjour discovery compatibility with TiVo Bolt.
+- Fixed NFO file parsing, and added change monitoring support for them.
+- Added a workaround for video thumbnails on some Samsung clients.
+- Added DoS protection for event subscriptions.
+- Fixed content browsing issues with some Samsung TVs.
+- Improved non-destructive update scan support.
+
+1.2.0 - Released 17-May-2017
+--------------------------------
+- Add libavformat > 57 compatibility.
+- Add TiVo Bonjour discovery support using Avahi for Bolt.
+- Improve Samsung BD-J5500 support.
+- Add quirk to fix video playback on Hyundai TVs.
+- Add non-destructive update rescan support.
+- Enhance bookmark support to work with Kodi.
+
 1.1.6 - Released 16-June-2016
 --------------------------------
 - Add AllShare and Windows client detection.

diff --git a/README b/README
@@ -18,9 +18,6 @@ serves multimedia content to compatible clients on the network.
 See http://www.upnp.org/ for more details on UPnP
 and http://www.dlna.org/ for mode details on DLNA.
 
-See the INSTALL file for instructions on compiling, installing,
-and configuring minidlna.
-
 Prerequisites
 ==================
 
@@ -34,3 +31,8 @@ Prerequisites
 
 
 Justin Maggard
+
+Features
+==================
+
+- add possibility to serve multiple-sized thumbnails based on client request