changed: removed libwavpack as it's fully supported by ffmpeg (fixes #11615)

6 files changed, 3 insertions, 144 deletions

diff --git a/tools/darwin/depends/Makefile.in b/tools/darwin/depends/Makefile.in
index 34eded8b8a..5804b655ad 100644
--- a/tools/darwin/depends/Makefile.in
+++ b/tools/darwin/depends/Makefile.in
@@ -7,7 +7,7 @@ SUBDIRS := \
 	liblzo2 freetype2 fontconfig \
 	openssl libssh2 curl \
 	jpeg tiff libpng libogg \
-	libvorbis libflac libmad fribidi libwavpack libmpeg2 \
+	libvorbis libflac libmad fribidi libmpeg2 \
 	libass libcdio libsamplerate librtmp libcrystalhd \
 	libGLEW libsdl libsdl_mixer libsdl_image \
 	libmicrohttpd libmodplug libbluray libyajl \
diff --git a/tools/darwin/depends/libwavpack/Makefile b/tools/darwin/depends/libwavpack/Makefile
deleted file mode 100644
index 6d2441f9dc..0000000000
--- a/tools/darwin/depends/libwavpack/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-include ../Makefile.include
-
-# lib name, version
-LIBNAME=wavpack
-VERSION=4.60.1
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.bz2
-
-# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) 
-
-LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib
-
-all: $(LIBDYLIB) .installed
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
-	$(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
-	rm -rf $(SOURCE)
-	$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	echo $(SOURCE) > .gitignore
-	cd $(SOURCE); $(CONFIGURE)
-
-$(LIBDYLIB): $(SOURCE)
-	make -j $(MAKE_JOBS) -C $(SOURCE)
-
-.installed:
-	make -C $(SOURCE) install
-	touch $@
-
-clean:
-	make -C $(SOURCE) clean
-	rm -f .installed
-
-distclean::
-	rm -rf $(SOURCE) .installed
diff --git a/tools/osx/ios-depends/Makefile b/tools/osx/ios-depends/Makefile
index a384f29012..fcd582e152 100644
--- a/tools/osx/ios-depends/Makefile
+++ b/tools/osx/ios-depends/Makefile
@@ -7,7 +7,7 @@ SUBDIRS = \
 	liblzo2 freetype2 fontconfig \
 	openssl libssh2 curl \
 	jpeg tiff libpng libogg \
-	libvorbis libflac libmad fribidi libwavpack libmpeg2 \
+	libvorbis libflac libmad fribidi libmpeg2 \
 	libass libcdio libsamplerate librtmp \
 	libmicrohttpd libmodplug libbluray libyajl \
 	samba python26 mysqlclient boost
diff --git a/tools/osx/ios-depends/libwavpack/Makefile b/tools/osx/ios-depends/libwavpack/Makefile
deleted file mode 100644
index 23ae90e6f0..0000000000
--- a/tools/osx/ios-depends/libwavpack/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#  A quick and dirty Makefile to download/build and install
-#
-#  Usage:
-#    make
-#    sudo make install
-
-include ../config.mk
-
-# lib name, version
-LIBNAME=wavpack
-VERSION=4.60.1
-SOURCE=$(LIBNAME)-$(VERSION)
-# download location and format
-BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
-ARCHIVE=$(SOURCE).tar.bz2
-TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs
-RETRIEVE_TOOL=/usr/bin/curl
-RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE)
-ARCHIVE_TOOL=tar
-ARCHIVE_TOOL_FLAGS=xf
-
-# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes 
-
-LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib
-
-CLEAN_FILES=$(ARCHIVE) $(SOURCE)
-
-all: $(LIBDYLIB) .installed
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
-	$(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
-	-rm -rf $(SOURCE)
-	$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	echo $(SOURCE) > .gitignore
-	cd $(SOURCE); $(CONFIGURE)
-
-$(LIBDYLIB): $(SOURCE)
-	make -C $(SOURCE)
-
-.installed:
-	make -C $(SOURCE) install
-	touch $@
-
-clean:
-	make -C $(SOURCE) clean
-	rm -f .installed
-
-distclean::
-	rm -rf $(SOURCE) .installed
diff --git a/tools/osx/osx-depends/Makefile b/tools/osx/osx-depends/Makefile
index e9c2517be5..493f832676 100644
--- a/tools/osx/osx-depends/Makefile
+++ b/tools/osx/osx-depends/Makefile
@@ -6,7 +6,7 @@ SUBDIRS = \
 	liblzo liblzo2 freetype2 fontconfig \
 	openssl libssh2 curl \
 	jpeg tiff libpng libogg \
-	libvorbis libflac libmad fribidi libwavpack libmpeg2 \
+	libvorbis libflac libmad fribidi libmpeg2 \
 	faad2 libass libcdio libsamplerate librtmp libcrystalhd \
 	libGLEW libsdl libsdl_mixer libsdl_image \
 	libmicrohttpd libmodplug libbluray libyajl \
diff --git a/tools/osx/osx-depends/libwavpack/Makefile b/tools/osx/osx-depends/libwavpack/Makefile
deleted file mode 100644
index 6c768ea4d7..0000000000
--- a/tools/osx/osx-depends/libwavpack/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#  A quick and dirty Makefile to download/build and install
-#
-#  Usage:
-#    make
-#    sudo make install
-
-include ../config.mk
-
-# lib name, version
-LIBNAME=wavpack
-VERSION=4.60.1
-SOURCE=$(LIBNAME)-$(VERSION)
-# download location and format
-BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
-ARCHIVE=$(SOURCE).tar.bz2
-TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs
-RETRIEVE_TOOL=/usr/bin/curl
-RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE)
-ARCHIVE_TOOL=tar
-ARCHIVE_TOOL_FLAGS=xf
-
-# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes 
-
-LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib
-
-CLEAN_FILES=$(ARCHIVE) $(SOURCE)
-
-all: $(LIBDYLIB) .installed
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
-	$(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
-	-rm -rf $(SOURCE)
-	$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	echo $(SOURCE) > .gitignore
-	cd $(SOURCE); $(CONFIGURE)
-
-$(LIBDYLIB): $(SOURCE)
-	make -C $(SOURCE)
-
-.installed:
-	make -C $(SOURCE) install
-	touch $@
-
-clean:
-	make -C $(SOURCE) clean
-	rm .installed
-
-distclean::
-	rm -rf $(SOURCE) .installed