ffmpeg hd6x: add libx264

diff --git a/make/ffmpeg.mk b/make/ffmpeg.mk
index 47a13ec7c56089efaa8c5644a504b6772fd92183..242cfb04d2215278e7b215374a4a01dabd05b988 100644 (file)
--- a/make/ffmpeg.mk
+++ b/make/ffmpeg.mk
@@ -2,7 +2,6 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1))
 FFMPEG_OPTIONS  = --disable-ffprobe
 FFMPEG_OPTIONS += --disable-ffserver
 endif
-
 ifeq ($(BOXTYPE), coolstream)
 FFMPEG_CONFIGURE = \
                --disable-doc \
@@ -131,8 +130,15 @@ FFMPEG_CONFIGURE = \
                --disable-runtime-cpudetect \
                --arch=arm \
                $(FFMPEG_OPTIONS)
+endif
 
-else ifeq ($(BOXTYPE), armbox)
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd6x))
+FFMPEG_OPTIONS  = --enable-gpl
+FFMPEG_OPTIONS += --enable-libx264
+FFMPEG_OPTIONS += --enable-encoder=libx264
+endif
+
+ifeq ($(BOXTYPE), armbox)
 FFMPEG_CONFIGURE = \
        --disable-ffprobe \
        \
@@ -423,22 +429,28 @@ FFMPEG_CONFIGURE = \
        --enable-pthreads \
        --enable-small \
        --enable-swresample \
-       --enable-hardcoded-tables
+       --enable-hardcoded-tables \
+       $(FFMPEG_OPTIONS)
 
 else
   $(error Boxtype = $(BOXTYPE) not supported)
 endif
 
-FFMPEG_DEP =
 ifeq ($(BOXFAMILY), $(filter $(BOXFAMILY), apollo kronos))
 FFMPEG_CONFIGURE += --cpu=cortex-a9 --enable-vfp --extra-cflags="-mfpu=vfpv3-d16 -mfloat-abi=hard -I$(TARGETPREFIX)/include"
 endif
+
 ifeq ($(BOXFAMILY), nevis)
 FFMPEG_CONFIGURE += --disable-iconv
 FFMPEG_CONFIGURE += --cpu=armv6 --disable-vfp --extra-cflags="-I$(TARGETPREFIX)/include"
 endif
+
 ifeq ($(BOXTYPE), armbox)
 FFMPEG_DEP = $(D)/bzip2 $(D)/libass $(D)/alsa-lib
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd6x))
+FFMPEG_DEP += $(D)/libx264
+endif
+
 FFMPEG_CONFIGURE += \
        --enable-armv6 \
        --enable-armv6t2 \

diff --git a/make/libraries.mk b/make/libraries.mk
index f01e16ead066901a46571b194bdfcdc568c3df69..9734ac05b2eebd117248639434287de2784139d5 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -867,8 +867,8 @@ $(D)/libx264: $(ARCHIVE)/x264-$(LIB_X264_VER).tar.xz | $(TARGETPREFIX)
                $(MAKE) && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/x264.pc
-#      $(REMOVE)/x264-$(LIB_X264_VER)
-#      $(TOUCH)
+       $(REMOVE)/x264-$(LIB_X264_VER)
+       $(TOUCH)
 
 #
 # libexif