From 27523af815679477ee73416d27b411230af76792 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 24 Jul 2019 15:20:13 +0300 Subject: [PATCH] openal-soft: update to 1.19.1 --- packages/openal-soft/alcConfig.c.patch | 21 ------------------- packages/openal-soft/alconfig.c.patch | 21 +++++++++++++++++++ packages/openal-soft/build.sh | 5 ++--- .../native-tools-CMakeLists.txt.patch | 15 +++++++++++++ 4 files changed, 38 insertions(+), 24 deletions(-) delete mode 100644 packages/openal-soft/alcConfig.c.patch create mode 100644 packages/openal-soft/alconfig.c.patch create mode 100644 packages/openal-soft/native-tools-CMakeLists.txt.patch diff --git a/packages/openal-soft/alcConfig.c.patch b/packages/openal-soft/alcConfig.c.patch deleted file mode 100644 index aa7bfa112..000000000 --- a/packages/openal-soft/alcConfig.c.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -uNr openal-soft-1.18.2/Alc/alcConfig.c openal-soft-1.18.2.mod/Alc/alcConfig.c ---- openal-soft-1.18.2/Alc/alcConfig.c 2017-09-24 16:41:50.000000000 +0300 -+++ openal-soft-1.18.2.mod/Alc/alcConfig.c 2019-03-02 02:17:37.066950410 +0200 -@@ -424,7 +424,7 @@ - al_string ppath; - 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"); -@@ -435,7 +435,7 @@ - } - - if(!(str=getenv("XDG_CONFIG_DIRS")) || str[0] == 0) -- str = "/etc/xdg"; -+ str = "@TERMUX_PREFIX@/etc/xdg"; - strncpy(buffer, str, sizeof(buffer)-1); - buffer[sizeof(buffer)-1] = 0; - /* Go through the list in reverse, since "the order of base directories diff --git a/packages/openal-soft/alconfig.c.patch b/packages/openal-soft/alconfig.c.patch new file mode 100644 index 000000000..faf6d37b4 --- /dev/null +++ b/packages/openal-soft/alconfig.c.patch @@ -0,0 +1,21 @@ +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 ff92f5ddf..1252bde97 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.18.2 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_SHA256=a598241d1af2e90c25a1b91da4c9ddc0e7cb6a4b5f1477fc680d139c57cd38cc +TERMUX_PKG_VERSION=1.19.1 TERMUX_PKG_SRCURL=https://github.com/kcat/openal-soft/archive/openal-soft-$TERMUX_PKG_VERSION.tar.gz +TERMUX_PKG_SHA256=9f3536ab2bb7781dbafabc6a61e0b34b17edd16bd6c2eaf2ae71bc63078f98c7 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF diff --git a/packages/openal-soft/native-tools-CMakeLists.txt.patch b/packages/openal-soft/native-tools-CMakeLists.txt.patch new file mode 100644 index 000000000..b0b969554 --- /dev/null +++ b/packages/openal-soft/native-tools-CMakeLists.txt.patch @@ -0,0 +1,15 @@ +diff -uNr openal-soft-openal-soft-1.19.1/native-tools/CMakeLists.txt openal-soft-openal-soft-1.19.1.mod/native-tools/CMakeLists.txt +--- openal-soft-openal-soft-1.19.1/native-tools/CMakeLists.txt 2018-10-12 01:05:31.000000000 +0300 ++++ openal-soft-openal-soft-1.19.1.mod/native-tools/CMakeLists.txt 2019-07-24 15:09:41.667923002 +0300 +@@ -4,6 +4,11 @@ + + include(CheckLibraryExists) + ++set(CMAKE_C_COMPILER gcc) ++set(CMAKE_C_FLAGS "") ++set(CMAKE_LINKER "") ++set(CMAKE_EXE_LINKER_FLAGS "") ++ + set(CPP_DEFS ) + if(WIN32) + set(CPP_DEFS ${CPP_DEFS} _WIN32)