diff --git a/packages/openal-soft/alc-alconfig.cpp.patch b/packages/openal-soft/alc-alconfig.cpp.patch index 8f8828e930..67e6048b58 100644 --- a/packages/openal-soft/alc-alconfig.cpp.patch +++ b/packages/openal-soft/alc-alconfig.cpp.patch @@ -1,18 +1,18 @@ --- a/alc/alconfig.cpp +++ b/alc/alconfig.cpp -@@ -381,13 +381,13 @@ void ReadALConfig() +@@ -426,13 +426,13 @@ void ReadALConfig() { -- fs::path path{"/etc/openal/alsoft.conf"}; -+ fs::path path{"@TERMUX_PREFIX@/etc/openal/alsoft.conf"}; +- auto path = fs::path{"/etc/openal/alsoft.conf"}; ++ auto path = fs::path{"@TERMUX_PREFIX@/etc/openal/alsoft.conf"}; TRACE("Loading config {}...", al::u8_as_char(path.u8string())); - if(fs::ifstream f{path}; f.is_open()) + if(auto f = fs::ifstream{path}; f.is_open()) LoadConfigFromFile(f); -- 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")}; +- auto confpaths = al::getenv("XDG_CONFIG_DIRS").value_or("/etc/xdg"); ++ auto 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/build.sh b/packages/openal-soft/build.sh index 7a16d868d3..39ec398930 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.24.3" +TERMUX_PKG_VERSION="1.25.0" TERMUX_PKG_SRCURL=https://github.com/kcat/openal-soft/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=7e1fecdeb45e7f78722b776c5cf30bd33934b961d7fd2a11e0494e064cc631ce +TERMUX_PKG_SHA256=c07424e16cc53632a58f7ccaf7f4cd1cf2efde7fe4d2cdca1edbf618ea9470d1 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_METHOD=repology TERMUX_PKG_DEPENDS="libc++" @@ -18,6 +18,11 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DALSOFT_TESTS=OFF -DALSOFT_REQUIRE_OPENSL=ON " + termux_step_pre_configure() { + if [[ "$TERMUX_ON_DEVICE_BUILD" == "false" ]]; then + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DCMAKE_CXX_COMPILER_CLANG_SCAN_DEPS=${TERMUX_STANDALONE_TOOLCHAIN}/bin/clang-scan-deps" + fi + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DOPENSL_LIBRARY=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libOpenSLES.so" } diff --git a/packages/openal-soft/core-helpers.cpp.patch b/packages/openal-soft/core-helpers.cpp.patch index 0fae567d79..d093c2ad8b 100644 --- a/packages/openal-soft/core-helpers.cpp.patch +++ b/packages/openal-soft/core-helpers.cpp.patch @@ -1,11 +1,11 @@ --- a/core/helpers.cpp +++ b/core/helpers.cpp -@@ -338,7 +338,7 @@ - DirectorySearch(std::filesystem::path{*homepath}/".local/share"/path, ext, &results); +@@ -343,7 +343,7 @@ /* 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/")}; + const auto datadirs = std::string{al::getenv("XDG_DATA_DIRS") +- .value_or("/usr/local/share/:/usr/share/")}; ++ .value_or("@TERMUX_PREFIX@/share/")}; - size_t curpos{0u}; + auto curpos = 0_uz; 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 index 66b33530a7..b6be9b983c 100644 --- a/packages/openal-soft/utils-alsoft-config-mainwindow.cpp.patch +++ b/packages/openal-soft/utils-alsoft-config-mainwindow.cpp.patch @@ -1,11 +1,11 @@ --- a/utils/alsoft-config/mainwindow.cpp +++ b/utils/alsoft-config/mainwindow.cpp -@@ -216,7 +216,7 @@ +@@ -223,7 +223,7 @@ #else - QString paths = qgetenv("XDG_DATA_DIRS"); + auto paths = QString{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 + #endif + for(auto iter = list.begin();iter != list.end();)