fix target cortex-strings; fix ffmpeg.mk

diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index d5094584c5073a797fa0bf2e52a6f1d3187dd518..cb599be7bc093495ae25abbe5c5c52821c78abec 100755 (executable)
--- 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 7eb42966d9430b10261847a39daf65f73fbcbc30..e918f7c38b7ac22a3f04c299c4eec1812b69f2bd 100644 (file)
--- 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)