[Bf-blender-cvs] [f5cd06ed457] master: deps: OpenAL 1.20.1

[Ray Molenkamp]

Commit: f5cd06ed457441abf833510469afe9f14683e7c5
Author: Ray Molenkamp
Date:   Sat May 23 14:02:34 2020 -0600
Branches: master
https://developer.blender.org/rBf5cd06ed457441abf833510469afe9f14683e7c5

deps: OpenAL 1.20.1

===================================================================

M	build_files/build_environment/cmake/openal.cmake
M	build_files/build_environment/cmake/versions.cmake
D	build_files/build_environment/patches/openal.diff

===================================================================

diff --git a/build_files/build_environment/cmake/openal.cmake b/build_files/build_environment/cmake/openal.cmake
index 44f6cdf72a3..315f2e8ba7e 100644
--- a/build_files/build_environment/cmake/openal.cmake
+++ b/build_files/build_environment/cmake/openal.cmake
@@ -52,7 +52,6 @@ if(BUILD_MODE STREQUAL Release)
     PREFIX ${BUILD_DIR}/openal
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
     INSTALL_DIR ${LIBDIR}/openal
-    PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff
   )
 
   if(WIN32)
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index d1e729a29e5..954f2497e69 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -20,9 +20,9 @@ set(ZLIB_VERSION 1.2.11)
 set(ZLIB_URI https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz)
 set(ZLIB_HASH 1c9f62f0778697a09d36121ead88e08e)
 
-set(OPENAL_VERSION 1.18.2)
+set(OPENAL_VERSION 1.20.1)
 set(OPENAL_URI http://openal-soft.org/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2)
-set(OPENAL_HASH d4eeb0889812e2fdeaa1843523d76190)
+set(OPENAL_HASH 556695068ce8375b89986083d810fd35)
 
 set(PNG_VERSION 1.6.35)
 set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.xz)
diff --git a/build_files/build_environment/patches/openal.diff b/build_files/build_environment/patches/openal.diff
deleted file mode 100644
index 2c9862b95a0..00000000000
--- a/build_files/build_environment/patches/openal.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur external_openal_original/CMakeLists.txt external_openal/CMakeLists.txt
---- external_openal_original/CMakeLists.txt	2016-01-24 20:12:39 -0700
-+++ external_openal/CMakeLists.txt	2018-06-02 12:16:52 -0600
-@@ -885,7 +885,8 @@
- OPTION(ALSOFT_REQUIRE_MMDEVAPI "Require MMDevApi backend" OFF)
- IF(HAVE_WINDOWS_H)
-     # Check MMSystem backend
--    CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0502)
-+    set(CMAKE_REQUIRED_FLAGS "-D_WIN32_WINNT=0x0502")
-+    CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H)
-     IF(HAVE_MMSYSTEM_H)
-         CHECK_SHARED_FUNCTION_EXISTS(waveOutOpen "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM)
-         IF(HAVE_LIBWINMM)