From 6d019b43029d579ea1f01502f13b9b743492a5dd Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Wed, 8 Nov 2017 18:16:42 -0800
Subject: [PATCH 1/3] Update the audio codecs

---
 cmake/externals/hifiAudioCodec/CMakeLists.txt | 76 +++++++++----------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/cmake/externals/hifiAudioCodec/CMakeLists.txt b/cmake/externals/hifiAudioCodec/CMakeLists.txt
index a30396c6fd..808a6174ca 100644
--- a/cmake/externals/hifiAudioCodec/CMakeLists.txt
+++ b/cmake/externals/hifiAudioCodec/CMakeLists.txt
@@ -5,43 +5,41 @@ set(EXTERNAL_NAME hifiAudioCodec)
 
 string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
-if (NOT ANDROID)
-
-  if (WIN32 OR APPLE)
-    ExternalProject_Add(
-      ${EXTERNAL_NAME}
-      URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-1.zip
-      URL_MD5 23ec3fe51eaa155ea159a4971856fc13
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      INSTALL_COMMAND ""
-      LOG_DOWNLOAD 1
-    )
-  else ()
-    ExternalProject_Add(
-      ${EXTERNAL_NAME}
-      URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux.zip
-      URL_MD5 7d37914a18aa4de971d2f45dd3043bde
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      INSTALL_COMMAND ""
-      LOG_DOWNLOAD 1
-    )
-  endif()
-
-  # Hide this external target (for ide users)
-  set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-  ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
-
-  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
-
-  if (WIN32)
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/audio.lib CACHE TYPE INTERNAL)
-  elseif(APPLE)
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
-  elseif(NOT ANDROID)
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
-  endif()
-
+if (WIN32)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-win-2.0.zip)
+  set(DOWNLOAD_MD5 9199d4dbd6b16bed736b235efe980e67)
+elseif (APPLE)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-mac-2.0.zip)
+  set(DOWNLOAD_MD5 21649881e7d5dc94f922179be96f76ba)
+elseif (UNIX)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux-2.0.zip)
+  set(DOWNLOAD_MD5 988194f22f8d064c53d548259f426dce)
+elseif (ANDROID)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-android-2.0.zip)
+  set(DOWNLOAD_MD5 aef2a852600d498d58aa586668191683)
+else()
+  return()
+endif()
+
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  URL ${DOWNLOAD_URL}
+  URL_MD5 ${DOWNLOAD_MD5}
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
+  LOG_DOWNLOAD 1
+)
+
+# Hide this external target (for ide users)
+set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
+
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
+
+if (WIN32)
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/audio.lib CACHE TYPE INTERNAL)
+else()
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
 endif()

From 9a1386bf0d9c1ee157f6b4ec199eb2c9c3479b87 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Thu, 9 Nov 2017 10:34:52 -0800
Subject: [PATCH 2/3] Fix build errors on Linux

---
 cmake/externals/hifiAudioCodec/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/externals/hifiAudioCodec/CMakeLists.txt b/cmake/externals/hifiAudioCodec/CMakeLists.txt
index 808a6174ca..298f666304 100644
--- a/cmake/externals/hifiAudioCodec/CMakeLists.txt
+++ b/cmake/externals/hifiAudioCodec/CMakeLists.txt
@@ -13,7 +13,7 @@ elseif (APPLE)
   set(DOWNLOAD_MD5 21649881e7d5dc94f922179be96f76ba)
 elseif (UNIX)
   set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux-2.0.zip)
-  set(DOWNLOAD_MD5 988194f22f8d064c53d548259f426dce)
+  set(DOWNLOAD_MD5 67fb7755f9bcafb98a9fceea53bc7481)
 elseif (ANDROID)
   set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-android-2.0.zip)
   set(DOWNLOAD_MD5 aef2a852600d498d58aa586668191683)

From c324f342b4bae05044f9c072127dc8c009b85761 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Thu, 9 Nov 2017 13:39:13 -0800
Subject: [PATCH 3/3] Fix to check ANDROID before UNIX

---
 cmake/externals/hifiAudioCodec/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/externals/hifiAudioCodec/CMakeLists.txt b/cmake/externals/hifiAudioCodec/CMakeLists.txt
index 298f666304..e3ba36a440 100644
--- a/cmake/externals/hifiAudioCodec/CMakeLists.txt
+++ b/cmake/externals/hifiAudioCodec/CMakeLists.txt
@@ -11,12 +11,12 @@ if (WIN32)
 elseif (APPLE)
   set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-mac-2.0.zip)
   set(DOWNLOAD_MD5 21649881e7d5dc94f922179be96f76ba)
-elseif (UNIX)
-  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux-2.0.zip)
-  set(DOWNLOAD_MD5 67fb7755f9bcafb98a9fceea53bc7481)
 elseif (ANDROID)
   set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-android-2.0.zip)
   set(DOWNLOAD_MD5 aef2a852600d498d58aa586668191683)
+elseif (UNIX)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux-2.0.zip)
+  set(DOWNLOAD_MD5 67fb7755f9bcafb98a9fceea53bc7481)
 else()
   return()
 endif()