From 8d34f44c9c0ed962dc5e14c2efb28bae54575f8a Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Sun, 8 Nov 2015 18:41:42 +0100
Subject: [PATCH] fix building ffmpeg-head for Nevis, Apollo, Kronos

add mpegts muxer support (Web-TV recording)
---
 doc/config.example  |    6 +-
 make/environment.mk |    2 +
 make/libraries.mk   | 1471 ++++---------------------------------------
 3 files changed, 117 insertions(+), 1362 deletions(-)

diff --git a/doc/config.example b/doc/config.example
index 61b449b..a65844a 100755
--- a/doc/config.example
+++ b/doc/config.example
@@ -48,11 +48,9 @@ CST_KERNEL_VERSION=2.6.34.13
 CST_DRIVER_VERSION=master
 
 # choose one of the following coolstream ffmpeg versions:
+# CST_FFMPEG_VERSION=ffmpeg-head
 # CST_FFMPEG_VERSION=ffmpeg-2.3.3
-# CST_FFMPEG_VERSION=ffmpeg-2.2.4
-# CST_FFMPEG_VERSION=master
-# CST_FFMPEG_VERSION=coolstream
-CST_FFMPEG_VERSION=ffmpeg-2.3.3
+CST_FFMPEG_VERSION=ffmpeg-head
 
 ###########################################################################################
 ###########################################################################################
diff --git a/make/environment.mk b/make/environment.mk
index 8e8d7e3..0cf24c5 100755
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -41,6 +41,8 @@ ifeq ($(GCC), 4.9)
 	G_C_C = $(GCC_4_9_1)
 endif
 
+BOXARCH = arm
+
 TARGET_NEVIS = arm-cx2450x-linux-gnueabi
 TARGET_APOLLO = arm-pnx8400-linux-uclibcgnueabi
 TARGET_KRONOS = arm-pnx8400-linux-uclibcgnueabi
diff --git a/make/libraries.mk b/make/libraries.mk
index efc1a01..3ae2883 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -254,1369 +254,121 @@ $(D)/libbluray: $(ARCHIVE)/libbluray-0.5.0.tar.bz2 | $(TARGETPREFIX)
 	$(REMOVE)/libbluray-0.5.0
 	touch $@
 
-$(D)/ffmpeg: $(D)/libxslt $(D)/libbluray | $(TARGETPREFIX)
-	if [ $(PLATFORM) = "nevis" ]; then \
-		if [ $(CST_FFMPEG_VERSION) = "ffmpeg-2.3.3" ]; then \
-			$(MAKE) $(D)/ffmpeg-2.3.3-nevis; \
-		elif [ $(CST_FFMPEG_VERSION) = "ffmpeg-2.2.4" ]; then \
-			$(MAKE) $(D)/ffmpeg-2.2.4-nevis; \
-		elif [ $(CST_FFMPEG_VERSION) = "master" ]; then \
-			$(MAKE) $(D)/ffmpeg-master-nevis; \
-		elif [ $(CST_FFMPEG_VERSION) = "coolstream" ]; then \
-			$(MAKE) $(D)/ffmpeg-coolstream-nevis; \
-		else \
-			$(MAKE) $(D)/ffmpeg-master-nevis; \
-		fi; \
-	elif [ $(PLATFORM) = "apollo" ]; then \
-		if [ $(CST_FFMPEG_VERSION) = "ffmpeg-2.3.3" ]; then \
-			$(MAKE) $(D)/ffmpeg-2.3.3-apollo; \
-		elif [ $(CST_FFMPEG_VERSION) = "ffmpeg-2.2.4" ]; then \
-			$(MAKE) $(D)/ffmpeg-2.2.4-apollo; \
-		elif [ $(CST_FFMPEG_VERSION) = "master" ]; then \
-			$(MAKE) $(D)/ffmpeg-master-apollo; \
-		elif [ $(CST_FFMPEG_VERSION) = "coolstream" ]; then \
-			$(MAKE) $(D)/ffmpeg-coolstream-nevis; \
-		else \
-			$(MAKE) $(D)/ffmpeg-2.3.3-apollo; \
-		fi; \
-	elif [ $(PLATFORM) = "kronos" ]; then \
-		if [ $(CST_FFMPEG_VERSION) = "ffmpeg-2.3.3" ]; then \
-			$(MAKE) $(D)/ffmpeg-2.3.3-kronos; \
-		elif [ $(CST_FFMPEG_VERSION) = "ffmpeg-2.2.4" ]; then \
-			$(MAKE) $(D)/ffmpeg-2.2.4-kronos; \
-		elif [ $(CST_FFMPEG_VERSION) = "master" ]; then \
-			$(MAKE) $(D)/ffmpeg-master-kronos; \
-		elif [ $(CST_FFMPEG_VERSION) = "coolstream" ]; then \
-			$(MAKE) $(D)/ffmpeg-coolstream-kronos; \
-		else \
-			$(MAKE) $(D)/ffmpeg-2.3.3-kronos; \
-		fi; \
-	else \
-		if [ $(CST_FFMPEG_VERSION) = "ffmpeg-2.3.3" ]; then \
-			$(MAKE) $(D)/ffmpeg-2.3.3-nevis; \
-		elif [ $(CST_FFMPEG_VERSION) = "ffmpeg-2.2.4" ]; then \
-			$(MAKE) $(D)/ffmpeg-2.2.4-nevis; \
-		elif [ $(CST_FFMPEG_VERSION) = "master" ]; then \
-			$(MAKE) $(D)/ffmpeg-master-nevis; \
-		elif [ $(CST_FFMPEG_VERSION) = "coolstream" ]; then \
-			$(MAKE) $(D)/ffmpeg-coolstream-nevis; \
-		else \
-			$(MAKE) $(D)/ffmpeg-master-nevis; \
-		fi; \
-	fi
-	touch $@
-
-$(D)/ffmpeg-2.3.3-nevis: | $(TARGETPREFIX)
-	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
-	pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		CFLAGS=-march=armv6 \
-		./configure \
-			--disable-parsers \
-			--enable-parser=aac \
-			--enable-parser=aac_latm \
-			--enable-parser=ac3 \
-			--enable-parser=ac3 \
-			--enable-parser=dca \
-			--enable-parser=mpeg4video \
-			--enable-parser=mpegvideo \
-			--enable-parser=mpegaudio \
-			--enable-parser=h264 \
-			--enable-parser=vc1 \
-			--enable-parser=dvdsub \
-			--enable-parser=dvbsub \
-			--enable-parser=flac \
-			--enable-parser=vorbis \
-			--disable-decoders \
-			--enable-decoder=dca \
-			--enable-decoder=dvdsub \
-			--enable-decoder=dvbsub \
-			--enable-decoder=text \
-			--enable-decoder=srt \
-			--enable-decoder=subrip \
-			--enable-decoder=subviewer \
-			--enable-decoder=subviewer1 \
-			--enable-decoder=xsub \
-			--enable-decoder=pgssub \
-			--enable-decoder=mp3 \
-			--enable-decoder=flac \
-			--enable-decoder=vorbis \
-			--enable-decoder=aac \
-			--enable-decoder=mjpeg \
-			--enable-decoder=pcm_s16le \
-			--enable-decoder=pcm_s16le_planar \
-			--disable-demuxers \
-			--enable-demuxer=aac \
-			--enable-demuxer=ac3 \
-			--enable-demuxer=avi \
-			--enable-demuxer=mov \
-			--enable-demuxer=vc1 \
-			--enable-demuxer=mpegts \
-			--enable-demuxer=mpegtsraw \
-			--enable-demuxer=mpegps \
-			--enable-demuxer=mpegvideo \
-			--enable-demuxer=wav \
-			--enable-demuxer=pcm_s16be \
-			--enable-demuxer=mp3 \
-			--enable-demuxer=pcm_s16le \
-			--enable-demuxer=matroska \
-			--enable-demuxer=flv \
-			--enable-demuxer=rm \
-			--enable-demuxer=rtsp \
-			--enable-demuxer=hls \
-			--enable-demuxer=dts \
-			--enable-demuxer=wav \
-			--enable-demuxer=ogg \
-			--enable-demuxer=flac \
-			--enable-demuxer=srt \
-			--disable-encoders \
-			--disable-muxers \
-			--disable-ffplay \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--disable-static \
-			--disable-filters \
-			--disable-protocols \
-			--enable-protocol=file \
-			--enable-protocol=http \
-			--enable-protocol=rtmp \
-			--enable-protocol=rtmpe \
-			--enable-protocol=rtmps \
-			--enable-protocol=rtmpte \
-			--enable-protocol=mmsh \
-			--enable-protocol=mmst \
-			--enable-bsfs \
-			--disable-devices \
-			--enable-swresample \
-			--disable-postproc \
-			--disable-swscale \
-			--disable-mmx     \
-			--disable-altivec  \
-			--enable-network \
-			--enable-cross-compile \
-			--enable-shared \
-			--enable-bzlib \
-			--enable-debug \
-			--enable-stripping \
-			--enable-decoder=h264 \
-			--enable-decoder=vc1 \
-			--target-os=linux \
-			--arch=arm \
-			--disable-neon \
-			--cross-prefix=$(TARGET)- \
-			--prefix=$(TARGETPREFIX) \
-			--extra-cflags="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2" \
-			--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lxml2" && \
-		$(MAKE) && \
-		$(MAKE) install
-		if ! test -e $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h; then \
-			set -e; cd $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION); \
-			./version.sh ./ version.h; \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		else \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		fi
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REMOVE)/ffmpeg
-
-$(D)/ffmpeg-2.2.4-nevis: | $(TARGETPREFIX)
-	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
-	pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		CFLAGS=-march=armv6 \
-		./configure \
-			--disable-parsers \
-			--enable-parser=aac \
-			--enable-parser=aac_latm \
-			--enable-parser=ac3 \
-			--enable-parser=ac3 \
-			--enable-parser=dca \
-			--enable-parser=mpeg4video \
-			--enable-parser=mpegvideo \
-			--enable-parser=mpegaudio \
-			--enable-parser=h264 \
-			--enable-parser=vc1 \
-			--enable-parser=dvdsub \
-			--enable-parser=dvbsub \
-			--enable-parser=flac \
-			--enable-parser=vorbis \
-			--disable-decoders \
-			--enable-decoder=dca \
-			--enable-decoder=dvdsub \
-			--enable-decoder=dvbsub \
-			--enable-decoder=text \
-			--enable-decoder=srt \
-			--enable-decoder=subrip \
-			--enable-decoder=subviewer \
-			--enable-decoder=subviewer1 \
-			--enable-decoder=xsub \
-			--enable-decoder=pgssub \
-			--enable-decoder=mp3 \
-			--enable-decoder=flac \
-			--enable-decoder=vorbis \
-			--enable-decoder=aac \
-			--enable-decoder=mjpeg \
-			--enable-decoder=pcm_s16le \
-			--enable-decoder=pcm_s16le_planar \
-			--disable-demuxers \
-			--enable-demuxer=aac \
-			--enable-demuxer=ac3 \
-			--enable-demuxer=avi \
-			--enable-demuxer=mov \
-			--enable-demuxer=vc1 \
-			--enable-demuxer=mpegts \
-			--enable-demuxer=mpegtsraw \
-			--enable-demuxer=mpegps \
-			--enable-demuxer=mpegvideo \
-			--enable-demuxer=wav \
-			--enable-demuxer=pcm_s16be \
-			--enable-demuxer=mp3 \
-			--enable-demuxer=pcm_s16le \
-			--enable-demuxer=matroska \
-			--enable-demuxer=flv \
-			--enable-demuxer=rm \
-			--enable-demuxer=rtsp \
-			--enable-demuxer=hls \
-			--enable-demuxer=dts \
-			--enable-demuxer=wav \
-			--enable-demuxer=ogg \
-			--enable-demuxer=flac \
-			--enable-demuxer=srt \
-			--disable-encoders \
-			--disable-muxers \
-			--disable-ffplay \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--disable-static \
-			--disable-filters \
-			--disable-protocols \
-			--enable-protocol=file \
-			--enable-protocol=http \
-			--enable-protocol=rtmp \
-			--enable-protocol=rtmpe \
-			--enable-protocol=rtmps \
-			--enable-protocol=rtmpte \
-			--enable-protocol=mmsh \
-			--enable-protocol=mmst \
-			--enable-protocol=bluray \
-			--enable-bsfs \
-			--disable-devices \
-			--enable-swresample \
-			--disable-postproc \
-			--disable-swscale \
-			--disable-mmx     \
-			--disable-altivec  \
-			--enable-libbluray \
-			--enable-network \
-			--enable-cross-compile \
-			--enable-shared \
-			--enable-bzlib \
-			--enable-debug \
-			--enable-stripping \
-			--target-os=linux \
-			--arch=arm \
-			--disable-neon \
-			--cpu=armv6 \
-			--cross-prefix=$(TARGET)- \
-			--prefix=$(TARGETPREFIX) \
-			--extra-cflags="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libbluray" \
-			--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lbluray -lxml2" && \
-		$(MAKE) && \
-		$(MAKE) install
-		if ! test -e $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h; then \
-			set -e; cd $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION); \
-			./version.sh ./ version.h; \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		else \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		fi
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REMOVE)/ffmpeg
-
-$(D)/ffmpeg-master-nevis: | $(TARGETPREFIX)
-	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
-	pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		CFLAGS=-march=armv6 \
-		./configure \
-			--disable-parsers \
-			--enable-parser=aac \
-			--enable-parser=aac_latm \
-			--enable-parser=ac3 \
-			--enable-parser=ac3 \
-			--enable-parser=dca \
-			--enable-parser=mpeg4video \
-			--enable-parser=mpegvideo \
-			--enable-parser=mpegaudio \
-			--enable-parser=h264 \
-			--enable-parser=vc1 \
-			--enable-parser=dvdsub \
-			--enable-parser=dvbsub \
-			--enable-parser=flac \
-			--enable-parser=vorbis \
-			--disable-decoders \
-			--enable-decoder=dca \
-			--enable-decoder=dvdsub \
-			--enable-decoder=dvbsub \
-			--enable-decoder=text \
-			--enable-decoder=srt \
-			--enable-decoder=subrip \
-			--enable-decoder=subviewer \
-			--enable-decoder=subviewer1 \
-			--enable-decoder=xsub \
-			--enable-decoder=pgssub \
-			--enable-decoder=mp3 \
-			--enable-decoder=flac \
-			--enable-decoder=vorbis \
-			--enable-decoder=aac \
-			--enable-decoder=mjpeg \
-			--enable-decoder=pcm_s16le \
-			--enable-decoder=pcm_s16le_planar \
-			--disable-demuxers \
-			--enable-demuxer=aac \
-			--enable-demuxer=ac3 \
-			--enable-demuxer=avi \
-			--enable-demuxer=mov \
-			--enable-demuxer=vc1 \
-			--enable-demuxer=mpegts \
-			--enable-demuxer=mpegtsraw \
-			--enable-demuxer=mpegps \
-			--enable-demuxer=mpegvideo \
-			--enable-demuxer=wav \
-			--enable-demuxer=pcm_s16be \
-			--enable-demuxer=mp3 \
-			--enable-demuxer=pcm_s16le \
-			--enable-demuxer=matroska \
-			--enable-demuxer=flv \
-			--enable-demuxer=rm \
-			--enable-demuxer=rtsp \
-			--enable-demuxer=hls \
-			--enable-demuxer=dts \
-			--enable-demuxer=wav \
-			--enable-demuxer=ogg \
-			--enable-demuxer=flac \
-			--enable-demuxer=srt \
-			--disable-encoders \
-			--disable-muxers \
-			--disable-ffplay \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--disable-static \
-			--disable-filters \
-			--disable-protocols \
-			--enable-protocol=file \
-			--enable-protocol=http \
-			--enable-protocol=rtmp \
-			--enable-protocol=rtmpe \
-			--enable-protocol=rtmps \
-			--enable-protocol=rtmpte \
-			--enable-protocol=mmsh \
-			--enable-protocol=mmst \
-			--enable-protocol=bluray \
-			--enable-bsfs \
-			--disable-devices \
-			--enable-swresample \
-			--disable-postproc \
-			--disable-swscale \
-			--disable-mmx     \
-			--disable-altivec  \
-			--enable-libbluray \
-			--enable-network \
-			--enable-cross-compile \
-			--enable-shared \
-			--enable-bzlib \
-			--enable-debug \
-			--enable-stripping \
-			--target-os=linux \
-			--arch=arm \
-			--disable-neon \
-			--cpu=armv6 \
-			--cross-prefix=$(TARGET)- \
-			--prefix=$(TARGETPREFIX) \
-			--extra-cflags="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libbluray" \
-			--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lbluray -lxml2" && \
-		$(MAKE) && \
-		$(MAKE) install
-		if ! test -e $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h; then \
-			set -e; cd $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION); \
-			./version.sh ./ version.h; \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		else \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		fi
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REMOVE)/ffmpeg
-
-$(D)/ffmpeg-coolstream-nevis: | $(TARGETPREFIX)
-	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
-	pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		CFLAGS=-march=armv6 \
-		./configure \
-			--disable-parsers \
-			--enable-parser=aac \
-			--enable-parser=aac_latm \
-			--enable-parser=ac3 \
-			--enable-parser=ac3 \
-			--enable-parser=dca \
-			--enable-parser=mpeg4video \
-			--enable-parser=mpegvideo \
-			--enable-parser=mpegaudio \
-			--enable-parser=h264 \
-			--enable-parser=vc1 \
-			--enable-parser=dvdsub \
-			--enable-parser=dvbsub \
-			--disable-decoders \
-			--enable-decoder=dca \
-			--enable-decoder=dvdsub \
-			--enable-decoder=dvbsub \
-			--enable-decoder=text \
-			--enable-decoder=srt \
-			--enable-decoder=subrip \
-			--enable-decoder=subviewer \
-			--enable-decoder=subviewer1 \
-			--enable-decoder=xsub \
-			--enable-decoder=pgssub \
-			--disable-demuxers \
-			--enable-demuxer=aac \
-			--enable-demuxer=ac3 \
-			--enable-demuxer=avi \
-			--enable-demuxer=mov \
-			--enable-demuxer=vc1 \
-			--enable-demuxer=mpegts \
-			--enable-demuxer=mpegtsraw \
-			--enable-demuxer=mpegps \
-			--enable-demuxer=mpegvideo \
-			--enable-demuxer=wav \
-			--enable-demuxer=pcm_s16be \
-			--enable-demuxer=mp3 \
-			--enable-demuxer=pcm_s16le \
-			--enable-demuxer=matroska \
-			--enable-demuxer=flv \
-			--enable-demuxer=rm \
-			--disable-encoders \
-			--disable-muxers \
-			--disable-ffplay \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--disable-static \
-			--disable-filters \
-			--disable-protocols \
-			--enable-protocol=file \
-			--enable-protocol=http \
-			--enable-bsfs \
-			--disable-devices \
-			--enable-swresample \
-			--disable-postproc \
-			--disable-swscale \
-			--disable-mmx     \
-			--disable-altivec  \
-			--disable-zlib   \
-			--enable-network \
-			--enable-cross-compile \
-			--enable-shared \
-			--enable-bzlib \
-			--enable-debug \
-			--enable-stripping \
-			--target-os=linux \
-			--arch=arm \
-			--disable-neon \
-			--cpu=armv6 \
-			--cross-prefix=$(TARGET)- \
-			--prefix=$(TARGETPREFIX) \
-			--extra-cflags="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2" \
-			--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lxml2" && \
-		$(MAKE) && \
-		$(MAKE) install
-		if ! test -e $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h; then \
-			set -e; cd $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION); \
-			./version.sh ./ version.h; \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		else \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		fi
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REMOVE)/ffmpeg
+ifeq ($(BOXARCH), arm)
+FFMPEG_CONFIGURE = \
+		--disable-parsers \
+		--enable-parser=aac \
+		--enable-parser=aac_latm \
+		--enable-parser=ac3 \
+		--enable-parser=dca \
+		--enable-parser=mpeg4video \
+		--enable-parser=mpegvideo \
+		--enable-parser=mpegaudio \
+		--enable-parser=h264 \
+		--enable-parser=vc1 \
+		--enable-parser=dvdsub \
+		--enable-parser=dvbsub \
+		--enable-parser=flac \
+		--enable-parser=vorbis \
+		--disable-decoders \
+		--enable-decoder=dca \
+		--enable-decoder=dvdsub \
+		--enable-decoder=dvbsub \
+		--enable-decoder=text \
+		--enable-decoder=srt \
+		--enable-decoder=subrip \
+		--enable-decoder=subviewer \
+		--enable-decoder=subviewer1 \
+		--enable-decoder=xsub \
+		--enable-decoder=pgssub \
+		--enable-decoder=movtext \
+		--enable-decoder=mp3 \
+		--enable-decoder=flac \
+		--enable-decoder=vorbis \
+		--enable-decoder=aac \
+		--enable-decoder=mjpeg \
+		--enable-decoder=pcm_s16le \
+		--enable-decoder=pcm_s16le_planar \
+		--disable-demuxers \
+		--enable-demuxer=aac \
+		--enable-demuxer=ac3 \
+		--enable-demuxer=avi \
+		--enable-demuxer=mov \
+		--enable-demuxer=vc1 \
+		--enable-demuxer=mpegts \
+		--enable-demuxer=mpegtsraw \
+		--enable-demuxer=mpegps \
+		--enable-demuxer=mpegvideo \
+		--enable-demuxer=wav \
+		--enable-demuxer=pcm_s16be \
+		--enable-demuxer=mp3 \
+		--enable-demuxer=pcm_s16le \
+		--enable-demuxer=matroska \
+		--enable-demuxer=flv \
+		--enable-demuxer=rm \
+		--enable-demuxer=rtsp \
+		--enable-demuxer=hls \
+		--enable-demuxer=dts \
+		--enable-demuxer=wav \
+		--enable-demuxer=ogg \
+		--enable-demuxer=flac \
+		--enable-demuxer=srt \
+		--enable-demuxer=hds \
+		--disable-encoders \
+		--disable-muxers \
+		--enable-muxer=mpegts \
+		--disable-ffplay \
+		--disable-ffmpeg \
+		--disable-ffserver \
+		--disable-ffprobe \
+		--disable-static \
+		--disable-filters \
+		--disable-protocols \
+		--enable-protocol=file \
+		--enable-protocol=http \
+		--enable-protocol=rtmp \
+		--enable-protocol=rtmpe \
+		--enable-protocol=rtmps \
+		--enable-protocol=rtmpte \
+		--enable-protocol=mmsh \
+		--enable-protocol=mmst \
+		--enable-bsfs \
+		--disable-devices \
+		--enable-swresample \
+		--disable-postproc \
+		--disable-swscale \
+		--disable-mmx \
+		--disable-altivec \
+		--enable-network \
+		--enable-cross-compile \
+		--enable-shared \
+		--enable-bzlib \
+		--enable-debug \
+		--enable-stripping \
+		--enable-decoder=h264 \
+		--enable-decoder=vc1 \
+		--target-os=linux \
+		--disable-neon \
+		--disable-doc \
+		--cross-prefix=$(TARGET)- \
+		--prefix=$(TARGETPREFIX) \
+		--arch=arm
+endif # ifeq ($(BOXARCH), arm)
+
+ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos))
+FFMPEG_CONFIGURE += --cpu=cortex-a9 --extra-cflags="-mfpu=vfpv3-d16 -mfloat-abi=hard -I$(TARGETPREFIX)/include" \
+--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lxml2 -L$(TARGETPREFIX)/lib"
+else
+FFMPEG_CONFIGURE += --cpu=armv6 --extra-cflags="-I$(TARGETPREFIX)/include" \
+--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lxml2 -L$(TARGETPREFIX)/lib"
+endif
 
-$(D)/ffmpeg-2.3.3-apollo: | $(TARGETPREFIX)
-	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
-	pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		CFLAGS="-mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard" \
-		./configure \
-			--disable-parsers \
-			--enable-parser=aac \
-			--enable-parser=aac_latm \
-			--enable-parser=ac3 \
-			--enable-parser=ac3 \
-			--enable-parser=dca \
-			--enable-parser=mpeg4video \
-			--enable-parser=mpegvideo \
-			--enable-parser=mpegaudio \
-			--enable-parser=h264 \
-			--enable-parser=vc1 \
-			--enable-parser=dvdsub \
-			--enable-parser=dvbsub \
-			--enable-parser=flac \
-			--enable-parser=vorbis \
-			--disable-decoders \
-			--enable-decoder=dca \
-			--enable-decoder=dvdsub \
-			--enable-decoder=dvbsub \
-			--enable-decoder=text \
-			--enable-decoder=srt \
-			--enable-decoder=subrip \
-			--enable-decoder=subviewer \
-			--enable-decoder=subviewer1 \
-			--enable-decoder=xsub \
-			--enable-decoder=pgssub \
-			--enable-decoder=mp3 \
-			--enable-decoder=flac \
-			--enable-decoder=vorbis \
-			--enable-decoder=aac \
-			--enable-decoder=mjpeg \
-			--enable-decoder=pcm_s16le \
-			--enable-decoder=pcm_s16le_planar \
-			--disable-demuxers \
-			--enable-demuxer=aac \
-			--enable-demuxer=ac3 \
-			--enable-demuxer=avi \
-			--enable-demuxer=mov \
-			--enable-demuxer=vc1 \
-			--enable-demuxer=mpegts \
-			--enable-demuxer=mpegtsraw \
-			--enable-demuxer=mpegps \
-			--enable-demuxer=mpegvideo \
-			--enable-demuxer=wav \
-			--enable-demuxer=pcm_s16be \
-			--enable-demuxer=mp3 \
-			--enable-demuxer=pcm_s16le \
-			--enable-demuxer=matroska \
-			--enable-demuxer=flv \
-			--enable-demuxer=rm \
-			--enable-demuxer=rtsp \
-			--enable-demuxer=hls \
-			--enable-demuxer=dts \
-			--enable-demuxer=wav \
-			--enable-demuxer=ogg \
-			--enable-demuxer=flac \
-			--enable-demuxer=srt \
-			--disable-encoders \
-			--disable-muxers \
-			--disable-ffplay \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--disable-static \
-			--disable-filters \
-			--disable-protocols \
-			--enable-protocol=file \
-			--enable-protocol=http \
-			--enable-protocol=rtmp \
-			--enable-protocol=rtmpe \
-			--enable-protocol=rtmps \
-			--enable-protocol=rtmpte \
-			--enable-protocol=mmsh \
-			--enable-protocol=mmst \
-			--enable-bsfs \
-			--disable-devices \
-			--enable-swresample \
-			--disable-postproc \
-			--disable-swscale \
-			--disable-mmx     \
-			--disable-altivec  \
-			--enable-network \
-			--enable-cross-compile \
-			--enable-shared \
-			--enable-bzlib \
-			--enable-debug \
-			--enable-stripping \
-			--enable-decoder=h264 \
-			--enable-decoder=vc1 \
-			--target-os=linux \
-			--arch=arm \
-			--disable-neon \
-			--cross-prefix=$(TARGET)- \
-			--prefix=$(TARGETPREFIX) \
-			--extra-cflags="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2" \
-			--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lxml2" && \
-		$(MAKE) && \
-		$(MAKE) install
-		if ! test -e $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h; then \
-			set -e; cd $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION); \
-			./version.sh ./ version.h; \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		else \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		fi
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REMOVE)/ffmpeg
-
-$(D)/ffmpeg-2.2.4-apollo: | $(TARGETPREFIX)
-	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
-	pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		CFLAGS="-mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard" \
-		./configure \
-			--disable-parsers \
-			--enable-parser=aac \
-			--enable-parser=aac_latm \
-			--enable-parser=ac3 \
-			--enable-parser=ac3 \
-			--enable-parser=dca \
-			--enable-parser=mpeg4video \
-			--enable-parser=mpegvideo \
-			--enable-parser=mpegaudio \
-			--enable-parser=h264 \
-			--enable-parser=vc1 \
-			--enable-parser=dvdsub \
-			--enable-parser=dvbsub \
-			--enable-parser=flac \
-			--enable-parser=vorbis \
-			--disable-decoders \
-			--enable-decoder=dca \
-			--enable-decoder=dvdsub \
-			--enable-decoder=dvbsub \
-			--enable-decoder=text \
-			--enable-decoder=srt \
-			--enable-decoder=subrip \
-			--enable-decoder=subviewer \
-			--enable-decoder=subviewer1 \
-			--enable-decoder=xsub \
-			--enable-decoder=pgssub \
-			--enable-decoder=mp3 \
-			--enable-decoder=flac \
-			--enable-decoder=vorbis \
-			--enable-decoder=aac \
-			--enable-decoder=mjpeg \
-			--enable-decoder=pcm_s16le \
-			--enable-decoder=pcm_s16le_planar \
-			--disable-demuxers \
-			--enable-demuxer=aac \
-			--enable-demuxer=ac3 \
-			--enable-demuxer=avi \
-			--enable-demuxer=mov \
-			--enable-demuxer=vc1 \
-			--enable-demuxer=mpegts \
-			--enable-demuxer=mpegtsraw \
-			--enable-demuxer=mpegps \
-			--enable-demuxer=mpegvideo \
-			--enable-demuxer=wav \
-			--enable-demuxer=pcm_s16be \
-			--enable-demuxer=mp3 \
-			--enable-demuxer=pcm_s16le \
-			--enable-demuxer=matroska \
-			--enable-demuxer=flv \
-			--enable-demuxer=rm \
-			--enable-demuxer=rtsp \
-			--enable-demuxer=hls \
-			--enable-demuxer=dts \
-			--enable-demuxer=wav \
-			--enable-demuxer=ogg \
-			--enable-demuxer=flac \
-			--enable-demuxer=srt \
-			--disable-encoders \
-			--disable-muxers \
-			--disable-ffplay \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--disable-static \
-			--disable-filters \
-			--disable-protocols \
-			--enable-protocol=file \
-			--enable-protocol=http \
-			--enable-protocol=rtmp \
-			--enable-protocol=rtmpe \
-			--enable-protocol=rtmps \
-			--enable-protocol=rtmpte \
-			--enable-protocol=mmsh \
-			--enable-protocol=mmst \
-			--enable-protocol=bluray \
-			--enable-bsfs \
-			--disable-devices \
-			--enable-swresample \
-			--disable-postproc \
-			--disable-swscale \
-			--disable-mmx     \
-			--disable-altivec  \
-			--enable-libbluray \
-			--enable-network \
-			--enable-cross-compile \
-			--enable-shared \
-			--enable-bzlib \
-			--enable-debug \
-			--enable-stripping \
-			--target-os=linux \
-			--arch=arm \
-			--disable-neon \
-			--cross-prefix=$(TARGET)- \
-			--prefix=$(TARGETPREFIX) \
-			--extra-cflags="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libbluray" \
-			--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lbluray -lxml2" && \
-		$(MAKE) && \
-		$(MAKE) install
-		if ! test -e $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h; then \
-			set -e; cd $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION); \
-			./version.sh ./ version.h; \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		else \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		fi
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REMOVE)/ffmpeg
-
-$(D)/ffmpeg-master-apollo: | $(TARGETPREFIX)
-	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
-	pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		CFLAGS="-mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard" \
-		./configure \
-			--disable-parsers \
-			--enable-parser=aac \
-			--enable-parser=aac_latm \
-			--enable-parser=ac3 \
-			--enable-parser=ac3 \
-			--enable-parser=dca \
-			--enable-parser=mpeg4video \
-			--enable-parser=mpegvideo \
-			--enable-parser=mpegaudio \
-			--enable-parser=h264 \
-			--enable-parser=vc1 \
-			--enable-parser=dvdsub \
-			--enable-parser=dvbsub \
-			--enable-parser=flac \
-			--enable-parser=vorbis \
-			--disable-decoders \
-			--enable-decoder=dca \
-			--enable-decoder=dvdsub \
-			--enable-decoder=dvbsub \
-			--enable-decoder=text \
-			--enable-decoder=srt \
-			--enable-decoder=subrip \
-			--enable-decoder=subviewer \
-			--enable-decoder=subviewer1 \
-			--enable-decoder=xsub \
-			--enable-decoder=pgssub \
-			--enable-decoder=mp3 \
-			--enable-decoder=flac \
-			--enable-decoder=vorbis \
-			--enable-decoder=aac \
-			--enable-decoder=mjpeg \
-			--enable-decoder=pcm_s16le \
-			--enable-decoder=pcm_s16le_planar \
-			--disable-demuxers \
-			--enable-demuxer=aac \
-			--enable-demuxer=ac3 \
-			--enable-demuxer=avi \
-			--enable-demuxer=mov \
-			--enable-demuxer=vc1 \
-			--enable-demuxer=mpegts \
-			--enable-demuxer=mpegtsraw \
-			--enable-demuxer=mpegps \
-			--enable-demuxer=mpegvideo \
-			--enable-demuxer=wav \
-			--enable-demuxer=pcm_s16be \
-			--enable-demuxer=mp3 \
-			--enable-demuxer=pcm_s16le \
-			--enable-demuxer=matroska \
-			--enable-demuxer=flv \
-			--enable-demuxer=rm \
-			--enable-demuxer=rtsp \
-			--enable-demuxer=hls \
-			--enable-demuxer=dts \
-			--enable-demuxer=wav \
-			--enable-demuxer=ogg \
-			--enable-demuxer=flac \
-			--enable-demuxer=srt \
-			--disable-encoders \
-			--disable-muxers \
-			--disable-ffplay \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--disable-static \
-			--disable-filters \
-			--disable-protocols \
-			--enable-protocol=file \
-			--enable-protocol=http \
-			--enable-protocol=rtmp \
-			--enable-protocol=rtmpe \
-			--enable-protocol=rtmps \
-			--enable-protocol=rtmpte \
-			--enable-protocol=mmsh \
-			--enable-protocol=mmst \
-			--enable-protocol=bluray \
-			--enable-bsfs \
-			--disable-devices \
-			--enable-swresample \
-			--disable-postproc \
-			--disable-swscale \
-			--disable-mmx     \
-			--disable-altivec  \
-			--enable-libbluray \
-			--enable-network \
-			--enable-cross-compile \
-			--enable-shared \
-			--enable-bzlib \
-			--enable-debug \
-			--enable-stripping \
-			--target-os=linux \
-			--arch=arm \
-			--disable-neon \
-			--cross-prefix=$(TARGET)- \
-			--prefix=$(TARGETPREFIX) \
-			--extra-cflags="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libbluray" \
-			--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lbluray -lxml2" && \
-		$(MAKE) && \
-		$(MAKE) install
-		if ! test -e $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h; then \
-			set -e; cd $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION); \
-			./version.sh ./ version.h; \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		else \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		fi
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REMOVE)/ffmpeg
-
-$(D)/ffmpeg-coolstream-apollo: | $(TARGETPREFIX)
-	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
-	pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		CFLAGS="-mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard" \
-		./configure \
-			--disable-parsers \
-			--enable-parser=aac \
-			--enable-parser=aac_latm \
-			--enable-parser=ac3 \
-			--enable-parser=ac3 \
-			--enable-parser=dca \
-			--enable-parser=mpeg4video \
-			--enable-parser=mpegvideo \
-			--enable-parser=mpegaudio \
-			--enable-parser=h264 \
-			--enable-parser=vc1 \
-			--enable-parser=dvdsub \
-			--enable-parser=dvbsub \
-			--disable-decoders \
-			--enable-decoder=dca \
-			--enable-decoder=dvdsub \
-			--enable-decoder=dvbsub \
-			--enable-decoder=text \
-			--enable-decoder=srt \
-			--enable-decoder=subrip \
-			--enable-decoder=subviewer \
-			--enable-decoder=subviewer1 \
-			--enable-decoder=xsub \
-			--enable-decoder=pgssub \
-			--disable-demuxers \
-			--enable-demuxer=aac \
-			--enable-demuxer=ac3 \
-			--enable-demuxer=avi \
-			--enable-demuxer=mov \
-			--enable-demuxer=vc1 \
-			--enable-demuxer=mpegts \
-			--enable-demuxer=mpegtsraw \
-			--enable-demuxer=mpegps \
-			--enable-demuxer=mpegvideo \
-			--enable-demuxer=wav \
-			--enable-demuxer=pcm_s16be \
-			--enable-demuxer=mp3 \
-			--enable-demuxer=pcm_s16le \
-			--enable-demuxer=matroska \
-			--enable-demuxer=flv \
-			--enable-demuxer=rm \
-			--disable-encoders \
-			--disable-muxers \
-			--disable-ffplay \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--disable-static \
-			--disable-filters \
-			--disable-protocols \
-			--enable-protocol=file \
-			--enable-protocol=http \
-			--enable-bsfs \
-			--disable-devices \
-			--enable-swresample \
-			--disable-postproc \
-			--disable-swscale \
-			--disable-mmx     \
-			--disable-altivec  \
-			--disable-zlib   \
-			--enable-network \
-			--enable-cross-compile \
-			--enable-shared \
-			--enable-bzlib \
-			--enable-debug \
-			--enable-stripping \
-			--target-os=linux \
-			--arch=arm \
-			--disable-neon \
-			--cross-prefix=$(TARGET)- \
-			--prefix=$(TARGETPREFIX) \
-			--extra-cflags="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2" \
-			--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lxml2" && \
-		$(MAKE) && \
-		$(MAKE) install
-		if ! test -e $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h; then \
-			set -e; cd $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION); \
-			./version.sh ./ version.h; \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		else \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		fi
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REMOVE)/ffmpeg
-
-$(D)/ffmpeg-2.3.3-kronos: | $(TARGETPREFIX)
-	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
-	pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		CFLAGS="-mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard" \
-		./configure \
-			--disable-parsers \
-			--enable-parser=aac \
-			--enable-parser=aac_latm \
-			--enable-parser=ac3 \
-			--enable-parser=ac3 \
-			--enable-parser=dca \
-			--enable-parser=mpeg4video \
-			--enable-parser=mpegvideo \
-			--enable-parser=mpegaudio \
-			--enable-parser=h264 \
-			--enable-parser=vc1 \
-			--enable-parser=dvdsub \
-			--enable-parser=dvbsub \
-			--enable-parser=flac \
-			--enable-parser=vorbis \
-			--disable-decoders \
-			--enable-decoder=dca \
-			--enable-decoder=dvdsub \
-			--enable-decoder=dvbsub \
-			--enable-decoder=text \
-			--enable-decoder=srt \
-			--enable-decoder=subrip \
-			--enable-decoder=subviewer \
-			--enable-decoder=subviewer1 \
-			--enable-decoder=xsub \
-			--enable-decoder=pgssub \
-			--enable-decoder=mp3 \
-			--enable-decoder=flac \
-			--enable-decoder=vorbis \
-			--enable-decoder=aac \
-			--enable-decoder=mjpeg \
-			--enable-decoder=pcm_s16le \
-			--enable-decoder=pcm_s16le_planar \
-			--disable-demuxers \
-			--enable-demuxer=aac \
-			--enable-demuxer=ac3 \
-			--enable-demuxer=avi \
-			--enable-demuxer=mov \
-			--enable-demuxer=vc1 \
-			--enable-demuxer=mpegts \
-			--enable-demuxer=mpegtsraw \
-			--enable-demuxer=mpegps \
-			--enable-demuxer=mpegvideo \
-			--enable-demuxer=wav \
-			--enable-demuxer=pcm_s16be \
-			--enable-demuxer=mp3 \
-			--enable-demuxer=pcm_s16le \
-			--enable-demuxer=matroska \
-			--enable-demuxer=flv \
-			--enable-demuxer=rm \
-			--enable-demuxer=rtsp \
-			--enable-demuxer=hls \
-			--enable-demuxer=dts \
-			--enable-demuxer=wav \
-			--enable-demuxer=ogg \
-			--enable-demuxer=flac \
-			--enable-demuxer=srt \
-			--disable-encoders \
-			--disable-muxers \
-			--disable-ffplay \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--disable-static \
-			--disable-filters \
-			--disable-protocols \
-			--enable-protocol=file \
-			--enable-protocol=http \
-			--enable-protocol=rtmp \
-			--enable-protocol=rtmpe \
-			--enable-protocol=rtmps \
-			--enable-protocol=rtmpte \
-			--enable-protocol=mmsh \
-			--enable-protocol=mmst \
-			--enable-bsfs \
-			--disable-devices \
-			--enable-swresample \
-			--disable-postproc \
-			--disable-swscale \
-			--disable-mmx     \
-			--disable-altivec  \
-			--enable-network \
-			--enable-cross-compile \
-			--enable-shared \
-			--enable-bzlib \
-			--enable-debug \
-			--enable-stripping \
-			--enable-decoder=h264 \
-			--enable-decoder=vc1 \
-			--target-os=linux \
-			--arch=arm \
-			--disable-neon \
-			--cross-prefix=$(TARGET)- \
-			--prefix=$(TARGETPREFIX) \
-			--extra-cflags="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2" \
-			--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lxml2" && \
-		$(MAKE) && \
-		$(MAKE) install
-		if ! test -e $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h; then \
-			set -e; cd $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION); \
-			./version.sh ./ version.h; \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		else \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		fi
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REMOVE)/ffmpeg
-
-$(D)/ffmpeg-2.2.4-kronos: | $(TARGETPREFIX)
-	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
-	pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		CFLAGS="-mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard" \
-		./configure \
-			--disable-parsers \
-			--enable-parser=aac \
-			--enable-parser=aac_latm \
-			--enable-parser=ac3 \
-			--enable-parser=ac3 \
-			--enable-parser=dca \
-			--enable-parser=mpeg4video \
-			--enable-parser=mpegvideo \
-			--enable-parser=mpegaudio \
-			--enable-parser=h264 \
-			--enable-parser=vc1 \
-			--enable-parser=dvdsub \
-			--enable-parser=dvbsub \
-			--enable-parser=flac \
-			--enable-parser=vorbis \
-			--disable-decoders \
-			--enable-decoder=dca \
-			--enable-decoder=dvdsub \
-			--enable-decoder=dvbsub \
-			--enable-decoder=text \
-			--enable-decoder=srt \
-			--enable-decoder=subrip \
-			--enable-decoder=subviewer \
-			--enable-decoder=subviewer1 \
-			--enable-decoder=xsub \
-			--enable-decoder=pgssub \
-			--enable-decoder=mp3 \
-			--enable-decoder=flac \
-			--enable-decoder=vorbis \
-			--enable-decoder=aac \
-			--enable-decoder=mjpeg \
-			--enable-decoder=pcm_s16le \
-			--enable-decoder=pcm_s16le_planar \
-			--disable-demuxers \
-			--enable-demuxer=aac \
-			--enable-demuxer=ac3 \
-			--enable-demuxer=avi \
-			--enable-demuxer=mov \
-			--enable-demuxer=vc1 \
-			--enable-demuxer=mpegts \
-			--enable-demuxer=mpegtsraw \
-			--enable-demuxer=mpegps \
-			--enable-demuxer=mpegvideo \
-			--enable-demuxer=wav \
-			--enable-demuxer=pcm_s16be \
-			--enable-demuxer=mp3 \
-			--enable-demuxer=pcm_s16le \
-			--enable-demuxer=matroska \
-			--enable-demuxer=flv \
-			--enable-demuxer=rm \
-			--enable-demuxer=rtsp \
-			--enable-demuxer=hls \
-			--enable-demuxer=dts \
-			--enable-demuxer=wav \
-			--enable-demuxer=ogg \
-			--enable-demuxer=flac \
-			--enable-demuxer=srt \
-			--disable-encoders \
-			--disable-muxers \
-			--disable-ffplay \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--disable-static \
-			--disable-filters \
-			--disable-protocols \
-			--enable-protocol=file \
-			--enable-protocol=http \
-			--enable-protocol=rtmp \
-			--enable-protocol=rtmpe \
-			--enable-protocol=rtmps \
-			--enable-protocol=rtmpte \
-			--enable-protocol=mmsh \
-			--enable-protocol=mmst \
-			--enable-protocol=bluray \
-			--enable-bsfs \
-			--disable-devices \
-			--enable-swresample \
-			--disable-postproc \
-			--disable-swscale \
-			--disable-mmx     \
-			--disable-altivec  \
-			--enable-libbluray \
-			--enable-network \
-			--enable-cross-compile \
-			--enable-shared \
-			--enable-bzlib \
-			--enable-debug \
-			--enable-stripping \
-			--target-os=linux \
-			--arch=arm \
-			--disable-neon \
-			--cross-prefix=$(TARGET)- \
-			--prefix=$(TARGETPREFIX) \
-			--extra-cflags="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libbluray" \
-			--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lbluray -lxml2" && \
-		$(MAKE) && \
-		$(MAKE) install
-		if ! test -e $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h; then \
-			set -e; cd $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION); \
-			./version.sh ./ version.h; \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		else \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		fi
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REMOVE)/ffmpeg
-
-$(D)/ffmpeg-master-kronos: | $(TARGETPREFIX)
-	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
-	pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		CFLAGS="-mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard" \
-		./configure \
-			--disable-parsers \
-			--enable-parser=aac \
-			--enable-parser=aac_latm \
-			--enable-parser=ac3 \
-			--enable-parser=ac3 \
-			--enable-parser=dca \
-			--enable-parser=mpeg4video \
-			--enable-parser=mpegvideo \
-			--enable-parser=mpegaudio \
-			--enable-parser=h264 \
-			--enable-parser=vc1 \
-			--enable-parser=dvdsub \
-			--enable-parser=dvbsub \
-			--enable-parser=flac \
-			--enable-parser=vorbis \
-			--disable-decoders \
-			--enable-decoder=dca \
-			--enable-decoder=dvdsub \
-			--enable-decoder=dvbsub \
-			--enable-decoder=text \
-			--enable-decoder=srt \
-			--enable-decoder=subrip \
-			--enable-decoder=subviewer \
-			--enable-decoder=subviewer1 \
-			--enable-decoder=xsub \
-			--enable-decoder=pgssub \
-			--enable-decoder=mp3 \
-			--enable-decoder=flac \
-			--enable-decoder=vorbis \
-			--enable-decoder=aac \
-			--enable-decoder=mjpeg \
-			--enable-decoder=pcm_s16le \
-			--enable-decoder=pcm_s16le_planar \
-			--disable-demuxers \
-			--enable-demuxer=aac \
-			--enable-demuxer=ac3 \
-			--enable-demuxer=avi \
-			--enable-demuxer=mov \
-			--enable-demuxer=vc1 \
-			--enable-demuxer=mpegts \
-			--enable-demuxer=mpegtsraw \
-			--enable-demuxer=mpegps \
-			--enable-demuxer=mpegvideo \
-			--enable-demuxer=wav \
-			--enable-demuxer=pcm_s16be \
-			--enable-demuxer=mp3 \
-			--enable-demuxer=pcm_s16le \
-			--enable-demuxer=matroska \
-			--enable-demuxer=flv \
-			--enable-demuxer=rm \
-			--enable-demuxer=rtsp \
-			--enable-demuxer=hls \
-			--enable-demuxer=dts \
-			--enable-demuxer=wav \
-			--enable-demuxer=ogg \
-			--enable-demuxer=flac \
-			--enable-demuxer=srt \
-			--disable-encoders \
-			--disable-muxers \
-			--disable-ffplay \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--disable-static \
-			--disable-filters \
-			--disable-protocols \
-			--enable-protocol=file \
-			--enable-protocol=http \
-			--enable-protocol=rtmp \
-			--enable-protocol=rtmpe \
-			--enable-protocol=rtmps \
-			--enable-protocol=rtmpte \
-			--enable-protocol=mmsh \
-			--enable-protocol=mmst \
-			--enable-protocol=bluray \
-			--enable-bsfs \
-			--disable-devices \
-			--enable-swresample \
-			--disable-postproc \
-			--disable-swscale \
-			--disable-mmx     \
-			--disable-altivec  \
-			--enable-libbluray \
-			--enable-network \
-			--enable-cross-compile \
-			--enable-shared \
-			--enable-bzlib \
-			--enable-debug \
-			--enable-stripping \
-			--target-os=linux \
-			--arch=arm \
-			--disable-neon \
-			--cross-prefix=$(TARGET)- \
-			--prefix=$(TARGETPREFIX) \
-			--extra-cflags="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libbluray" \
-			--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lbluray -lxml2" && \
-		$(MAKE) && \
-		$(MAKE) install
-		if ! test -e $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h; then \
-			set -e; cd $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION); \
-			./version.sh ./ version.h; \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		else \
-			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
-		fi
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REMOVE)/ffmpeg
-
-$(D)/ffmpeg-coolstream-kronos: | $(TARGETPREFIX)
+$(D)/ffmpeg: $(D)/libxslt $(D)/libbluray | $(TARGETPREFIX)
 	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
 	pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
 		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		CFLAGS="-mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard" \
 		./configure \
-			--disable-parsers \
-			--enable-parser=aac \
-			--enable-parser=aac_latm \
-			--enable-parser=ac3 \
-			--enable-parser=ac3 \
-			--enable-parser=dca \
-			--enable-parser=mpeg4video \
-			--enable-parser=mpegvideo \
-			--enable-parser=mpegaudio \
-			--enable-parser=h264 \
-			--enable-parser=vc1 \
-			--enable-parser=dvdsub \
-			--enable-parser=dvbsub \
-			--disable-decoders \
-			--enable-decoder=dca \
-			--enable-decoder=dvdsub \
-			--enable-decoder=dvbsub \
-			--enable-decoder=text \
-			--enable-decoder=srt \
-			--enable-decoder=subrip \
-			--enable-decoder=subviewer \
-			--enable-decoder=subviewer1 \
-			--enable-decoder=xsub \
-			--enable-decoder=pgssub \
-			--disable-demuxers \
-			--enable-demuxer=aac \
-			--enable-demuxer=ac3 \
-			--enable-demuxer=avi \
-			--enable-demuxer=mov \
-			--enable-demuxer=vc1 \
-			--enable-demuxer=mpegts \
-			--enable-demuxer=mpegtsraw \
-			--enable-demuxer=mpegps \
-			--enable-demuxer=mpegvideo \
-			--enable-demuxer=wav \
-			--enable-demuxer=pcm_s16be \
-			--enable-demuxer=mp3 \
-			--enable-demuxer=pcm_s16le \
-			--enable-demuxer=matroska \
-			--enable-demuxer=flv \
-			--enable-demuxer=rm \
-			--disable-encoders \
-			--disable-muxers \
-			--disable-ffplay \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--disable-static \
-			--disable-filters \
-			--disable-protocols \
-			--enable-protocol=file \
-			--enable-protocol=http \
-			--enable-bsfs \
-			--disable-devices \
-			--enable-swresample \
-			--disable-postproc \
-			--disable-swscale \
-			--disable-mmx     \
-			--disable-altivec  \
-			--disable-zlib   \
-			--enable-network \
-			--enable-cross-compile \
-			--enable-shared \
-			--enable-bzlib \
-			--enable-debug \
-			--enable-stripping \
-			--target-os=linux \
-			--arch=arm \
-			--disable-neon \
-			--cross-prefix=$(TARGET)- \
-			--prefix=$(TARGETPREFIX) \
-			--extra-cflags="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2" \
-			--extra-ldflags="-L$(TARGETPREFIX)/lib -lz -lfreetype -liconv -lxml2" && \
+			$(FFMPEG_CONFIGURE) && \
 		$(MAKE) && \
 		$(MAKE) install
 		if ! test -e $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h; then \
@@ -1626,11 +378,14 @@ $(D)/ffmpeg-coolstream-kronos: | $(TARGETPREFIX)
 		else \
 			cp $(SOURCE_DIR)/git/LIBRARIES/ffmpeg/$(CST_FFMPEG_VERSION)/version.h $(TARGETPREFIX)/lib/ffmpeg-version.h; \
 		fi
+	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavfilter.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
+	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswresample.pc
 	$(REMOVE)/ffmpeg
+	touch $@
 
 $(D)/dvbsi: | $(TARGETPREFIX)
 	tar -C $(SOURCE_DIR)/git/LIBRARIES -cp dvbsi --exclude=.git | tar -C $(BUILD_TMP) -x
-- 
2.39.5