diff --git a/packages/openal-soft/alc-alconfig.cpp.patch b/packages/openal-soft/alc-alconfig.cpp.patch index 14562b57916a98..db8d935a1e2019 100644 --- a/packages/openal-soft/alc-alconfig.cpp.patch +++ b/packages/openal-soft/alc-alconfig.cpp.patch @@ -1,18 +1,15 @@ -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 @@ - +--- a/alc/alconfig.cpp ++++ b/alc/alconfig.cpp +@@ -383,13 +383,13 @@ void ReadALConfig() { -- const char *str{"/etc/openal/alsoft.conf"}; -+ const char *str{"@TERMUX_PREFIX@/etc/openal/alsoft.conf"}; + namespace fs = std::filesystem; +- fs::path path{"/etc/openal/alsoft.conf"}; ++ fs::path path{"@TERMUX_PREFIX@/etc/openal/alsoft.conf"}; - TRACE("Loading config %s...\n", str); - al::ifstream f{str}; -@@ -333,7 +333,7 @@ + TRACE("Loading config %s...\n", path.u8string().c_str()); + if(std::ifstream f{path}; f.is_open()) 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")}; diff --git a/packages/openal-soft/build.sh b/packages/openal-soft/build.sh index 1b3e5f15aeaae5..1bdc6e99cdddab 100644 --- a/packages/openal-soft/build.sh +++ b/packages/openal-soft/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Software implementation of the OpenAL API" TERMUX_PKG_LICENSE="LGPL-2.0, BSD 3-Clause" TERMUX_PKG_LICENSE_FILE="BSD-3Clause, COPYING" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.23.1 +TERMUX_PKG_VERSION="1.24.0" TERMUX_PKG_SRCURL=https://github.com/kcat/openal-soft/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=dfddf3a1f61059853c625b7bb03de8433b455f2f79f89548cbcbd5edca3d4a4a +TERMUX_PKG_SHA256=d3753f7aba798574ce2dc934e3c47dc655cd7a4652c038f2a860b0e81ff6d3dc TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_METHOD=repology TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/openal-soft/core-helpers.cpp.patch b/packages/openal-soft/core-helpers.cpp.patch new file mode 100644 index 00000000000000..0fae567d798ac3 --- /dev/null +++ b/packages/openal-soft/core-helpers.cpp.patch @@ -0,0 +1,11 @@ +--- a/core/helpers.cpp ++++ b/core/helpers.cpp +@@ -338,7 +338,7 @@ + DirectorySearch(std::filesystem::path{*homepath}/".local/share"/path, ext, &results); + + /* Search global data dirs */ +- std::string datadirs{al::getenv("XDG_DATA_DIRS").value_or("/usr/local/share/:/usr/share/")}; ++ std::string datadirs{al::getenv("XDG_DATA_DIRS").value_or("@TERMUX_PREFIX@/share/")}; + + size_t curpos{0u}; + while(curpos < datadirs.size()) diff --git a/packages/openal-soft/utils-alsoft-config-mainwindow.cpp.patch b/packages/openal-soft/utils-alsoft-config-mainwindow.cpp.patch new file mode 100644 index 00000000000000..66b33530a7ce4a --- /dev/null +++ b/packages/openal-soft/utils-alsoft-config-mainwindow.cpp.patch @@ -0,0 +1,11 @@ +--- a/utils/alsoft-config/mainwindow.cpp ++++ b/utils/alsoft-config/mainwindow.cpp +@@ -216,7 +216,7 @@ + #else + QString paths = qgetenv("XDG_DATA_DIRS"); + if(paths.isEmpty()) +- paths = "/usr/local/share/:/usr/share/"; ++ paths = "@TERMUX_PREFIX@/share/"; + #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + list += paths.split(QChar(':'), Qt::SkipEmptyParts); + #else