From d575a6a7f77ad90d32542f083b6e5f294a028c0f Mon Sep 17 00:00:00 2001 From: Markham Date: Tue, 1 Dec 2015 22:03:04 +0100 Subject: [PATCH] neutrino.mk: use giflib instead of libungif --- make/neutrino.mk | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/make/neutrino.mk b/make/neutrino.mk index 853e6a0..ff30397 100755 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -70,7 +70,12 @@ $(NEUTRINO_OBJDIR)/config-nevis.status: $(D)/neutrino-hd-libs export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \ 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-maintainer-mode --with-target=cdk --with-targetprefix= --with-boxmodel=nevis \ + --enable-flac \ + --enable-pip \ + --enable-ffmpegdec \ + --enable-lua \ + --enable-giflib $(NEUTRINO_OBJDIR)/config-apollo.status: $(D)/neutrino-hd-libs test -d $(NEUTRINO_OBJDIR) || mkdir -p $(NEUTRINO_OBJDIR) @@ -80,7 +85,13 @@ $(NEUTRINO_OBJDIR)/config-apollo.status: $(D)/neutrino-hd-libs export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \ 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-maintainer-mode --with-target=cdk --with-targetprefix= --with-boxmodel=apollo \ + --enable-flac \ + --enable-mdev \ + --enable-pip \ + --enable-ffmpegdec \ + --enable-lua \ + --enable-giflib $(NEUTRINO_OBJDIR)/config-kronos.status: $(D)/neutrino-hd-libs test -d $(NEUTRINO_OBJDIR) || mkdir -p $(NEUTRINO_OBJDIR) @@ -90,7 +101,13 @@ $(NEUTRINO_OBJDIR)/config-kronos.status: $(D)/neutrino-hd-libs export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \ 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-maintainer-mode --with-target=cdk --with-targetprefix= --with-boxmodel=kronos \ + --enable-flac \ + --enable-mdev \ + --enable-pip \ + --enable-ffmpegdec \ + --enable-lua \ + --enable-giflib $(TARGETPREFIX)/.version: $(TARGETPREFIX)/bin/neutrino echo "version=0214`date +%Y%m%d%H%M`" > $@ @@ -102,5 +119,5 @@ $(TARGETPREFIX)/.version: $(TARGETPREFIX)/bin/neutrino echo "builddate=`cd $(SOURCE_DIR)/neutrino-hd && git log | grep "^commit" | wc -l` vom `date --reference=$(SOURCE_DIR)/neutrino-hd/.git`" >> $@ $(D)/neutrino-hd-libs: - $(MAKE) $(D)/libsigc $(D)/libmad $(D)/libid3tag $(D)/libungif $(D)/openssl $(D)/libcurl $(D)/freetype $(D)/libjpeg $(D)/libiconv $(D)/dvbsi $(D)/libflac $(D)/ffmpeg $(D)/libbluray $(D)/libvorbis $(D)/openthreads $(D)/luaposix $(D)/luacurl $(D)/lua-socket + $(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)/luaposix $(D)/luacurl $(D)/lua-socket touch $@ -- 2.39.5