diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /media/libcubeb | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'media/libcubeb')
| -rw-r--r-- | media/libcubeb/0003-Only-build-duplex_collection_change_no_unregister-wh.patch | 33 | ||||
| -rw-r--r-- | media/libcubeb/moz.yaml | 1 | ||||
| -rw-r--r-- | media/libcubeb/test/test_duplex.cpp | 2 |
3 files changed, 36 insertions, 0 deletions
diff --git a/media/libcubeb/0003-Only-build-duplex_collection_change_no_unregister-wh.patch b/media/libcubeb/0003-Only-build-duplex_collection_change_no_unregister-wh.patch new file mode 100644 index 0000000000..5d5a954853 --- /dev/null +++ b/media/libcubeb/0003-Only-build-duplex_collection_change_no_unregister-wh.patch @@ -0,0 +1,33 @@ +From 68ef0eb5691aa7b9d634b4d1af85f9d66fdfc06e Mon Sep 17 00:00:00 2001 +From: Mike Hommey <mh@glandium.org> +Date: Thu, 7 Mar 2024 08:01:32 +0900 +Subject: [PATCH] Only build duplex_collection_change_no_unregister when death + tests are supported + +--- + test/test_duplex.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/test_duplex.cpp b/test/test_duplex.cpp +index 518f44f..98a6701 100644 +--- a/test/test_duplex.cpp ++++ b/test/test_duplex.cpp +@@ -201,6 +201,7 @@ TEST(cubeb, duplex_collection_change) + ASSERT_EQ(r, CUBEB_OK); + } + ++#ifdef GTEST_HAS_DEATH_TEST + TEST(cubeb, duplex_collection_change_no_unregister) + { + cubeb * ctx; +@@ -221,6 +222,7 @@ TEST(cubeb, duplex_collection_change_no_unregister) + + duplex_collection_change_impl(ctx); + } ++#endif + + long + data_cb_input(cubeb_stream * stream, void * user, const void * inputbuffer, +-- +2.44.0.1.g9765aa7075 + diff --git a/media/libcubeb/moz.yaml b/media/libcubeb/moz.yaml index b81e81dcac..d79e64b5eb 100644 --- a/media/libcubeb/moz.yaml +++ b/media/libcubeb/moz.yaml @@ -19,6 +19,7 @@ vendoring: patches: - 0001-disable-aaudio-before-android-31.patch - 0002-disable-crash-reporter-death-test.patch + - 0003-Only-build-duplex_collection_change_no_unregister-wh.patch skip-vendoring-steps: - update-moz-build exclude: diff --git a/media/libcubeb/test/test_duplex.cpp b/media/libcubeb/test/test_duplex.cpp index 6a7ca98b1f..27d578f8c2 100644 --- a/media/libcubeb/test/test_duplex.cpp +++ b/media/libcubeb/test/test_duplex.cpp @@ -203,6 +203,7 @@ TEST(cubeb, duplex_collection_change) ASSERT_EQ(r, CUBEB_OK); } +#ifdef GTEST_HAS_DEATH_TEST TEST(cubeb, duplex_collection_change_no_unregister) { cubeb * ctx; @@ -225,6 +226,7 @@ TEST(cubeb, duplex_collection_change_no_unregister) duplex_collection_change_impl(ctx); } +#endif long data_cb_input(cubeb_stream * stream, void * user, const void * inputbuffer, |