From 5d1c828c2d2630cc797d0ac99e4589fac294d02d Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 1 Dec 2019 18:11:47 +0100
Subject: [PATCH] openal-soft: Update from 1.19.1 to 1.20.0

---
 packages/openal-soft/alc-alconfig.cpp.patch | 21 +++++++++++++++++++++
 packages/openal-soft/alconfig.c.patch       | 21 ---------------------
 packages/openal-soft/build.sh               |  5 ++---
 3 files changed, 23 insertions(+), 24 deletions(-)
 create mode 100644 packages/openal-soft/alc-alconfig.cpp.patch
 delete mode 100644 packages/openal-soft/alconfig.c.patch

diff --git a/packages/openal-soft/alc-alconfig.cpp.patch b/packages/openal-soft/alc-alconfig.cpp.patch
new file mode 100644
index 000000000..14562b579
--- /dev/null
+++ b/packages/openal-soft/alc-alconfig.cpp.patch
@@ -0,0 +1,21 @@
+diff -u -r ../openal-soft-openal-soft-1.20.0/alc/alconfig.cpp ./alc/alconfig.cpp
+--- ../openal-soft-openal-soft-1.20.0/alc/alconfig.cpp	2019-11-28 08:45:08.000000000 +0000
++++ ./alc/alconfig.cpp	2019-12-01 17:05:51.388007000 +0000
+@@ -325,7 +325,7 @@
+ 
+ void ReadALConfig()
+ {
+-    const char *str{"/etc/openal/alsoft.conf"};
++    const char *str{"@TERMUX_PREFIX@/etc/openal/alsoft.conf"};
+ 
+     TRACE("Loading config %s...\n", str);
+     al::ifstream f{str};
+@@ -333,7 +333,7 @@
+         LoadConfigFromFile(f);
+     f.close();
+ 
+-    std::string confpaths{al::getenv("XDG_CONFIG_DIRS").value_or("/etc/xdg")};
++    std::string confpaths{al::getenv("XDG_CONFIG_DIRS").value_or("@TERMUX_PREFIX@/etc/xdg")};
+     /* Go through the list in reverse, since "the order of base directories
+      * denotes their importance; the first directory listed is the most
+      * important". Ergo, we need to load the settings from the later dirs
diff --git a/packages/openal-soft/alconfig.c.patch b/packages/openal-soft/alconfig.c.patch
deleted file mode 100644
index faf6d37b4..000000000
--- a/packages/openal-soft/alconfig.c.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr openal-soft-openal-soft-1.19.1/Alc/alconfig.c openal-soft-openal-soft-1.19.1.mod/Alc/alconfig.c
---- openal-soft-openal-soft-1.19.1/Alc/alconfig.c	2018-10-12 01:05:31.000000000 +0300
-+++ openal-soft-openal-soft-1.19.1.mod/Alc/alconfig.c	2019-07-24 14:49:05.040838897 +0300
-@@ -428,7 +428,7 @@
-     const char *str;
-     FILE *f;
- 
--    str = "/etc/openal/alsoft.conf";
-+    str = "@TERMUX_PREFIX@/etc/openal/alsoft.conf";
- 
-     TRACE("Loading config %s...\n", str);
-     f = al_fopen(str, "r");
-@@ -439,7 +439,7 @@
-     }
- 
-     if(!(str=getenv("XDG_CONFIG_DIRS")) || str[0] == 0)
--        str = "/etc/xdg";
-+        str = "@TERMUX_PREFIX@/etc/xdg";
-     alstr_copy_cstr(&confpaths, str);
-     /* Go through the list in reverse, since "the order of base directories
-      * denotes their importance; the first directory listed is the most
diff --git a/packages/openal-soft/build.sh b/packages/openal-soft/build.sh
index e70ae41ff..6ec49d46c 100644
--- a/packages/openal-soft/build.sh
+++ b/packages/openal-soft/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://openal-soft.org/
 TERMUX_PKG_DESCRIPTION="Software implementation of the OpenAL API"
 TERMUX_PKG_LICENSE="LGPL-2.0"
-TERMUX_PKG_VERSION=1.19.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.20.0
 TERMUX_PKG_SRCURL=https://github.com/kcat/openal-soft/archive/openal-soft-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=9f3536ab2bb7781dbafabc6a61e0b34b17edd16bd6c2eaf2ae71bc63078f98c7
+TERMUX_PKG_SHA256=ea1582337ce0344754cc6742b9a5da248fb971fb6fbcc592f843f765423d9265
 TERMUX_PKG_BREAKS="openal-soft-dev"
 TERMUX_PKG_REPLACES="openal-soft-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="