mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 14:19:52 +00:00
Code Issues Projects Releases Wiki Activity

spandsp: Update to tip of trunk

Browse Source 
New clang needs fixes which are in upstream tip, secondly
refresh the patches to work with latest code

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2025-12-11 19:41:22 -08:00
parent a5f72a7f7e
commit 7781c0e662
3 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-multimedia/recipes-multimedia/spandsp/spandsp/configure.patch → meta-multimedia/recipes-multimedia/spandsp/spandsp/0001-configure-Replace-manual-search-for-libxml-by-AC_CHE.patch
+6 -10
View File
@@ -1,6 +1,7 @@
From 62791a5d2532644c401060b6d49c84bee83f953c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de> From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de>
Date: Thu, 14 Mar 2024 09:41:57 +0100 Date: Thu, 14 Mar 2024 09:41:57 +0100
Subject: [PATCH 2/2] configure: Replace manual search for libxml by Subject: [PATCH 1/2] configure: Replace manual search for libxml by
AC_CHECK_LIB AC_CHECK_LIB
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
@@ -9,20 +10,18 @@ Content-Transfer-Encoding: 8bit
The manual search fails if the include directories (and build environment) The manual search fails if the include directories (and build environment)
are located somewhere else. are located somewhere else.
Upstream-Status: Submitted [https://github.com/freeswitch/spandsp/pull/109]
Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
Upstream-Status: Submitted [https://github.com/freeswitch/spandsp/pull/74] Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- ---
ERROR: spandsp-3.0.0+git-r0 do_configure: QA Issue: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
configure.ac | 22 +++++----------------- configure.ac | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-) 1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 2140837..b5138d6 100644 index fa87245..bc40690 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -185,23 +185,11 @@ then @@ -232,23 +232,11 @@ then
fi fi
# Determine XML2 include path # Determine XML2 include path
@@ -51,6 +50,3 @@ index 2140837..b5138d6 100644
fi fi
AC_CHECK_HEADERS([libxml/xmlmemory.h]) AC_CHECK_HEADERS([libxml/xmlmemory.h])
--
2.34.1
meta-multimedia/recipes-multimedia/spandsp/spandsp/makefile.patch → meta-multimedia/recipes-multimedia/spandsp/spandsp/0002-configure-Use-AX_PROG_CC_FOR_BUILD-for-cross-compili.patch
+11 -11
View File
@@ -1,6 +1,7 @@
From 778a2e6ac9c5d643d236b854e53f4a71d525df57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de> From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de>
Date: Thu, 14 Mar 2024 08:08:13 +0100 Date: Thu, 14 Mar 2024 08:08:13 +0100
Subject: [PATCH 1/2] configure: Use AX_PROG_CC_FOR_BUILD for cross compiling Subject: [PATCH 2/2] configure: Use AX_PROG_CC_FOR_BUILD for cross compiling
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
@@ -12,15 +13,17 @@ time.
[1]: https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html [1]: https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
[2]: https://stackoverflow.com/questions/24201260/autotools-cross-compilation-and-generated-sources/24208587#24208587 [2]: https://stackoverflow.com/questions/24201260/autotools-cross-compilation-and-generated-sources/24208587#24208587
Upstream-Status: Submitted [https://github.com/freeswitch/spandsp/pull/109]
Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
Upstream-Status: Submitted [https://github.com/freeswitch/spandsp/pull/74] Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- ---
configure.ac | 49 +------------------------------------------- configure.ac | 49 +-------------------------------------------
src/Makefile.am | 54 +++++++++++++++++++++++++------------------------ src/Makefile.am | 54 +++++++++++++++++++++++++------------------------
2 files changed, 29 insertions(+), 74 deletions(-) 2 files changed, 29 insertions(+), 74 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 96fd022..2140837 100644 index bc40690..62310b4 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -55,54 +55,7 @@ AC_LANG([C]) @@ -55,54 +55,7 @@ AC_LANG([C])
@@ -80,10 +83,10 @@ index 96fd022..2140837 100644
AC_DEFUN([REMOVE_FROM_VAR],[ AC_DEFUN([REMOVE_FROM_VAR],[
new_val="" new_val=""
diff --git a/src/Makefile.am b/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am
index e05fad5..9b409a1 100644 index f5c7cc9..d0706dd 100644
--- a/src/Makefile.am --- a/src/Makefile.am
+++ b/src/Makefile.am +++ b/src/Makefile.am
@@ -386,44 +386,46 @@ noinst_HEADERS = cielab_luts.h \ @@ -394,44 +394,46 @@ noinst_HEADERS = cielab_luts.h \
v34_tx_pre_emphasis_filters.h \ v34_tx_pre_emphasis_filters.h \
v34_tables.h v34_tables.h
@@ -106,14 +109,14 @@ index e05fad5..9b409a1 100644
+make_math_fixed_tables$(BUILD_EXEEXT): $(top_srcdir)/src/make_math_fixed_tables.c +make_math_fixed_tables$(BUILD_EXEEXT): $(top_srcdir)/src/make_math_fixed_tables.c
+ $(LINK_FOR_BUILD.c) -o $@ $^ -lm + $(LINK_FOR_BUILD.c) -o $@ $^ -lm
-make_modem_godard_coefficients$(EXEEXT): $(top_srcdir)/src/make_modem_godard_coefficients.c $(top_srcdir)/src/filter_tools.c -make_modem_godard_descriptor$(EXEEXT): $(top_srcdir)/src/make_modem_godard_descriptor.c $(top_srcdir)/src/filter_tools.c
- $(CC_FOR_BUILD) -o make_modem_godard_coefficients$(EXEEXT) $(top_srcdir)/src/make_modem_godard_coefficients.c $(top_srcdir)/src/filter_tools.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm - $(CC_FOR_BUILD) -o make_modem_godard_descriptor$(EXEEXT) $(top_srcdir)/src/make_modem_godard_descriptor.c $(top_srcdir)/src/filter_tools.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm
+make_modem_filter$(BUILD_EXEEXT): $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c +make_modem_filter$(BUILD_EXEEXT): $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c
+ $(LINK_FOR_BUILD.c) -o $@ $^ -lm + $(LINK_FOR_BUILD.c) -o $@ $^ -lm
-make_t43_gray_code_tables$(EXEEXT): $(top_srcdir)/src/make_t43_gray_code_tables.c -make_t43_gray_code_tables$(EXEEXT): $(top_srcdir)/src/make_t43_gray_code_tables.c
- $(CC_FOR_BUILD) -o make_t43_gray_code_tables$(EXEEXT) $(top_srcdir)/src/make_t43_gray_code_tables.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm - $(CC_FOR_BUILD) -o make_t43_gray_code_tables$(EXEEXT) $(top_srcdir)/src/make_t43_gray_code_tables.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm
+make_modem_godard_coefficients$(BUILD_EXEEXT): $(top_srcdir)/src/make_modem_godard_coefficients.c $(top_srcdir)/src/filter_tools.c +make_modem_godard_descriptor$(BUILD_EXEEXT): $(top_srcdir)/src/make_modem_godard_descriptor.c $(top_srcdir)/src/filter_tools.c
+ $(LINK_FOR_BUILD.c) -o $@ $^ -lm + $(LINK_FOR_BUILD.c) -o $@ $^ -lm
-make_v17_v32_constellation_map$(EXEEXT): $(top_srcdir)/src/make_v17_v32_constellation_map.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c -make_v17_v32_constellation_map$(EXEEXT): $(top_srcdir)/src/make_v17_v32_constellation_map.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c
@@ -156,6 +159,3 @@ index e05fad5..9b409a1 100644
# We need to run make_at_dictionary, so it generates the # We need to run make_at_dictionary, so it generates the
# at_interpreter_dictionary.h file # at_interpreter_dictionary.h file
--
2.34.1
meta-multimedia/recipes-multimedia/spandsp/spandsp_git.bb
+3 -4
View File
@@ -20,14 +20,13 @@ PV = "3.0.0+git"
SRC_URI = "\ SRC_URI = "\
git://github.com/freeswitch/spandsp.git;protocol=https;branch=master \ git://github.com/freeswitch/spandsp.git;protocol=https;branch=master \
file://configure.patch \ file://0001-configure-Replace-manual-search-for-libxml-by-AC_CHE.patch \
file://makefile.patch \ file://0002-configure-Use-AX_PROG_CC_FOR_BUILD-for-cross-compili.patch \
" "
# Fails to build with Clang since 5394b2cae6c482ccb835335b769469977e6802ae # Fails to build with Clang since 5394b2cae6c482ccb835335b769469977e6802ae
# https://github.com/freeswitch/spandsp/issues/67 # https://github.com/freeswitch/spandsp/issues/67
# https://lists.openembedded.org/g/openembedded-devel/message/109325 # https://lists.openembedded.org/g/openembedded-devel/message/109325
SRCREV = "df1282eb9af538ab1aadb6d66146e258451d4fe4" SRCREV = "797760168945c96e91af55bde9d4edaea2e654f9"
inherit autotools inherit autotools