From abe6841e0b15d98035243350585ff12058c00aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur@gmail.com>
Date: Wed, 20 Jan 2016 21:12:26 +0100
Subject: [PATCH] Update libraries

---
 CMakeLists.txt           | 10 +---------
 scripts/linux/build.sh   |  2 +-
 scripts/linux/install.sh |  6 ------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 737a8f99c6..101a61a550 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,15 +164,7 @@ if (NOT DISABLE_HTTP_TWITCH)
 	endif (STATIC)
 endif (NOT DISABLE_HTTP_TWITCH)
 
-# speex v1.1.15 is supplied in our zipped library, but distributions provide
-# updated version, with required functions extracted out to libspeexdsp.
-# This largely takes care of the problem
-if (WIN32)
-	include_directories("lib/libspeex/")
-	file(GLOB_RECURSE SPEEX_SOURCES "lib/libspeex/*.c")
-else (WIN32)
-	PKG_CHECK_MODULES(SPEEX REQUIRED speexdsp)
-endif (WIN32)
+PKG_CHECK_MODULES(SPEEX REQUIRED speexdsp)
 
 if (UNIX)
 	# Include libdl for dlopen
diff --git a/scripts/linux/build.sh b/scripts/linux/build.sh
index edd07ed0a0..3de68319ce 100755
--- a/scripts/linux/build.sh
+++ b/scripts/linux/build.sh
@@ -19,7 +19,7 @@ if [[ $TARGET != "linux" && $TARGET != "docker32" && $SYSTEM != "Darwin" ]]; the
 		# keep in sync with version in Xcode project
 		sha256sum=6562ce9e1f37f125e3345bfd8b961777800436bf607b30dc7c964e0e6991ad2c
 	else
-		sha256sum=31c5e19d9f794bd5f0e75f20c2b4c3c4664d736b0a4d50c8cde14a9a9007b62d
+		sha256sum=f124c954bbd0b58c93e5fba46902806bd3637d3a1c5fb8e4b67441052f182df2
 	fi
 	libVFile="./libversion"
 	libdir="./lib"
diff --git a/scripts/linux/install.sh b/scripts/linux/install.sh
index 55806bbbdc..0342494678 100755
--- a/scripts/linux/install.sh
+++ b/scripts/linux/install.sh
@@ -114,11 +114,6 @@ function install_pkg_config {
 	cat /usr/local/bin/i686-w64-mingw32-pkg-config
 }
 
-function install_local_libs {
-	mkdir -p lib
-	cp -rf $cachedir/orctlibs/local/* ./lib/.
-}
-
 function os_x_install_mingw_32 {
 	local mingw_name="mingw-w32-bin_i686-darwin"
 	local mingw_tar="${mingw_name}_20130531.tar.bz2"
@@ -198,7 +193,6 @@ if [[ $TARGET == "windows" || $(uname -s) == "Darwin" ]]; then
 	calculate_sha256 "$cachedir/orctlibs.zip" > "$libVFile"
 	echo "Downloaded library with sha256sum: $(cat "$libVFile")"
 	# Local libs are required for all targets
-	install_local_libs
 # $TARGET == "windows" || $(uname -s) == "Darwin"
 fi