From fbcecf46a775ccbd7c200fc3cf4ebeb4ab76f66a Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Mon, 14 Jan 2019 18:31:43 +0200
Subject: [PATCH] ffmpeg 3.3 will not work with ffmpeg.mk for 3.4

---
 package/ffmpeg/ffmpeg.mk | 51 ++++++++++------------------------------
 1 file changed, 12 insertions(+), 39 deletions(-)

diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 20791d28fb..751d53b26a 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -49,14 +49,18 @@ FFMPEG_CONF_OPTS = \
 	--disable-frei0r \
 	--disable-libopencore-amrnb \
 	--disable-libopencore-amrwb \
+	--disable-libcdio \
 	--disable-libdc1394 \
 	--disable-libgsm \
 	--disable-libilbc \
+	--disable-libnut \
+	--disable-libopenjpeg \
+	--disable-libschroedinger \
 	--disable-libvo-amrwbenc \
 	--disable-symver \
 	--disable-doc
 
-FFMPEG_DEPENDENCIES += host-pkgconf
+FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
 
 ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
 FFMPEG_CONF_OPTS += --enable-gpl
@@ -157,10 +161,7 @@ endif
 ifeq ($(BR2_PACKAGE_FFMPEG_INDEVS),y)
 FFMPEG_CONF_OPTS += --enable-indevs
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
-FFMPEG_CONF_OPTS += --enable-alsa
 FFMPEG_DEPENDENCIES += alsa-lib
-else
-FFMPEG_CONF_OPTS += --disable-alsa
 endif
 else
 FFMPEG_CONF_OPTS += --disable-indevs
@@ -202,25 +203,18 @@ 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_OPENSSL),y)
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),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 += openssl
+FFMPEG_DEPENDENCIES += libopenssl
 endif
 else
 FFMPEG_CONF_OPTS += --disable-openssl
@@ -231,13 +225,6 @@ ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBEBUR128),yy)
 FFMPEG_DEPENDENCIES += libebur128
 endif
 
-ifeq ($(BR2_PACKAGE_LIBDRM),y)
-FFMPEG_CONF_OPTS += --enable-libdrm
-FFMPEG_DEPENDENCIES += libdrm
-else
-FFMPEG_CONF_OPTS += --disable-libdrm
-endif
-
 ifeq ($(BR2_PACKAGE_LIBOPENH264),y)
 FFMPEG_CONF_OPTS += --enable-libopenh264
 FFMPEG_DEPENDENCIES += libopenh264
@@ -267,10 +254,10 @@ else
 FFMPEG_CONF_OPTS += --disable-vdpau
 endif
 
-ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+ifeq ($(BR2_PACKAGE_RPI_FIRMWARE)$(BR2_PACKAGE_RPI_USERLAND),yy)
 FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \
 	--extra-cflags=-I$(STAGING_DIR)/usr/include/IL
-FFMPEG_DEPENDENCIES += rpi-userland
+FFMPEG_DEPENDENCIES += rpi-firmware rpi-userland
 else
 FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi
 endif
@@ -357,13 +344,6 @@ else
 FFMPEG_CONF_OPTS += --disable-libwavpack
 endif
 
-ifeq ($(BR2_PACKAGE_LIBICONV),y)
-FFMPEG_CONF_OPTS += --enable-iconv
-FFMPEG_DEPENDENCIES += libiconv
-else
-FFMPEG_CONF_OPTS += --disable-iconv
-endif
-
 # ffmpeg freetype support require fenv.h which is only
 # available/working on glibc.
 # The microblaze variant doesn't provide the needed exceptions
@@ -381,13 +361,6 @@ else
 FFMPEG_CONF_OPTS += --disable-fontconfig
 endif
 
-ifeq ($(BR2_PACKAGE_OPENJPEG),y)
-FFMPEG_CONF_OPTS += --enable-libopenjpeg
-FFMPEG_DEPENDENCIES += openjpeg
-else
-FFMPEG_CONF_OPTS += --disable-libopenjpeg
-endif
-
 ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy)
 FFMPEG_CONF_OPTS += --enable-libx264
 FFMPEG_DEPENDENCIES += x264
@@ -403,10 +376,10 @@ FFMPEG_CONF_OPTS += --disable-libx265
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_MMX),y)
-FFMPEG_CONF_OPTS += --enable-x86asm
-FFMPEG_DEPENDENCIES += host-nasm
+FFMPEG_CONF_OPTS += --enable-yasm
+FFMPEG_DEPENDENCIES += host-yasm
 else
-FFMPEG_CONF_OPTS += --disable-x86asm
+FFMPEG_CONF_OPTS += --disable-yasm
 FFMPEG_CONF_OPTS += --disable-mmx
 endif