Update buildroot & docker (#25)

* Update docker & buildroot

* Fix

* fix versions

buildroot/package/ffmpeg/0001-bfin-disable-optimization.patch

@@ -1,26 +0,0 @@
-Fix bfin compile error
-
-See gcc bug report:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77311
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur ffmpeg-2.8.7.orig/libavcodec/hevcdsp_template.c ffmpeg-2.8.7/libavcodec/hevcdsp_template.c
---- ffmpeg-2.8.7.orig/libavcodec/hevcdsp_template.c	2016-03-29 04:25:16.000000000 +0200
-+++ ffmpeg-2.8.7/libavcodec/hevcdsp_template.c	2016-08-12 21:32:36.728178969 +0200
-@@ -1517,7 +1517,14 @@
- #define TQ2 pix[2  * xstride + 3 * ystride]
- #define TQ3 pix[3  * xstride + 3 * ystride]
- 
--static void FUNC(hevc_loop_filter_luma)(uint8_t *_pix,
-+// Blackfin gcc 6.1.x fails with
-+// unable to find a register to spill in class CCREGS
-+#if defined(__bfin__)
-+#define disable_opt __attribute__ ((optimize("O1")))
-+#else
-+#define disable_opt 
-+#endif
-+static void disable_opt FUNC(hevc_loop_filter_luma)(uint8_t *_pix,
-                                         ptrdiff_t _xstride, ptrdiff_t _ystride,
-                                         int beta, int *_tc,
-                                         uint8_t *_no_p, uint8_t *_no_q)

buildroot/package/ffmpeg/ffmpeg.mk

@@ -49,7 +49,6 @@ FFMPEG_CONF_OPTS = \
 	--disable-frei0r \
 	--disable-libopencore-amrnb \
 	--disable-libopencore-amrwb \
-	--disable-libcdio \
 	--disable-libdc1394 \
 	--disable-libgsm \
 	--disable-libilbc \
@@ -203,18 +202,25 @@ else
 FFMPEG_CONF_OPTS += --disable-libfdk-aac
 endif
 
+ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBCDIO_PARANOIA),yy)
+FFMPEG_CONF_OPTS += --enable-libcdio
+FFMPEG_DEPENDENCIES += libcdio-paranoia
+else
+FFMPEG_CONF_OPTS += --disable-libcdio
+endif
+
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl
 FFMPEG_DEPENDENCIES += gnutls
 else
 FFMPEG_CONF_OPTS += --disable-gnutls
-ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
 # openssl isn't license compatible with GPL
 ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx)
 FFMPEG_CONF_OPTS += --disable-openssl
 else
 FFMPEG_CONF_OPTS += --enable-openssl
-FFMPEG_DEPENDENCIES += libopenssl
+FFMPEG_DEPENDENCIES += openssl
 endif
 else
 FFMPEG_CONF_OPTS += --disable-openssl