- ffmpeg: move targets to package dir

Makefile

@@ -216,7 +216,6 @@ include make/flash-updates.mk
 include make/flash-images.mk
 include make/linux-kernel.mk
 include make/target-blobs.mk
-include make/target-ffmpeg$(if $(filter $(BOXTYPE),coolstream),-coolstream).mk
 include make/target-files.mk
 include make/target-libs-static.mk
 include make/target-rootfs.mk

make/target-ffmpeg-coolstream.mk

@@ -1,196 +0,0 @@
-#
-# makefile to build ffmpeg
-#
-# -----------------------------------------------------------------------------
-
-FFMPEG_BRANCH ?= ni/ffmpeg/2.8
-#FFMPEG_BRANCH ?= ni/ffmpeg/master
-#FFMPEG_BRANCH ?= ffmpeg/master
-
-FFMPEG_DEPENDENCIES = openssl rtmpdump libbluray libass
-
-FFMPEG_CONF_OPTS = \
-	--prefix=$(prefix) \
-	--cross-prefix=$(TARGET_CROSS) \
-	--datadir=$(REMOVE_datadir) \
-	\
-	--disable-doc \
-	--disable-htmlpages \
-	--disable-manpages \
-	--disable-podpages \
-	--disable-txtpages \
-	\
-	--disable-ffplay \
-	--disable-ffprobe \
-	--disable-ffserver \
-	\
-	--disable-altivec \
-	--disable-mmx \
-	--disable-neon \
-	--disable-swscale \
-	\
-	--disable-parsers \
-		--enable-parser=aac \
-		--enable-parser=aac_latm \
-		--enable-parser=ac3 \
-		--enable-parser=dca \
-		--enable-parser=dvbsub \
-		--enable-parser=dvdsub \
-		--enable-parser=flac \
-		--enable-parser=h264 \
-		--enable-parser=mjpeg \
-		--enable-parser=mpeg4video \
-		--enable-parser=mpegaudio \
-		--enable-parser=mpegvideo \
-		--enable-parser=vc1 \
-		--enable-parser=vorbis \
-	\
-	--disable-decoders \
-		--enable-decoder=aac \
-		--enable-decoder=aac_latm \
-		--enable-decoder=ass \
-		--enable-decoder=adpcm_ms \
-		--enable-decoder=dca \
-		--enable-decoder=dvbsub \
-		--enable-decoder=dvdsub \
-		--enable-decoder=flac \
-		--enable-decoder=flv \
-		--enable-decoder=gif \
-		--enable-decoder=mjpeg \
-		--enable-decoder=movtext \
-		--enable-decoder=mp3 \
-		--enable-decoder=mp3adu \
-		--enable-decoder=mp3adufloat \
-		--enable-decoder=mp3float \
-		--enable-decoder=mp3on4 \
-		--enable-decoder=mp3on4float \
-		--enable-decoder=pcm_s16le \
-		--enable-decoder=pcm_s16le_planar \
-		--enable-decoder=pgssub \
-		--enable-decoder=srt \
-		--enable-decoder=ssa \
-		--enable-decoder=subrip \
-		--enable-decoder=subviewer \
-		--enable-decoder=subviewer1 \
-		--enable-decoder=text \
-		--enable-decoder=vorbis \
-		--enable-decoder=xsub \
-	\
-	--disable-encoders \
-	\
-	--disable-demuxers \
-		--enable-demuxer=aac \
-		--enable-demuxer=ac3 \
-		--enable-demuxer=ass \
-		--enable-demuxer=avi \
-		--enable-demuxer=dts \
-		--enable-demuxer=flac \
-		--enable-demuxer=flv \
-		--enable-demuxer=gif \
-		--enable-demuxer=hds \
-		--enable-demuxer=hls \
-		--enable-demuxer=live_flv \
-		--enable-demuxer=m4v \
-		--enable-demuxer=matroska \
-		--enable-demuxer=mjpeg \
-		--enable-demuxer=mov \
-		--enable-demuxer=mp3 \
-		--enable-demuxer=mpegps \
-		--enable-demuxer=mpegts \
-		--enable-demuxer=mpegtsraw \
-		--enable-demuxer=mpegvideo \
-		--enable-demuxer=mpjpeg \
-		--enable-demuxer=ogg \
-		--enable-demuxer=pcm_s16be \
-		--enable-demuxer=pcm_s16le \
-		--enable-demuxer=rm \
-		--enable-demuxer=rtp \
-		--enable-demuxer=rtsp \
-		--enable-demuxer=srt \
-		--enable-demuxer=vc1 \
-		--enable-demuxer=wav \
-	\
-	--disable-muxers \
-		--enable-muxer=apng \
-		--enable-muxer=flac \
-		--enable-muxer=h261 \
-		--enable-muxer=h263 \
-		--enable-muxer=h264 \
-		--enable-muxer=hevc \
-		--enable-muxer=image2 \
-		--enable-muxer=image2pipe \
-		--enable-muxer=m4v \
-		--enable-muxer=matroska \
-		--enable-muxer=mjpeg \
-		--enable-muxer=mp3 \
-		--enable-muxer=mp4 \
-		--enable-muxer=mpeg1video \
-		--enable-muxer=mpeg2video \
-		--enable-muxer=mpegts \
-		--enable-muxer=ogg \
-	\
-	--disable-filters \
-	\
-	--disable-devices \
-	\
-	--disable-extra-warnings \
-	--disable-postproc \
-	\
-	--enable-bsfs \
-	--enable-libass \
-	--enable-libbluray \
-	--enable-librtmp \
-	--enable-network \
-	--enable-nonfree \
-	--enable-openssl \
-	--enable-swresample \
-	\
-	--disable-debug \
-	--enable-cross-compile \
-	--enable-stripping \
-	--disable-static \
-	--enable-shared \
-	\
-	--target-os=linux \
-	--arch=$(TARGET_ARCH) \
-	--extra-ldflags="$(TARGET_LDFLAGS)"
-
-ifeq ($(FFMPEG_BRANCH),ni/ffmpeg/2.8)
-  FFMPEG_DEPENDENCIES += libroxml
-else
-  FFMPEG_DEPENDENCIES +=  libxml2
-  FFMPEG_CONF_OPTS += \
-	--enable-demuxer=dash \
-	--enable-libxml2
-endif
-
-ifeq ($(BOXSERIES),hd1)
-  FFMPEG_CONF_OPTS += \
-	--disable-ffmpeg
-
-  FFMPEG_CONF_OPTS += \
-	--enable-small \
-	--cpu=armv6 \
-	--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)"
-endif
-
-ifeq ($(BOXSERIES),hd2)
-  FFMPEG_CONF_OPTS += \
-	--enable-decoder=h264 \
-	--enable-decoder=vc1 \
-	--enable-hardcoded-tables \
-	--cpu=cortex-a9 \
-	--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=vfpv3-d16 -mfloat-abi=hard"
-endif
-
-ffmpeg: $(FFMPEG_DEPENDENCIES) | $(TARGET_DIR)
-	$(REMOVE)/$(NI_FFMPEG)
-	$(CD) $(SOURCE_DIR)/$(NI_FFMPEG); \
-		git checkout $(FFMPEG_BRANCH)
-	tar -C $(SOURCE_DIR) --exclude-vcs -cp $(NI_FFMPEG) | tar -C $(BUILD_DIR) -x
-	$(CHDIR)/$(NI_FFMPEG); \
-		./configure $($(PKG)_CONF_OPTS); \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(NI_FFMPEG)
-	$(call TOUCH)

package/ffmpeg/ffmpeg.mk

@@ -0,0 +1,8 @@
+################################################################################
+#
+# ffmpeg
+#
+################################################################################
+
+ffmpeg: $(if $(filter $(BOXTYPE),coolstream),ffmpeg2,ffmpeg4)
+	@$(call TOUCH)

package/ffmpeg2/ffmpeg2.mk

@@ -0,0 +1,196 @@
+################################################################################
+#
+# ffmpeg2
+#
+################################################################################
+
+FFMPEG2_VERSION = ni-git
+FFMPEG2_DIR = $(NI_FFMPEG)
+FFMPEG2_SOURCE = $(NI_FFMPEG)
+FFMPEG2_SITE = https://github.com/neutrino-images
+
+FFMPEG2_DEPENDENCIES = openssl rtmpdump libbluray libass
+
+FFMPEG2_CHECKOUT = $(BS_PACKAGE_FFMPEG2_BRANCH)
+
+FFMPEG2_CONF_OPTS = \
+	--disable-ffplay \
+	--disable-ffprobe \
+	--disable-ffserver \
+	\
+	--disable-doc \
+	--disable-htmlpages \
+	--disable-manpages \
+	--disable-podpages \
+	--disable-txtpages \
+	\
+	--disable-altivec \
+	--disable-mmx \
+	--disable-neon \
+	--disable-swscale \
+	\
+	--disable-muxers \
+	--enable-muxer=apng \
+	--enable-muxer=flac \
+	--enable-muxer=h261 \
+	--enable-muxer=h263 \
+	--enable-muxer=h264 \
+	--enable-muxer=hevc \
+	--enable-muxer=image2 \
+	--enable-muxer=image2pipe \
+	--enable-muxer=m4v \
+	--enable-muxer=matroska \
+	--enable-muxer=mjpeg \
+	--enable-muxer=mp3 \
+	--enable-muxer=mp4 \
+	--enable-muxer=mpeg1video \
+	--enable-muxer=mpeg2video \
+	--enable-muxer=mpegts \
+	--enable-muxer=ogg \
+	\
+	--disable-parsers \
+	--enable-parser=aac \
+	--enable-parser=aac_latm \
+	--enable-parser=ac3 \
+	--enable-parser=dca \
+	--enable-parser=dvbsub \
+	--enable-parser=dvdsub \
+	--enable-parser=flac \
+	--enable-parser=h264 \
+	--enable-parser=mjpeg \
+	--enable-parser=mpeg4video \
+	--enable-parser=mpegaudio \
+	--enable-parser=mpegvideo \
+	--enable-parser=vc1 \
+	--enable-parser=vorbis \
+	\
+	--disable-encoders \
+	\
+	--disable-decoders \
+	--enable-decoder=aac \
+	--enable-decoder=aac_latm \
+	--enable-decoder=ass \
+	--enable-decoder=adpcm_ms \
+	--enable-decoder=dca \
+	--enable-decoder=dvbsub \
+	--enable-decoder=dvdsub \
+	--enable-decoder=flac \
+	--enable-decoder=flv \
+	--enable-decoder=gif \
+	--enable-decoder=mjpeg \
+	--enable-decoder=movtext \
+	--enable-decoder=mp3 \
+	--enable-decoder=mp3adu \
+	--enable-decoder=mp3adufloat \
+	--enable-decoder=mp3float \
+	--enable-decoder=mp3on4 \
+	--enable-decoder=mp3on4float \
+	--enable-decoder=pcm_s16le \
+	--enable-decoder=pcm_s16le_planar \
+	--enable-decoder=pgssub \
+	--enable-decoder=srt \
+	--enable-decoder=ssa \
+	--enable-decoder=subrip \
+	--enable-decoder=subviewer \
+	--enable-decoder=subviewer1 \
+	--enable-decoder=text \
+	--enable-decoder=vorbis \
+	--enable-decoder=xsub \
+	\
+	--disable-demuxers \
+	--enable-demuxer=aac \
+	--enable-demuxer=ac3 \
+	--enable-demuxer=ass \
+	--enable-demuxer=avi \
+	--enable-demuxer=dts \
+	--enable-demuxer=flac \
+	--enable-demuxer=flv \
+	--enable-demuxer=gif \
+	--enable-demuxer=hds \
+	--enable-demuxer=hls \
+	--enable-demuxer=live_flv \
+	--enable-demuxer=m4v \
+	--enable-demuxer=matroska \
+	--enable-demuxer=mjpeg \
+	--enable-demuxer=mov \
+	--enable-demuxer=mp3 \
+	--enable-demuxer=mpegps \
+	--enable-demuxer=mpegts \
+	--enable-demuxer=mpegtsraw \
+	--enable-demuxer=mpegvideo \
+	--enable-demuxer=mpjpeg \
+	--enable-demuxer=ogg \
+	--enable-demuxer=pcm_s16be \
+	--enable-demuxer=pcm_s16le \
+	--enable-demuxer=rm \
+	--enable-demuxer=rtp \
+	--enable-demuxer=rtsp \
+	--enable-demuxer=srt \
+	--enable-demuxer=vc1 \
+	--enable-demuxer=wav \
+	\
+	--disable-filters \
+	\
+	--disable-devices \
+	\
+	--enable-bsfs \
+	--enable-libass \
+	--enable-libbluray \
+	--enable-librtmp \
+	--enable-network \
+	--enable-nonfree \
+	--enable-openssl \
+	--enable-swresample
+
+ifeq ($(BS_PACKAGE_FFMPEG2_BRANCH),ni/ffmpeg/2.8)
+  FFMPEG2_DEPENDENCIES += libroxml
+else
+  FFMPEG2_DEPENDENCIES +=  libxml2
+  FFMPEG2_CONF_OPTS += \
+	--enable-demuxer=dash \
+	--enable-libxml2
+endif
+
+ifeq ($(BOXSERIES),hd1)
+  FFMPEG2_CONF_OPTS += \
+	--disable-ffmpeg \
+	\
+	--enable-small \
+	\
+	--cpu=armv6 \
+	--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)"
+endif
+
+ifeq ($(BOXSERIES),hd2)
+  FFMPEG2_CONF_OPTS += \
+	--enable-decoder=h264 \
+	--enable-decoder=vc1 \
+	--enable-hardcoded-tables \
+	\
+	--cpu=cortex-a9 \
+	--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=vfpv3-d16 -mfloat-abi=hard"
+endif
+
+FFMPEG2_CONF_OPTS += \
+	--prefix=$(prefix) \
+	--datadir=$(REMOVE_datadir) \
+	--enable-cross-compile \
+	--cross-prefix=$(TARGET_CROSS) \
+	--arch=$(TARGET_ARCH) \
+	--target-os=linux \
+	--disable-debug \
+	--disable-stripping \
+	--disable-static \
+	--enable-shared \
+	--disable-extra-warnings \
+	--disable-postproc \
+	--pkg-config="$(PKG_CONFIG)" \
+	--extra-ldflags="$(TARGET_LDFLAGS)"
+
+define FFMPEG2_CONFIGURE_CMDS
+	$(CHDIR)/$($(PKG)_DIR); \
+		$($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS)
+endef
+
+ffmpeg2: | $(TARGET_DIR)
+	$(call autotools-package)

make/target-ffmpeg.mk → package/ffmpeg4/ffmpeg4.mk

@@ -1,21 +1,17 @@
+################################################################################
 #
-# makefile to build ffmpeg
+# ffmpeg4
 #
-# -----------------------------------------------------------------------------
+################################################################################
 
-FFMPEG_VERSION = 4.4.2
+FFMPEG4_VERSION = 4.4.2
-FFMPEG_DIR = ffmpeg-$(FFMPEG_VERSION)
+FFMPEG4_DIR = ffmpeg-$(FFMPEG4_VERSION)
-FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
+FFMPEG4_SOURCE = ffmpeg-$(FFMPEG4_VERSION).tar.xz
-FFMPEG_SITE = http://www.ffmpeg.org/releases
+FFMPEG4_SITE = http://www.ffmpeg.org/releases
 
-$(DL_DIR)/$(FFMPEG_SOURCE):
+FFMPEG4_DEPENDENCIES = openssl zlib bzip2 freetype rtmpdump libbluray libass libxml2 alsa-lib
-	$(download) $(FFMPEG_SITE)/$(FFMPEG_SOURCE)
 
-FFMPEG_DEPENDENCIES = openssl zlib bzip2 freetype rtmpdump libbluray libass libxml2 alsa-lib
+FFMPEG4_CONF_OPTS = \
-
-FFMPEG_UNPATCHED := no
-
-FFMPEG_CONF_OPTS = \
 	--disable-ffprobe \
 	\
 	--disable-doc \
@@ -308,15 +304,15 @@ FFMPEG_CONF_OPTS = \
 	--enable-hardcoded-tables
 
 ifeq ($(BS_PACKAGE_FFMPEG_FFPLAY),y)
-  FFMPEG_DEPENDENCIES += sdl2
+  FFMPEG4_DEPENDENCIES += sdl2
-  FFMPEG_CONF_OPTS += --enable-ffplay
+  FFMPEG4_CONF_OPTS += --enable-ffplay
-  FFMPEG_CONF_ENV += SDL_CONFIG=$(HOST_DIR)/bin/sdl2-config
+  FFMPEG4_CONF_ENV += SDL_CONFIG=$(HOST_DIR)/bin/sdl2-config
 else
-  FFMPEG_CONF_OPTS += --disable-ffplay
+  FFMPEG4_CONF_OPTS += --disable-ffplay
 endif
 
 ifeq ($(TARGET_ARCH),arm)
-  FFMPEG_CONF_OPTS += \
+  FFMPEG4_CONF_OPTS += \
 	--enable-armv6 \
 	--enable-armv6t2 \
 	--enable-neon  \
@@ -325,16 +321,17 @@ ifeq ($(TARGET_ARCH),arm)
 	--cpu=cortex-a15
 
 else ifeq ($(TARGET_ARCH),mips)
-  FFMPEG_CONF_OPTS += \
+  FFMPEG4_CONF_OPTS += \
 	--disable-armv6 \
 	--disable-armv6t2 \
 	--disable-neon \
 	--disable-vfp \
 	\
 	--cpu=generic
+
 endif
 
-FFMPEG_CONF_OPTS += \
+FFMPEG4_CONF_OPTS += \
 	--prefix=$(prefix) \
 	--datadir=$(REMOVE_datadir) \
 	--enable-cross-compile \
@@ -351,16 +348,10 @@ FFMPEG_CONF_OPTS += \
 	--extra-cflags="$(TARGET_CFLAGS) -Wno-deprecated-declarations" \
 	--extra-ldflags="$(TARGET_LDFLAGS)"
 
-ffmpeg: $(FFMPEG_DEPENDENCIES) $(DL_DIR)/$(FFMPEG_SOURCE) | $(TARGET_DIR)
+define FFMPEG4_CONFIGURE_CMDS
-	$(call DEPENDENCIES)
+	$(CHDIR)/$($(PKG)_DIR); \
-	$(call DOWNLOAD,$($(PKG)_SOURCE))
+		$($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS)
-	$(call STARTUP)
+endef
-	$(call EXTRACT,$(BUILD_DIR))
+
-ifneq ($($(PKG)_UNPATCHED),yes)
+ffmpeg4: | $(TARGET_DIR)
-	$(call APPLY_PATCHES,$(PKG_PATCHES_DIR))
+	$(call autotools-package)
-endif
-	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
-		./configure $($(PKG)_CONF_OPTS); \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(call TARGET_FOLLOWUP)

package/pkg-configuration.mk

@@ -5,8 +5,13 @@
 #
 ################################################################################
 
-# ffmpeg: build ffplay
+# ffmpeg2: branch
-BS_PACKAGE_FFMPEG_FFPLAY ?= n
+BS_PACKAGE_FFMPEG2_BRANCH ?= ni/ffmpeg/2.8
+#BS_PACKAGE_FFMPEG2_BRANCH ?= ni/ffmpeg/master
+#BS_PACKAGE_FFMPEG2_BRANCH ?= ffmpeg/master
+
+# ffmpeg4: build ffplay
+BS_PACKAGE_FFMPEG4_FFPLAY ?= n
 
 # ncurses: build wide-character libraries
 BS_PACKAGE_NCURSES_WCHAR ?= y

package/samba/samba.mk

@@ -5,4 +5,4 @@
 ################################################################################
 
 samba: $(if $(filter $(BOXSERIES),hd1),samba33,samba36)
-	$(call TOUCH)
+	@$(call TOUCH)