From fa11a8eb845ff155989c479f08fbe2d8a4c30d09 Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Fri, 23 Mar 2018 14:50:38 +0100
Subject: [PATCH] fix target cortex-strings; fix ffmpeg.mk

---
 make/bootstrap.mk |  3 ++-
 make/ffmpeg.mk    | 14 ++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index d509458..cb599be 100755
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -164,7 +164,8 @@ $(D)/cortex-strings: $(ARCHIVE)/cortex-strings-git-$(CORTEX_STRINGS_VER).tar.gz
 	$(START_BUILD)
 	$(UNTAR)/cortex-strings-git-$(CORTEX_STRINGS_VER).tar.gz
 	set -e; cd $(BUILD_TMP)/cortex-strings-git-$(CORTEX_STRINGS_VER); \
-		$(CONFIGURE)
+		./autogen.sh; \
+		$(CONFIGURE) \
 			--prefix= \
 			--disable-shared \
 			--enable-static \
diff --git a/make/ffmpeg.mk b/make/ffmpeg.mk
index 7eb4296..e918f7c 100644
--- a/make/ffmpeg.mk
+++ b/make/ffmpeg.mk
@@ -95,10 +95,6 @@ FFMPEG_CONFIGURE = \
 		--enable-protocol=file \
 		--enable-protocol=http \
 		--enable-protocol=https \
-		--enable-protocol=rtmp \
-		--enable-protocol=rtmpe \
-		--enable-protocol=rtmps \
-		--enable-protocol=rtmpte \
 		--enable-protocol=mmsh \
 		--enable-protocol=mmst \
 		--enable-protocol=rtp \
@@ -427,13 +423,15 @@ endif
 FFMPEG_DEP =
 ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos))
 FFMPEG_CONFIGURE += --cpu=cortex-a9 --enable-vfp --extra-cflags="-mfpu=vfpv3-d16 -mfloat-abi=hard -I$(TARGETPREFIX)/include"
-else ifeq ($(PLATFORM), bcm7251s)
-FFMPEG_DEP = $(D)/libass $(D)/alsa-lib
-FFMPEG_CONFIGURE += --cpu=cortex-a15 --disable-vfp --extra-cflags="-Wno-deprecated-declarations -I$(TARGETPREFIX)/include"
-else
+endif
+ifeq ($(PLATFORM), nevis)
 FFMPEG_CONFIGURE += --disable-iconv
 FFMPEG_CONFIGURE += --cpu=armv6 --disable-vfp --extra-cflags="-I$(TARGETPREFIX)/include"
 endif
+ifeq ($(BOXTYPE), armbox)
+FFMPEG_DEP = $(D)/libass $(D)/alsa-lib
+FFMPEG_CONFIGURE += --cpu=cortex-a15 --disable-vfp --extra-cflags="-Wno-deprecated-declarations -I$(TARGETPREFIX)/include"
+endif
 
 $(D)/ffmpeg-armbox: $(ARCHIVE)/ffmpeg-$(FFMPEG_VER).tar.xz | $(TARGETPREFIX)
 	$(START_BUILD)
-- 
2.39.5