From: Markham <markham001@gmx.de>
Date: Thu, 11 Oct 2018 09:33:49 +0000 (+0200)
Subject: bump version flac-1.3.2
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=ed4074b5eabed5e95039428eaaf7b448f0336084;p=bs-cst-neutrino-hd.git

bump version flac-1.3.2
---

diff --git a/make/archives.mk b/make/archives.mk
index 4e6d59a..c1518e6 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -282,8 +282,8 @@ $(ARCHIVE)/udpxy.1.0.23-7-prod.tar.gz:
 $(ARCHIVE)/inadyn-mt.v.$(INADYN_VER).tar.gz:
 	$(WGET) https://sourceforge.net/projects/inadyn-mt/files/inadyn-mt/inadyn-mt.v.$(INADYN_VER)/$(notdir $@)
 
-$(ARCHIVE)/flac-1.3.0.tar.gz:
-	$(WGET) http://www.fhloston-paradise.de/flac-1.3.0.tar.gz
+$(ARCHIVE)/flac-$(FLAC_VER).tar.xz:
+	$(WGET) https://ftp.osuosl.org/pub/xiph/releases/flac/flac-$(FLAC_VER).tar.xz
 
 $(ARCHIVE)/ethtool-$(ETHTOOL_VER).tar.xz:
 	$(WGET) https://www.kernel.org/pub/software/network/ethtool/ethtool-$(ETHTOOL_VER).tar.xz
diff --git a/make/libraries.mk b/make/libraries.mk
index 89a104e..5ca895c 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -952,18 +952,41 @@ $(D)/libpcap: $(ARCHIVE)/libpcap-1.1.1.tar.gz | $(TARGETPREFIX)
 	$(REMOVE)/libpcap-1.1.1
 	$(TOUCH)
 
-$(D)/libflac: $(ARCHIVE)/flac-1.3.0.tar.gz | $(TARGETPREFIX)
+#
+# flac
+#
+$(D)/flac: $(ARCHIVE)/flac-$(FLAC_VER).tar.xz | $(TARGETPREFIX)
 	$(START_BUILD)
-	$(UNTAR)/flac-1.3.0.tar.gz
-	set -e; cd $(BUILD_TMP)/flac-1.3.0; \
-		$(PATCH)/flac-1.3.0-noencoder.diff; \
-		$(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET) \
-			--disable-ogg --disable-altivec; \
-		$(MAKE) -C src/libFLAC; \
-		: make -C src/libFLAC  install DESTDIR=$(TARGETPREFIX); \
-		cp -a src/libFLAC/.libs/libFLAC-static.a $(TARGETPREFIX)/lib/; \
-		make -C include/FLAC install DESTDIR=$(TARGETPREFIX)
-	$(REMOVE)/flac-1.3.0
+	$(UNTAR)/flac-$(FLAC_VER).tar.xz
+	pushd $(BUILD_TMP)/flac-$(FLAC_VER); \
+		$(PATCH)/flac-$(FLAC_VER).patch; \
+		touch NEWS AUTHORS ChangeLog; \
+		autoreconf -fi; \
+		$(CONFIGURE) \
+			--prefix= \
+			--mandir=/.remove \
+			--datarootdir=/.remove \
+			--disable-cpplibs \
+			--disable-debug \
+			--disable-asm-optimizations \
+			--disable-sse \
+			--disable-altivec \
+			--disable-doxygen-docs \
+			--disable-thorough-tests \
+			--disable-exhaustive-tests \
+			--disable-valgrind-testing \
+			--disable-ogg \
+			--disable-oggtest \
+			--disable-local-xmms-plugin \
+			--disable-xmms-plugin \
+		; \
+		$(MAKE); \
+		$(MAKE) install DESTDIR=$(TARGETPREFIX) docdir=/.remove
+	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/flac.pc
+	$(REWRITE_LIBTOOL)/libFLAC.la
+	rm -rf $(TARGETPREFIX)/bin/flac
+	rm -rf $(TARGETPREFIX)/bin/metaflac
+	$(REMOVE)/flac-$(FLAC_VER)
 	$(TOUCH)
 
 $(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.bz2 | $(TARGETPREFIX)
diff --git a/make/versions.mk b/make/versions.mk
index dd39859..200c97f 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -68,6 +68,9 @@ else
 FFMPEG_GIT = 2ba896f
 endif
 
+# FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality
+FLAC_VER = 1.3.2
+
 # FLEX (the fast lexical analyser)
 FLEX_VER=2.5.35