From: Markham Date: Sun, 10 Jan 2016 17:59:53 +0000 (+0100) Subject: neutrino.mk: When build with ffmpeg -> disable libmad, libvorbisidec, ... X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=ad354d7d0351b21460b5ebfc796a6a680da29b62;p=bs-cst-neutrino-hd.git neutrino.mk: When build with ffmpeg -> disable libmad, libvorbisidec, ... libid3tag and libflac --- diff --git a/make/neutrino.mk b/make/neutrino.mk index 1082306..c93876b 100755 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -34,6 +34,22 @@ NEUTRINO_OBJDIR = $(BUILD_TMP)/neutrino-hd # use this if you want to build inside the source dir - but you don't want that ;) # NEUTRINO_OBJDIR = $(SOURCE_DIR)/neutrino-hd +AUDIODEC = ffmpeg + +ifeq ($(AUDIODEC), ffmpeg) +# enable ffmpeg audio decoder in neutrino +N_CONFIG_OPTS = --enable-ffmpegdec +else +NEUTRINO_DEPS = libid3tag libmad +N_CONFIG_OPTS = --with-tremor +NEUTRINO_DEPS += libvorbis +# enable FLAC decoder in neutrino +N_CONFIG_OPTS += --enable-flac +NEUTRINO_DEPS += libflac +endif + +neutrino-deps: $(NEUTRINO_DEPS) + $(D)/neutrino-hd: if [ $(PLATFORM) = "apollo" ]; then \ $(MAKE) $(D)/neutrino-hd-apollo; \ @@ -62,7 +78,7 @@ $(D)/neutrino-hd-kronos: $(NEUTRINO_OBJDIR)/config-kronos.status $(MAKE) $(TARGETPREFIX)/.version cp -a $(BUILD_TMP)/neutrino-hd/config.h $(TARGETPREFIX)/include/config.h -$(NEUTRINO_OBJDIR)/config-nevis.status: $(D)/neutrino-hd-libs +$(NEUTRINO_OBJDIR)/config-nevis.status: $(NEUTRINO_DEPS) $(D)/neutrino-hd-libs test -d $(NEUTRINO_OBJDIR) || mkdir -p $(NEUTRINO_OBJDIR) $(SOURCE_DIR)/neutrino-hd/autogen.sh pushd $(NEUTRINO_OBJDIR) && \ @@ -71,13 +87,12 @@ $(NEUTRINO_OBJDIR)/config-nevis.status: $(D)/neutrino-hd-libs CC=$(TARGET)-gcc CFLAGS="$(NEVIS_CFLAGS)" CXXFLAGS="$(NEVIS_CFLAGS)" LDFLAGS="$(NEUTRINO_LDFLAGS)" \ $(SOURCE_DIR)/neutrino-hd/configure --host=$(TARGET) --build=$(BUILD) --prefix= \ --enable-maintainer-mode --with-target=cdk --with-targetprefix= --with-boxmodel=nevis \ - --enable-flac \ --enable-pip \ - --enable-ffmpegdec \ --enable-lua \ - --enable-giflib + --enable-giflib \ + $(N_CONFIG_OPTS) -$(NEUTRINO_OBJDIR)/config-apollo.status: $(D)/neutrino-hd-libs +$(NEUTRINO_OBJDIR)/config-apollo.status: $(NEUTRINO_DEPS) $(D)/neutrino-hd-libs test -d $(NEUTRINO_OBJDIR) || mkdir -p $(NEUTRINO_OBJDIR) $(SOURCE_DIR)/neutrino-hd/autogen.sh pushd $(NEUTRINO_OBJDIR) && \ @@ -86,14 +101,13 @@ $(NEUTRINO_OBJDIR)/config-apollo.status: $(D)/neutrino-hd-libs CC=$(TARGET)-gcc CFLAGS="$(APOLLO_CFLAGS)" CXXFLAGS="$(APOLLO_CFLAGS)" LDFLAGS="$(NEUTRINO_LDFLAGS)" \ $(SOURCE_DIR)/neutrino-hd/configure --host=$(TARGET) --build=$(BUILD) --prefix= \ --enable-maintainer-mode --with-target=cdk --with-targetprefix= --with-boxmodel=apollo \ - --enable-flac \ --enable-mdev \ --enable-pip \ - --enable-ffmpegdec \ --enable-lua \ - --enable-giflib + --enable-giflib \ + $(N_CONFIG_OPTS) -$(NEUTRINO_OBJDIR)/config-kronos.status: $(D)/neutrino-hd-libs +$(NEUTRINO_OBJDIR)/config-kronos.status: $(NEUTRINO_DEPS) $(D)/neutrino-hd-libs test -d $(NEUTRINO_OBJDIR) || mkdir -p $(NEUTRINO_OBJDIR) $(SOURCE_DIR)/neutrino-hd/autogen.sh pushd $(NEUTRINO_OBJDIR) && \ @@ -102,12 +116,11 @@ $(NEUTRINO_OBJDIR)/config-kronos.status: $(D)/neutrino-hd-libs CC=$(TARGET)-gcc CFLAGS="$(KRONOS_CFLAGS)" CXXFLAGS="$(KRONOS_CFLAGS)" LDFLAGS="$(NEUTRINO_LDFLAGS)" \ $(SOURCE_DIR)/neutrino-hd/configure --host=$(TARGET) --build=$(BUILD) --prefix= \ --enable-maintainer-mode --with-target=cdk --with-targetprefix= --with-boxmodel=kronos \ - --enable-flac \ --enable-mdev \ --enable-pip \ - --enable-ffmpegdec \ --enable-lua \ - --enable-giflib + --enable-giflib \ + $(N_CONFIG_OPTS) $(TARGETPREFIX)/.version: $(TARGETPREFIX)/bin/neutrino if [ -e $(BASE_DIR)/customize/version.sh ]; then \ @@ -129,5 +142,5 @@ $(TARGETPREFIX)/.version2: $(BASE_DIR)/customize/version.sh $(BASE_DIR)/customize/version.sh $(D)/neutrino-hd-libs: - $(MAKE) $(D)/libsigc $(D)/libmad $(D)/libid3tag $(D)/giflib $(D)/openssl $(D)/libcurl $(D)/freetype $(D)/libjpeg $(D)/libiconv $(D)/dvbsi $(D)/libflac $(D)/ffmpeg $(D)/libbluray $(D)/libvorbis $(D)/openthreads $(D)/libusb $(D)/luaposix $(D)/luacurl $(D)/lua-socket + $(MAKE) $(D)/libsigc $(D)/giflib $(D)/openssl $(D)/libcurl $(D)/freetype $(D)/libjpeg $(D)/libiconv $(D)/dvbsi $(D)/ffmpeg $(D)/libbluray $(D)/openthreads $(D)/libusb $(D)/luaposix $(D)/luacurl $(D)/lua-socket touch $@