From 3efecb8383f6f8dfaed7b7322fcbc58e51d8fd9c Mon Sep 17 00:00:00 2001
From: Andrew Sun <adsun701@gmail.com>
Date: Tue, 11 Sep 2018 00:15:20 -0400
Subject: [PATCH] openal: update to 1.19.0 (#4386)

---
 .../0100-dont-specify-macros-as-arg.patch     | 50 -------------------
 mingw-w64-openal/PKGBUILD                     | 20 ++++----
 2 files changed, 9 insertions(+), 61 deletions(-)
 delete mode 100644 mingw-w64-openal/0100-dont-specify-macros-as-arg.patch

diff --git a/mingw-w64-openal/0100-dont-specify-macros-as-arg.patch b/mingw-w64-openal/0100-dont-specify-macros-as-arg.patch
deleted file mode 100644
index 83fc33d0a3..0000000000
--- a/mingw-w64-openal/0100-dont-specify-macros-as-arg.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cae4b1a062b53dd25eba7caa41622be730106749 Mon Sep 17 00:00:00 2001
-From: Chris Robinson <chris.kcat@gmail.com>
-Date: Wed, 28 Mar 2018 14:34:58 -0700
-Subject: [PATCH] Don't specify macros as arguments to CHECK_INCLUDE_FILE(S)
-
----
- CMakeLists.txt | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index df1dfe63..07454f15 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -577,7 +577,12 @@ ENDIF()
- 
- 
- # Check if we have Windows headers
--CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H -D_WIN32_WINNT=0x0502)
-+SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
-+SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502)
-+CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
-+SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS})
-+UNSET(OLD_REQUIRED_DEFINITIONS)
-+
- IF(NOT HAVE_WINDOWS_H)
-     CHECK_SYMBOL_EXISTS(gettimeofday sys/time.h HAVE_GETTIMEOFDAY)
-     IF(NOT HAVE_GETTIMEOFDAY)
-@@ -975,8 +980,11 @@ OPTION(ALSOFT_REQUIRE_WINMM "Require Windows Multimedia backend" OFF)
- OPTION(ALSOFT_REQUIRE_DSOUND "Require DirectSound backend" OFF)
- OPTION(ALSOFT_REQUIRE_WASAPI "Require WASAPI backend" OFF)
- IF(HAVE_WINDOWS_H)
-+    SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
-+    SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502)
-+
-     # Check MMSystem backend
--    CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -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)
-@@ -1013,6 +1021,9 @@ IF(HAVE_WINDOWS_H)
-             SET(ALC_OBJS  ${ALC_OBJS} Alc/backends/wasapi.c)
-         ENDIF()
-     ENDIF()
-+
-+    SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS})
-+    UNSET(OLD_REQUIRED_DEFINITIONS)
- ENDIF()
- IF(ALSOFT_REQUIRE_WINMM AND NOT HAVE_WINMM)
-     MESSAGE(FATAL_ERROR "Failed to enabled required WinMM backend")
diff --git a/mingw-w64-openal/PKGBUILD b/mingw-w64-openal/PKGBUILD
index f4fc215b49..fd189e6258 100644
--- a/mingw-w64-openal/PKGBUILD
+++ b/mingw-w64-openal/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=openal
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.18.2
-pkgrel=2
+pkgver=1.19.0
+pkgrel=1
 pkgdesc="OpenAL audio library for use with opengl (mingw-w64)"
 arch=('any')
 url="http://kcat.strangesoft.net/openal.html"
@@ -18,14 +18,12 @@ source=(http://kcat.strangesoft.net/openal-releases/openal-soft-${pkgver}.tar.bz
         0001-versioned-w32-dll.mingw.patch
         0002-w32ize-portaudio-loading.mingw.patch
         0003-openal-not-32.mingw.patch
-        0004-disable-OSS-windows.patch
-        0100-dont-specify-macros-as-arg.patch)
-sha256sums=('9f8ac1e27fba15a59758a13f0c7f6540a0605b6c3a691def9d420570506d7e82'
+        0004-disable-OSS-windows.patch)
+sha256sums=('f1adf3a6e73e2f9270a0fd00887ea23793968fa787f60dcdec41a3b2f42a0ed6'
             'a594fade14f742ad203ec7c995e9e4772e15f133067c2d37cc9477b8c9787d5c'
             'c97ebc76c1063249a61ae9843405071feb54fae4ef8cba17e82da924f09273a0'
             '93894676b54415ce9d5c8c75eea28730845ecacfd0726bede2f459ed136da080'
-            'aa6fc2efb76424d0337d609f3002abb8ff179ed15ae633c53433bcb176e643ba'
-            'b6a516e20f5d85e4e94e1f469c23d5f8b5953f7a82c0636b5d68d98e47ce5fd0')
+            'aa6fc2efb76424d0337d609f3002abb8ff179ed15ae633c53433bcb176e643ba')
 
 prepare() {
   cd openal-soft-${pkgver}
@@ -33,9 +31,6 @@ prepare() {
   patch -p1 -i ${srcdir}/0002-w32ize-portaudio-loading.mingw.patch
   patch -p1 -i ${srcdir}/0003-openal-not-32.mingw.patch
   patch -p1 -i ${srcdir}/0004-disable-OSS-windows.patch
-
-  # Upstream patches
-  patch -p1 -i ${srcdir}/0100-dont-specify-macros-as-arg.patch
 }
 
 build() {
@@ -48,6 +43,7 @@ build() {
     -G"MSYS Makefiles" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DALSOFT_EXAMPLES=OFF \
+    -DALSOFT_UTILS=ON \
     -DALSOFT_NO_CONFIG_UTIL=ON \
     -DLIBTYPE=SHARED \
     -DDSOUND_INCLUDE_DIR=${MINGW_PREFIX}/${MINGW_CHOST}/include \
@@ -57,13 +53,15 @@ build() {
 
   [[ -d "${srcdir}"/static-${MINGW_CHOST} ]] && rm -rf ${srcdir}/static-${MINGW_CHOST}
   mkdir -p "${srcdir}/static-${MINGW_CHOST}" && cd "${srcdir}/static-${MINGW_CHOST}"
-
+  
+  # enabling utilities on static causes an undefined reference error.
   DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST} \
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G"MSYS Makefiles" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DALSOFT_EXAMPLES=OFF \
+    -DALSOFT_UTILS=OFF \
     -DALSOFT_NO_CONFIG_UTIL=ON \
     -DLIBTYPE=STATIC \
     -DDSOUND_INCLUDE_DIR=${MINGW_PREFIX}/${MINGW_CHOST}/include \