[depends] remove libflac

5 files changed, 1 insertions, 99 deletions

diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list
index 8360ee0ab5..9da8f972f0 100644
--- a/project/BuildDependencies/scripts/0_package.list
+++ b/project/BuildDependencies/scripts/0_package.list
@@ -20,7 +20,6 @@ libbluray-0.8.1-win32-vc120.7z
 libcdio-0.83-win32-2.7z
 libcec-3.0.0-win32-2.7z
 libexpat_2.0.1-win32.7z
-libflac-1.2.1-win32.7z
 libfribidi-0.19.2-win32.7z
 libiconv-1.14-win32-vc140-v2.7z
 libjpeg-turbo-1.2.0-win32.7z
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index 2818a5f45a..4c768cdca1 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -9,7 +9,7 @@ DEPENDS = \
 	libgcrypt bzip2 liblzo2 libzip freetype2 fontconfig \
 	openssl gmp nettle gnutls curl \
 	libjpeg-turbo libpng \
-	libogg libvorbis libflac fribidi \
+	libogg libvorbis fribidi \
 	libass \
 	libmodplug librtmp libxml2 yajl libmicrohttpd mysql libffi \
 	python27 libshairplay \
@@ -84,7 +84,6 @@ libgcrypt: libgpg-error
 fontconfig: freetype2 expat $(ICONV)
 curl: openssl
 libvorbis: libogg
-libflac: libogg gettext
 libass: fontconfig libpng freetype2 expat $(ICONV)
 librtmp: openssl
 libmicrohttpd: gnutls libgcrypt libgpg-error
diff --git a/tools/depends/target/libflac/Makefile b/tools/depends/target/libflac/Makefile
deleted file mode 100644
index 96eb42368d..0000000000
--- a/tools/depends/target/libflac/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile nasm.patch
-
-# lib name, version
-LIBNAME=flac
-VERSION=1.2.1
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-export NASM=
-# configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
-          ./configure --prefix=$(PREFIX) --disable-xmms-plugin --disable-cpplibs --disable-asm-optimizations
-
-LIBDYLIB=$(PLATFORM)/src/libFLAC/.libs/libFLAC.a
-
-CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
-	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
-	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
-	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); patch -p1 < ../autoreconf.patch
-	cd $(PLATFORM); patch -p0 < ../nasm.patch
-	cd $(PLATFORM); $(AUTORECONF) -vif
-	cd $(PLATFORM); $(CONFIGURE)
-
-$(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM)
-
-.installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM) install
-	touch $@
-
-clean:
-	$(MAKE) -C $(PLATFORM) clean
-	rm -f .installed-$(PLATFORM)
-
-distclean::
-	rm -rf $(PLATFORM) .installed-$(PLATFORM)
-
diff --git a/tools/depends/target/libflac/autoreconf.patch b/tools/depends/target/libflac/autoreconf.patch
deleted file mode 100644
index 3a0493194d..0000000000
--- a/tools/depends/target/libflac/autoreconf.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Erik de Castro Lopo <erikd@mega-nerd.com>
-Date: Mon, 13 Feb 2012 08:55:46 +0000 (+1100)
-Subject: Fix for autoreconf failures.
-X-Git-Url: https://git.xiph.org/?p=flac.git;a=commitdiff_plain;h=e38026a52c34008bcf9126f61ee63b58168facf9
-
-Fix for autoreconf failures.
-
-Fixes "undefined macro: AM_PATH_XMMS" and similar errors which cause
-autoreconf to fail.
-
-From Sebastian Andrzej Siewior <bigeasy@linutronix.de> via Debian.
----
-
-diff --git a/Makefile.am b/Makefile.am
-index d106d9f..0a65206 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -30,6 +30,8 @@
- 
- AUTOMAKE_OPTIONS = foreign 1.7
- 
-+ACLOCAL_AMFLAGS = -I m4
-+
- SUBDIRS = doc include m4 man src examples test build obj
- 
- DISTCLEANFILES = libtool-disable-static
-diff --git a/configure.in b/configure.in
-index 63a0984..f56c188 100644
---- a/configure.in
-+++ b/configure.in
-@@ -33,6 +33,7 @@ sed -e 's/^build_old_libs=yes/build_old_libs=no/' libtool > libtool-disable-stat
- chmod +x libtool-disable-static
- 
- AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AM_PROG_AS
- AC_PROG_CXX
diff --git a/tools/depends/target/libflac/nasm.patch b/tools/depends/target/libflac/nasm.patch
deleted file mode 100644
index 0371cb9e0e..0000000000
--- a/tools/depends/target/libflac/nasm.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN configure.in configure.in
---- configure.in	2007-09-13 11:48:42.000000000 -0400
-+++ configure.in	2012-06-10 20:13:50.543973093 -0400
-@@ -269,10 +269,6 @@
- # only matters for x86
- AC_CHECK_PROGS(NASM, nasm)
- AM_CONDITIONAL(FLaC__HAS_NASM, test -n "$NASM")
--if test -n "$NASM" ; then
--AC_DEFINE(FLAC__HAS_NASM)
--AH_TEMPLATE(FLAC__HAS_NASM, [define if you are compiling for x86 and have the NASM assembler])
--fi
- 
- # only matters for PowerPC
- AC_CHECK_PROGS(AS, as, as)