diff options
| -rw-r--r-- | meta-multimedia/recipes-multimedia/spandsp/spandsp/0001-configure-Replace-manual-search-for-libxml-by-AC_CHE.patch (renamed from meta-multimedia/recipes-multimedia/spandsp/spandsp/configure.patch) | 20 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/spandsp/spandsp/0002-configure-Use-AX_PROG_CC_FOR_BUILD-for-cross-compili.patch (renamed from meta-multimedia/recipes-multimedia/spandsp/spandsp/makefile.patch) | 56 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/spandsp/spandsp_git.bb | 7 |
3 files changed, 39 insertions, 44 deletions
diff --git a/meta-multimedia/recipes-multimedia/spandsp/spandsp/configure.patch b/meta-multimedia/recipes-multimedia/spandsp/spandsp/0001-configure-Replace-manual-search-for-libxml-by-AC_CHE.patch index af504be766..a2ad962e7e 100644 --- a/meta-multimedia/recipes-multimedia/spandsp/spandsp/configure.patch +++ b/meta-multimedia/recipes-multimedia/spandsp/spandsp/0001-configure-Replace-manual-search-for-libxml-by-AC_CHE.patch | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | From 62791a5d2532644c401060b6d49c84bee83f953c Mon Sep 17 00:00:00 2001 | ||
| 1 | From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de> | 2 | From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de> |
| 2 | Date: Thu, 14 Mar 2024 09:41:57 +0100 | 3 | Date: Thu, 14 Mar 2024 09:41:57 +0100 |
| 3 | Subject: [PATCH 2/2] configure: Replace manual search for libxml by | 4 | Subject: [PATCH 1/2] configure: Replace manual search for libxml by |
| 4 | AC_CHECK_LIB | 5 | AC_CHECK_LIB |
| 5 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
| @@ -9,22 +10,20 @@ Content-Transfer-Encoding: 8bit | |||
| 9 | The manual search fails if the include directories (and build environment) | 10 | The manual search fails if the include directories (and build environment) |
| 10 | are located somewhere else. | 11 | are located somewhere else. |
| 11 | 12 | ||
| 13 | Upstream-Status: Submitted [https://github.com/freeswitch/spandsp/pull/109] | ||
| 12 | Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> | 14 | Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> |
| 13 | Upstream-Status: Submitted [https://github.com/freeswitch/spandsp/pull/74] | 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- | 16 | --- |
| 15 | |||
| 16 | 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. | ||
| 17 | |||
| 18 | configure.ac | 22 +++++----------------- | 17 | configure.ac | 22 +++++----------------- |
| 19 | 1 file changed, 5 insertions(+), 17 deletions(-) | 18 | 1 file changed, 5 insertions(+), 17 deletions(-) |
| 20 | 19 | ||
| 21 | diff --git a/configure.ac b/configure.ac | 20 | diff --git a/configure.ac b/configure.ac |
| 22 | index 2140837..b5138d6 100644 | 21 | index fa87245..bc40690 100644 |
| 23 | --- a/configure.ac | 22 | --- a/configure.ac |
| 24 | +++ b/configure.ac | 23 | +++ b/configure.ac |
| 25 | @@ -185,23 +185,11 @@ then | 24 | @@ -232,23 +232,11 @@ then |
| 26 | fi | 25 | fi |
| 27 | 26 | ||
| 28 | # Determine XML2 include path | 27 | # Determine XML2 include path |
| 29 | -AC_MSG_CHECKING(for libxml/xmlmemory.h) | 28 | -AC_MSG_CHECKING(for libxml/xmlmemory.h) |
| 30 | - | 29 | - |
| @@ -49,8 +48,5 @@ index 2140837..b5138d6 100644 | |||
| 49 | +else | 48 | +else |
| 50 | + AC_MSG_WARN([libxml2 not found. Disabling cache.]) | 49 | + AC_MSG_WARN([libxml2 not found. Disabling cache.]) |
| 51 | fi | 50 | fi |
| 52 | |||
| 53 | AC_CHECK_HEADERS([libxml/xmlmemory.h]) | ||
| 54 | -- | ||
| 55 | 2.34.1 | ||
| 56 | 51 | ||
| 52 | AC_CHECK_HEADERS([libxml/xmlmemory.h]) | ||
diff --git a/meta-multimedia/recipes-multimedia/spandsp/spandsp/makefile.patch b/meta-multimedia/recipes-multimedia/spandsp/spandsp/0002-configure-Use-AX_PROG_CC_FOR_BUILD-for-cross-compili.patch index d3eb047fe5..385ed1e44d 100644 --- a/meta-multimedia/recipes-multimedia/spandsp/spandsp/makefile.patch +++ b/meta-multimedia/recipes-multimedia/spandsp/spandsp/0002-configure-Use-AX_PROG_CC_FOR_BUILD-for-cross-compili.patch | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | From 778a2e6ac9c5d643d236b854e53f4a71d525df57 Mon Sep 17 00:00:00 2001 | ||
| 1 | From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de> | 2 | From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de> |
| 2 | Date: Thu, 14 Mar 2024 08:08:13 +0100 | 3 | Date: Thu, 14 Mar 2024 08:08:13 +0100 |
| 3 | Subject: [PATCH 1/2] configure: Use AX_PROG_CC_FOR_BUILD for cross compiling | 4 | Subject: [PATCH 2/2] configure: Use AX_PROG_CC_FOR_BUILD for cross compiling |
| 4 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
| 5 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
| 6 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
| @@ -12,21 +13,23 @@ time. | |||
| 12 | [1]: https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html | 13 | [1]: https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html |
| 13 | [2]: https://stackoverflow.com/questions/24201260/autotools-cross-compilation-and-generated-sources/24208587#24208587 | 14 | [2]: https://stackoverflow.com/questions/24201260/autotools-cross-compilation-and-generated-sources/24208587#24208587 |
| 14 | 15 | ||
| 16 | Upstream-Status: Submitted [https://github.com/freeswitch/spandsp/pull/109] | ||
| 17 | |||
| 15 | Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> | 18 | Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> |
| 16 | Upstream-Status: Submitted [https://github.com/freeswitch/spandsp/pull/74] | 19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 17 | --- | 20 | --- |
| 18 | configure.ac | 49 +------------------------------------------- | 21 | configure.ac | 49 +------------------------------------------- |
| 19 | src/Makefile.am | 54 +++++++++++++++++++++++++------------------------ | 22 | src/Makefile.am | 54 +++++++++++++++++++++++++------------------------ |
| 20 | 2 files changed, 29 insertions(+), 74 deletions(-) | 23 | 2 files changed, 29 insertions(+), 74 deletions(-) |
| 21 | 24 | ||
| 22 | diff --git a/configure.ac b/configure.ac | 25 | diff --git a/configure.ac b/configure.ac |
| 23 | index 96fd022..2140837 100644 | 26 | index bc40690..62310b4 100644 |
| 24 | --- a/configure.ac | 27 | --- a/configure.ac |
| 25 | +++ b/configure.ac | 28 | +++ b/configure.ac |
| 26 | @@ -55,54 +55,7 @@ AC_LANG([C]) | 29 | @@ -55,54 +55,7 @@ AC_LANG([C]) |
| 27 | 30 | ||
| 28 | AX_COMPILER_VENDOR | 31 | AX_COMPILER_VENDOR |
| 29 | 32 | ||
| 30 | -if test "${build}" != "${host}" | 33 | -if test "${build}" != "${host}" |
| 31 | -then | 34 | -then |
| 32 | - # If we are doing a Canadian Cross, in which the host and build systems | 35 | - # If we are doing a Canadian Cross, in which the host and build systems |
| @@ -76,76 +79,76 @@ index 96fd022..2140837 100644 | |||
| 76 | - CXXFLAGS=${CXXFLAGS-"-g -O2"} | 79 | - CXXFLAGS=${CXXFLAGS-"-g -O2"} |
| 77 | -fi | 80 | -fi |
| 78 | +AX_PROG_CC_FOR_BUILD | 81 | +AX_PROG_CC_FOR_BUILD |
| 79 | 82 | ||
| 80 | AC_DEFUN([REMOVE_FROM_VAR],[ | 83 | AC_DEFUN([REMOVE_FROM_VAR],[ |
| 81 | new_val="" | 84 | new_val="" |
| 82 | diff --git a/src/Makefile.am b/src/Makefile.am | 85 | diff --git a/src/Makefile.am b/src/Makefile.am |
| 83 | index e05fad5..9b409a1 100644 | 86 | index f5c7cc9..d0706dd 100644 |
| 84 | --- a/src/Makefile.am | 87 | --- a/src/Makefile.am |
| 85 | +++ b/src/Makefile.am | 88 | +++ b/src/Makefile.am |
| 86 | @@ -386,44 +386,46 @@ noinst_HEADERS = cielab_luts.h \ | 89 | @@ -394,44 +394,46 @@ noinst_HEADERS = cielab_luts.h \ |
| 87 | v34_tx_pre_emphasis_filters.h \ | 90 | v34_tx_pre_emphasis_filters.h \ |
| 88 | v34_tables.h | 91 | v34_tables.h |
| 89 | 92 | ||
| 90 | -make_at_dictionary$(EXEEXT): $(top_srcdir)/src/make_at_dictionary.c | 93 | -make_at_dictionary$(EXEEXT): $(top_srcdir)/src/make_at_dictionary.c |
| 91 | - $(CC_FOR_BUILD) -o make_at_dictionary$(EXEEXT) $(top_srcdir)/src/make_at_dictionary.c -DHAVE_CONFIG_H -I$(top_builddir)/src | 94 | - $(CC_FOR_BUILD) -o make_at_dictionary$(EXEEXT) $(top_srcdir)/src/make_at_dictionary.c -DHAVE_CONFIG_H -I$(top_builddir)/src |
| 92 | +LINK_FOR_BUILD.c = $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I$(top_builddir)/src $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) | 95 | +LINK_FOR_BUILD.c = $(CC_FOR_BUILD) -DHAVE_CONFIG_H -I$(top_builddir)/src $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) |
| 93 | 96 | ||
| 94 | -make_cielab_luts$(EXEEXT): $(top_srcdir)/src/make_cielab_luts.c | 97 | -make_cielab_luts$(EXEEXT): $(top_srcdir)/src/make_cielab_luts.c |
| 95 | - $(CC_FOR_BUILD) -o make_cielab_luts$(EXEEXT) $(top_srcdir)/src/make_cielab_luts.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm | 98 | - $(CC_FOR_BUILD) -o make_cielab_luts$(EXEEXT) $(top_srcdir)/src/make_cielab_luts.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm |
| 96 | +make_at_dictionary$(BUILD_EXEEXT): $(top_srcdir)/src/make_at_dictionary.c | 99 | +make_at_dictionary$(BUILD_EXEEXT): $(top_srcdir)/src/make_at_dictionary.c |
| 97 | + $(LINK_FOR_BUILD.c) -o $@ $^ | 100 | + $(LINK_FOR_BUILD.c) -o $@ $^ |
| 98 | 101 | ||
| 99 | -make_math_fixed_tables$(EXEEXT): $(top_srcdir)/src/make_math_fixed_tables.c | 102 | -make_math_fixed_tables$(EXEEXT): $(top_srcdir)/src/make_math_fixed_tables.c |
| 100 | - $(CC_FOR_BUILD) -o make_math_fixed_tables$(EXEEXT) $(top_srcdir)/src/make_math_fixed_tables.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm | 103 | - $(CC_FOR_BUILD) -o make_math_fixed_tables$(EXEEXT) $(top_srcdir)/src/make_math_fixed_tables.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm |
| 101 | +make_cielab_luts$(BUILD_EXEEXT): $(top_srcdir)/src/make_cielab_luts.c | 104 | +make_cielab_luts$(BUILD_EXEEXT): $(top_srcdir)/src/make_cielab_luts.c |
| 102 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm | 105 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm |
| 103 | 106 | ||
| 104 | -make_modem_filter$(EXEEXT): $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c | 107 | -make_modem_filter$(EXEEXT): $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c |
| 105 | - $(CC_FOR_BUILD) -o make_modem_filter$(EXEEXT) $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm | 108 | - $(CC_FOR_BUILD) -o make_modem_filter$(EXEEXT) $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm |
| 106 | +make_math_fixed_tables$(BUILD_EXEEXT): $(top_srcdir)/src/make_math_fixed_tables.c | 109 | +make_math_fixed_tables$(BUILD_EXEEXT): $(top_srcdir)/src/make_math_fixed_tables.c |
| 107 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm | 110 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm |
| 108 | 111 | ||
| 109 | -make_modem_godard_coefficients$(EXEEXT): $(top_srcdir)/src/make_modem_godard_coefficients.c $(top_srcdir)/src/filter_tools.c | 112 | -make_modem_godard_descriptor$(EXEEXT): $(top_srcdir)/src/make_modem_godard_descriptor.c $(top_srcdir)/src/filter_tools.c |
| 110 | - $(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 | 113 | - $(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 |
| 111 | +make_modem_filter$(BUILD_EXEEXT): $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c | 114 | +make_modem_filter$(BUILD_EXEEXT): $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c |
| 112 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm | 115 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm |
| 113 | 116 | ||
| 114 | -make_t43_gray_code_tables$(EXEEXT): $(top_srcdir)/src/make_t43_gray_code_tables.c | 117 | -make_t43_gray_code_tables$(EXEEXT): $(top_srcdir)/src/make_t43_gray_code_tables.c |
| 115 | - $(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 | 118 | - $(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 |
| 116 | +make_modem_godard_coefficients$(BUILD_EXEEXT): $(top_srcdir)/src/make_modem_godard_coefficients.c $(top_srcdir)/src/filter_tools.c | 119 | +make_modem_godard_descriptor$(BUILD_EXEEXT): $(top_srcdir)/src/make_modem_godard_descriptor.c $(top_srcdir)/src/filter_tools.c |
| 117 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm | 120 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm |
| 118 | 121 | ||
| 119 | -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 | 122 | -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 |
| 120 | - $(CC_FOR_BUILD) -o 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 -DHAVE_CONFIG_H -I$(top_builddir)/src -lm | 123 | - $(CC_FOR_BUILD) -o 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 -DHAVE_CONFIG_H -I$(top_builddir)/src -lm |
| 121 | +make_t43_gray_code_tables$(BUILD_EXEEXT): $(top_srcdir)/src/make_t43_gray_code_tables.c | 124 | +make_t43_gray_code_tables$(BUILD_EXEEXT): $(top_srcdir)/src/make_t43_gray_code_tables.c |
| 122 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm | 125 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm |
| 123 | 126 | ||
| 124 | -make_v17_v32_convolutional_encoder$(EXEEXT): $(top_srcdir)/src/make_v17_v32_convolutional_encoder.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c | 127 | -make_v17_v32_convolutional_encoder$(EXEEXT): $(top_srcdir)/src/make_v17_v32_convolutional_encoder.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c |
| 125 | - $(CC_FOR_BUILD) -o make_v17_v32_convolutional_encoder$(EXEEXT) $(top_srcdir)/src/make_v17_v32_convolutional_encoder.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm | 128 | - $(CC_FOR_BUILD) -o make_v17_v32_convolutional_encoder$(EXEEXT) $(top_srcdir)/src/make_v17_v32_convolutional_encoder.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm |
| 126 | +make_v17_v32_constellation_map$(BUILD_EXEEXT): $(top_srcdir)/src/make_v17_v32_constellation_map.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c | 129 | +make_v17_v32_constellation_map$(BUILD_EXEEXT): $(top_srcdir)/src/make_v17_v32_constellation_map.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c |
| 127 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm | 130 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm |
| 128 | 131 | ||
| 129 | -make_v29_constellation_map$(EXEEXT): $(top_srcdir)/src/make_v29_constellation_map.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c | 132 | -make_v29_constellation_map$(EXEEXT): $(top_srcdir)/src/make_v29_constellation_map.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c |
| 130 | - $(CC_FOR_BUILD) -o make_v29_constellation_map$(EXEEXT) $(top_srcdir)/src/make_v29_constellation_map.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm | 133 | - $(CC_FOR_BUILD) -o make_v29_constellation_map$(EXEEXT) $(top_srcdir)/src/make_v29_constellation_map.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm |
| 131 | +make_v17_v32_convolutional_encoder$(BUILD_EXEEXT): $(top_srcdir)/src/make_v17_v32_convolutional_encoder.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c | 134 | +make_v17_v32_convolutional_encoder$(BUILD_EXEEXT): $(top_srcdir)/src/make_v17_v32_convolutional_encoder.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c |
| 132 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm | 135 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm |
| 133 | 136 | ||
| 134 | -make_v34_convolutional_coders$(EXEEXT): $(top_srcdir)/src/make_v34_convolutional_coders.c | 137 | -make_v34_convolutional_coders$(EXEEXT): $(top_srcdir)/src/make_v34_convolutional_coders.c |
| 135 | - $(CC_FOR_BUILD) -o make_v34_convolutional_coders$(EXEEXT) $(top_srcdir)/src/make_v34_convolutional_coders.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm | 138 | - $(CC_FOR_BUILD) -o make_v34_convolutional_coders$(EXEEXT) $(top_srcdir)/src/make_v34_convolutional_coders.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm |
| 136 | +make_v29_constellation_map$(BUILD_EXEEXT): $(top_srcdir)/src/make_v29_constellation_map.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c | 139 | +make_v29_constellation_map$(BUILD_EXEEXT): $(top_srcdir)/src/make_v29_constellation_map.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c |
| 137 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm | 140 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm |
| 138 | 141 | ||
| 139 | -make_v34_probe_signals$(EXEEXT): $(top_srcdir)/src/make_v34_probe_signals.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c | 142 | -make_v34_probe_signals$(EXEEXT): $(top_srcdir)/src/make_v34_probe_signals.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c |
| 140 | - $(CC_FOR_BUILD) -o make_v34_probe_signals$(EXEEXT) $(top_srcdir)/src/make_v34_probe_signals.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm | 143 | - $(CC_FOR_BUILD) -o make_v34_probe_signals$(EXEEXT) $(top_srcdir)/src/make_v34_probe_signals.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm |
| 141 | +make_v34_convolutional_coders$(BUILD_EXEEXT): $(top_srcdir)/src/make_v34_convolutional_coders.c | 144 | +make_v34_convolutional_coders$(BUILD_EXEEXT): $(top_srcdir)/src/make_v34_convolutional_coders.c |
| 142 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm | 145 | + $(LINK_FOR_BUILD.c) -o $@ $^ -lm |
| 143 | 146 | ||
| 144 | -make_v34_shell_map$(EXEEXT): $(top_srcdir)/src/make_v34_shell_map.c | 147 | -make_v34_shell_map$(EXEEXT): $(top_srcdir)/src/make_v34_shell_map.c |
| 145 | - $(CC_FOR_BUILD) -o make_v34_shell_map$(EXEEXT) $(top_srcdir)/src/make_v34_shell_map.c -DHAVE_CONFIG_H -I$(top_builddir)/src | 148 | - $(CC_FOR_BUILD) -o make_v34_shell_map$(EXEEXT) $(top_srcdir)/src/make_v34_shell_map.c -DHAVE_CONFIG_H -I$(top_builddir)/src |
| 146 | +make_v34_probe_signals$(BUILD_EXEEXT): $(top_srcdir)/src/make_v34_probe_signals.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c | 149 | +make_v34_probe_signals$(BUILD_EXEEXT): $(top_srcdir)/src/make_v34_probe_signals.c $(top_srcdir)/src/g711.c $(top_srcdir)/src/alloc.c |
| 147 | + $(LINK_FOR_BUILD.c) -o $@ $^ -I$(top_srcdir)/src -lm | 150 | + $(LINK_FOR_BUILD.c) -o $@ $^ -I$(top_srcdir)/src -lm |
| 148 | 151 | ||
| 149 | -make_v34_tx_pre_emphasis_filters$(EXEEXT): $(top_srcdir)/src/make_v34_tx_pre_emphasis_filters.c $(top_srcdir)/tools/meteor-engine.c | 152 | -make_v34_tx_pre_emphasis_filters$(EXEEXT): $(top_srcdir)/src/make_v34_tx_pre_emphasis_filters.c $(top_srcdir)/tools/meteor-engine.c |
| 150 | - $(CC_FOR_BUILD) -o make_v34_tx_pre_emphasis_filters$(EXEEXT) $(top_srcdir)/src/make_v34_tx_pre_emphasis_filters.c $(top_srcdir)/tools/meteor-engine.c -DHAVE_CONFIG_H -I$(top_builddir)/src -I$(top_builddir)/tools -lm | 153 | - $(CC_FOR_BUILD) -o make_v34_tx_pre_emphasis_filters$(EXEEXT) $(top_srcdir)/src/make_v34_tx_pre_emphasis_filters.c $(top_srcdir)/tools/meteor-engine.c -DHAVE_CONFIG_H -I$(top_builddir)/src -I$(top_builddir)/tools -lm |
| 151 | +make_v34_shell_map$(BUILD_EXEEXT): $(top_srcdir)/src/make_v34_shell_map.c | 154 | +make_v34_shell_map$(BUILD_EXEEXT): $(top_srcdir)/src/make_v34_shell_map.c |
| @@ -153,9 +156,6 @@ index e05fad5..9b409a1 100644 | |||
| 153 | + | 156 | + |
| 154 | +make_v34_tx_pre_emphasis_filters$(BUILD_EXEEXT): $(top_srcdir)/src/make_v34_tx_pre_emphasis_filters.c $(top_srcdir)/tools/meteor-engine.c | 157 | +make_v34_tx_pre_emphasis_filters$(BUILD_EXEEXT): $(top_srcdir)/src/make_v34_tx_pre_emphasis_filters.c $(top_srcdir)/tools/meteor-engine.c |
| 155 | + $(LINK_FOR_BUILD.c) -o $@ $^ -I$(top_srcdir)/tools -lm | 158 | + $(LINK_FOR_BUILD.c) -o $@ $^ -I$(top_srcdir)/tools -lm |
| 156 | 159 | ||
| 157 | # We need to run make_at_dictionary, so it generates the | 160 | # We need to run make_at_dictionary, so it generates the |
| 158 | # at_interpreter_dictionary.h file | 161 | # at_interpreter_dictionary.h file |
| 159 | -- | ||
| 160 | 2.34.1 | ||
| 161 | |||
diff --git a/meta-multimedia/recipes-multimedia/spandsp/spandsp_git.bb b/meta-multimedia/recipes-multimedia/spandsp/spandsp_git.bb index 9993837f19..a176874bba 100644 --- a/meta-multimedia/recipes-multimedia/spandsp/spandsp_git.bb +++ b/meta-multimedia/recipes-multimedia/spandsp/spandsp_git.bb | |||
| @@ -20,14 +20,13 @@ PV = "3.0.0+git" | |||
| 20 | 20 | ||
| 21 | SRC_URI = "\ | 21 | SRC_URI = "\ |
| 22 | git://github.com/freeswitch/spandsp.git;protocol=https;branch=master \ | 22 | git://github.com/freeswitch/spandsp.git;protocol=https;branch=master \ |
| 23 | file://configure.patch \ | 23 | file://0001-configure-Replace-manual-search-for-libxml-by-AC_CHE.patch \ |
| 24 | file://makefile.patch \ | 24 | file://0002-configure-Use-AX_PROG_CC_FOR_BUILD-for-cross-compili.patch \ |
| 25 | " | 25 | " |
| 26 | # Fails to build with Clang since 5394b2cae6c482ccb835335b769469977e6802ae | 26 | # Fails to build with Clang since 5394b2cae6c482ccb835335b769469977e6802ae |
| 27 | # https://github.com/freeswitch/spandsp/issues/67 | 27 | # https://github.com/freeswitch/spandsp/issues/67 |
| 28 | # https://lists.openembedded.org/g/openembedded-devel/message/109325 | 28 | # https://lists.openembedded.org/g/openembedded-devel/message/109325 |
| 29 | SRCREV = "df1282eb9af538ab1aadb6d66146e258451d4fe4" | 29 | SRCREV = "797760168945c96e91af55bde9d4edaea2e654f9" |
| 30 | |||
| 31 | 30 | ||
| 32 | inherit autotools | 31 | inherit autotools |
| 33 | 32 | ||
