Merge branch 'origin/dev-0.12' into copilot/fix-d286572c-2e52-44f1-89d1-d2c5a0240531

Author: Copilot

CMakeLists.txt

@@ -462,18 +462,28 @@ set(COMMON_LINK_LIBRARIES)
 if (UNIX)
     if(NOT MINIAUDIO_NO_RUNTIME_LINKING)
         # Not all platforms actually use a separate "dl" library, notably NetBSD and OpenBSD.
-        find_library(LIB_DL "dl")
+        find_library(LIB_DL NAMES dl)
         if(LIB_DL)
-            list(APPEND COMMON_LINK_LIBRARIES dl)  # For dlopen(), etc. Most compilers will link to this by default, but some may not.
+            list(APPEND COMMON_LINK_LIBRARIES ${LIB_DL})  # For dlopen(), etc. Most compilers will link to this by default, but some may not.
         endif()
     endif()
+    
+    find_library(LIB_PTHREAD NAMES pthread)
+    if(LIB_PTHREAD)
+        list(APPEND COMMON_LINK_LIBRARIES pthread) # Some compilers will not link to pthread by default so list it here just in case.
+    endif()
 
-    list(APPEND COMMON_LINK_LIBRARIES pthread) # Some compilers will not link to pthread by default so list it here just in case.
-    list(APPEND COMMON_LINK_LIBRARIES m)
+    find_library(LIB_M NAMES m)
+    if(LIB_M)
+        list(APPEND COMMON_LINK_LIBRARIES m)
+    endif()
 
     # If we're compiling for 32-bit ARM we need to link to -latomic.
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
-        list(APPEND COMMON_LINK_LIBRARIES atomic)
+        find_library(LIB_ATOMIC NAMES atomic)
+        if(LIB_ATOMIC)
+            list(APPEND COMMON_LINK_LIBRARIES ${LIB_ATOMIC})
+        endif()
     endif()
 endif()
 
@@ -578,7 +588,7 @@ if(NOT MINIAUDIO_NO_EXTRA_NODES)
 
         if(MINIAUDIO_BUILD_EXAMPLES)
             add_executable(miniaudio_${name}_node_example extras/nodes/ma_${name}_node/ma_${name}_node_example.c)
-            target_link_libraries(miniaudio_${name}_node_example PRIVATE miniaudio_common_options)
+            target_link_libraries(miniaudio_${name}_node_example PRIVATE miniaudio_example)
         endif()
     endfunction()
 
@@ -590,12 +600,18 @@ if(NOT MINIAUDIO_NO_EXTRA_NODES)
 endif()
 
 
-# Interface with common options to simplify the setup of tests and examples. Note that we don't pass
-# in COMPILE_DEFINES here because want to allow the tests and examples to define their own defines. If
-# we were to use COMPILE_DEFINES here many of the tests and examples would not compile.
-add_library(miniaudio_common_options INTERFACE)
-target_compile_options(miniaudio_common_options INTERFACE ${COMPILE_OPTIONS})
-target_link_libraries (miniaudio_common_options INTERFACE ${COMMON_LINK_LIBRARIES})
+# Interface for examples. Examples do not include COMPILE_OPTIONS because when compiling with things
+# like MINIAUDIO_FORCE_C89, etc. it could sometimes result in warnings which would make automated
+# build tools have unnecessarily messy output. Working around these errors would require us modifying
+# the examples in ways where it would negatively affect its readablity.
+add_library(miniaudio_example INTERFACE)
+target_link_libraries (miniaudio_example INTERFACE ${COMMON_LINK_LIBRARIES})
+
+# Interface for tests. This includes our COMPILE_OPTIONS settings because we want tests to check for
+# build errors with MINIAUDIO_FORCE_C89, etc.
+add_library(miniaudio_test INTERFACE)
+target_compile_options(miniaudio_test INTERFACE ${COMPILE_OPTIONS})
+target_link_libraries (miniaudio_test INTERFACE ${COMMON_LINK_LIBRARIES})
 
 # Tests
 #
@@ -607,22 +623,28 @@ if(MINIAUDIO_BUILD_TESTS)
 
     function(add_miniaudio_test name source)
         add_executable(${name} ${TESTS_DIR}/${source})
-        target_link_libraries(${name} PRIVATE miniaudio_common_options)
+        target_link_libraries(${name} PRIVATE miniaudio_test)
         if(TARGET miniaudio_pipewire)
             target_link_libraries(${name} PRIVATE miniaudio_pipewire)
             target_compile_definitions(${name} PRIVATE MA_TESTS_INCLUDE_PIPEWIRE)
         endif()
     endfunction()
 
-    # The debugging test is only used for debugging miniaudio itself. Don't do add_test() for this, and do not include it in in any automated testing.
-    add_miniaudio_test(miniaudio_debugging debugging/debugging.cpp)
+    # Disable C++ tests when forcing C89. This is needed because we'll be passing -std=c89 which will cause errors when trying to compile a C++ file.
+    if(NOT MINIAUDIO_FORCE_C89)
+        # The debugging test is only used for debugging miniaudio itself. Don't do add_test() for this, and do not include it in in any automated testing.
+        add_miniaudio_test(miniaudio_debugging debugging/debugging.cpp)
+
+        add_miniaudio_test(miniaudio_cpp cpp/cpp.cpp)
+        add_test(NAME miniaudio_cpp COMMAND miniaudio_cpp --auto) # This is just the deviceio test.
+    endif()
 
     add_miniaudio_test(miniaudio_deviceio deviceio/deviceio.c)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Emscripten")
+        target_compile_options(miniaudio_deviceio PRIVATE --use-port=sdl2)
+    endif()
     add_test(NAME miniaudio_deviceio COMMAND miniaudio_deviceio --auto)
 
-    add_miniaudio_test(miniaudio_cpp cpp/cpp.cpp)
-    add_test(NAME miniaudio_cpp COMMAND miniaudio_cpp --auto) # This is just the deviceio test.
-
     add_miniaudio_test(miniaudio_conversion conversion/conversion.c)
     add_test(NAME miniaudio_conversion COMMAND miniaudio_conversion)
 
@@ -631,15 +653,6 @@ if(MINIAUDIO_BUILD_TESTS)
 
     add_miniaudio_test(miniaudio_generation generation/generation.c)
     add_test(NAME miniaudio_generation COMMAND miniaudio_generation)
-
-    if(NOT MINIAUDIO_NO_PIPEWIRE)
-        add_executable            (miniaudio_pipewire_test extras/backends/pipewire/miniaudio_pipewire_test.c)
-        target_compile_options    (miniaudio_pipewire_test PRIVATE ${COMPILE_OPTIONS})
-        target_compile_definitions(miniaudio_pipewire_test PRIVATE ${COMPILE_DEFINES})
-        target_include_directories(miniaudio_pipewire_test PRIVATE ${SPA_INCLUDE_DIR})
-        target_link_libraries     (miniaudio_pipewire_test PRIVATE ${COMMON_LINK_LIBRARIES})
-        add_test(NAME miniaudio_pipewire_test COMMAND miniaudio_pipewire_test --auto)
-    endif()
 endif()
 
 # Examples
@@ -650,7 +663,7 @@ if (MINIAUDIO_BUILD_EXAMPLES)
 
     function(add_miniaudio_example name source)
         add_executable(${name} ${EXAMPLES_DIR}/${source})
-        target_link_libraries(${name} PRIVATE miniaudio_common_options)
+        target_link_libraries(${name} PRIVATE miniaudio_example)
     endfunction()
 
     add_miniaudio_example(miniaudio_custom_backend custom_backend.c)

examples/engine_sdl.c

@@ -22,10 +22,12 @@ static ma_sound g_sound;            /* This example will play only a single soun
 
 void data_callback(void* pUserData, ma_uint8* pBuffer, int bufferSizeInBytes)
 {
+    ma_uint32 bufferSizeInFrames;
+
     (void)pUserData;
 
     /* Reading is just a matter of reading straight from the engine. */
-    ma_uint32 bufferSizeInFrames = (ma_uint32)bufferSizeInBytes / ma_get_bytes_per_frame(ma_format_f32, ma_engine_get_channels(&g_engine));
+    bufferSizeInFrames = (ma_uint32)bufferSizeInBytes / ma_get_bytes_per_frame(ma_format_f32, ma_engine_get_channels(&g_engine));
     ma_engine_read_pcm_frames(&g_engine, pBuffer, bufferSizeInFrames, NULL);
 }
 

examples/engine_steamaudio.c

@@ -17,7 +17,17 @@ of buffering solution to your node.
 #include "../miniaudio.c"
 
 #include <stdint.h> /* Required for uint32_t which is used by STEAMAUDIO_VERSION, and a random use of uint8_t. If there's a Steam Audio maintainer reading this, that needs to be fixed to use IPLuint32 and IPLuint8. */
+
+/* Need to silence some warnings from the Steam Audio headers. */
+#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wlong-long"
+    #pragma GCC diagnostic ignored "-Wpedantic"
+#endif
 #include <phonon.h> /* Steam Audio */
+#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
+    #pragma GCC diagnostic pop
+#endif
 
 #define FORMAT      ma_format_f32   /* Must be floating point. */
 #define CHANNELS    2               /* Must be stereo for this example. */

examples/simple_spatialization.c

@@ -67,7 +67,7 @@ int main(int argc, char** argv)
     /* Rotate the listener on the spot to create an orbiting effect. */
     for (;;) {
         listenerAngle += 0.01f;
-        ma_engine_listener_set_direction(&engine, 0, sinf(listenerAngle), 0, cosf(listenerAngle));
+        ma_engine_listener_set_direction(&engine, 0, (float)sin(listenerAngle), 0, (float)cos(listenerAngle));
 
         ma_sleep(1);
     }

external/fs/fs.c

@@ -3,6 +3,16 @@
 
 #include "fs.h"
 
+/* TODO: Remove this. To replicate errors, Just comment out this _XOPEN_SOURCE section and compile with `-std=c89` on GCC. */
+/* This is for `-std=c89` compatibility. Without this there will be a few pthread related issues as well as some stdio functions being unavailable. They will need workarounds. */
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE   700
+#else
+    #if _XOPEN_SOURCE < 500
+    #error _XOPEN_SOURCE must be >= 500. fs is not usable.
+    #endif
+#endif
+
 #include <errno.h>
 
 /* BEG fs_common_macros.c */
@@ -14,8 +24,12 @@
 /* BEG fs_va_copy.c */
 #ifndef fs_va_copy
     #if !defined(_MSC_VER) || _MSC_VER >= 1800
-        #if (defined(__GNUC__) && __GNUC__ < 3)
-            #define fs_va_copy(dst, src) ((dst) = (src))    /* This is untested. Not sure if this is correct for old GCC. */
+        #if !defined(__STDC_VERSION__) || (defined(__GNUC__) && __GNUC__ < 3)   /* <-- va_copy() is not available when using `-std=c89`. The `!defined(__STDC_VERSION__)` parts is what checks for this. */
+            #if defined(__va_copy)
+                #define fs_va_copy(dst, src) __va_copy(dst, src)
+            #else
+                #define fs_va_copy(dst, src) ((dst) = (src))    /* This is untested. Not sure if this is correct for old GCC. */
+            #endif
         #else
             #define fs_va_copy(dst, src) va_copy((dst), (src))
         #endif
@@ -495,14 +509,6 @@ Parameter ordering is the same as c89thread to make amalgamation easier.
 #if defined(_WIN32) && !defined(FS_USE_PTHREAD)
     /* Win32. Don't include windows.h here. */
 #else
-    #ifndef _XOPEN_SOURCE
-    #define _XOPEN_SOURCE   700
-    #else
-        #if _XOPEN_SOURCE < 500
-        #error _XOPEN_SOURCE must be >= 500. c89thread is not usable.
-        #endif
-    #endif
-
     #include <pthread.h>
     typedef pthread_t           fs_pthread;
     typedef pthread_mutex_t     fs_pthread_mutex;
@@ -7320,6 +7326,12 @@ logic in stb_sprintf() which we might be able to do via the amalgamator.
 #define FS_SPRINTF_NOUNALIGNED
 #endif
 
+/* We'll get -Wlong-long warnings when forcing C89. Just force disable them. */
+#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+
 /* We need to disable the implicit-fallthrough warning on GCC. */
 #if defined(__GNUC__) && (__GNUC__ >= 7 || (__GNUC__ == 6 && __GNUC_MINOR__ >= 1))
     #pragma GCC diagnostic push
@@ -8982,7 +8994,10 @@ static fs_int32 fs_real_to_str(char const* *start, fs_uint32 *len, char* out, fs
 /* END stb_sprintf.c */
 
 #if defined(__GNUC__) && (__GNUC__ >= 7 || (__GNUC__ == 6 && __GNUC_MINOR__ >= 1))
-    #pragma GCC diagnostic pop
+    #pragma GCC diagnostic pop  /* Fallthrough warnings. */
+#endif
+#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
+    #pragma GCC diagnostic pop  /* -Wlong-long */
 #endif
 /* END fs_snprintf.c */
 

extras/backends/pipewire/miniaudio_pipewire.c

@@ -76,7 +76,9 @@ which can then be stored in the backend state?
 
 
 #if defined(MA_LINUX)
-    #define MA_SUPPORT_PIPEWIRE
+    #if defined(__STDC_VERSION__)   /* <-- PipeWire cannot be used with C89 mode (__STDC_VERSION__ is only defined starting with C90). */
+        #define MA_SUPPORT_PIPEWIRE
+    #endif
 #endif
 
 #if defined(MA_SUPPORT_PIPEWIRE) && !defined(MA_NO_PIPEWIRE) && (!defined(MA_ENABLE_ONLY_SPECIFIC_BACKENDS) || defined(MA_ENABLE_PIPEWIRE))
@@ -438,6 +440,7 @@ static void ma_stream_event_param_changed__pipewire(void* pUserData, ma_uint32 i
         const struct spa_pod* pBufferParameters[1];
         ma_uint32 bufferSizeInFrames;
         ma_uint32 bytesPerFrame;
+        ma_uint32 iChannel;
 
         if (pDeviceStatePipeWire->isInternalFormatFinalised) {
             ma_log_postf(pContextStatePipeWire->pLog, MA_LOG_LEVEL_WARNING, "PipeWire format parameter changed after device has been initialized.");
@@ -456,7 +459,7 @@ static void ma_stream_event_param_changed__pipewire(void* pUserData, ma_uint32 i
         printf("Channels: %d\n", audioInfo.channels);
         printf("Rate:     %d\n", audioInfo.rate);
         printf("Channel Map: {");
-        for (ma_uint32 iChannel = 0; iChannel < audioInfo.channels; iChannel += 1) {
+        for (iChannel = 0; iChannel < audioInfo.channels; iChannel += 1) {
             printf("%d", audioInfo.position[iChannel]);
             if (iChannel < audioInfo.channels - 1) {
                 printf(", ");
@@ -529,7 +532,7 @@ static void ma_stream_event_process__pipewire(void* pUserData)
             return;
         }
 
-        //frameCount = (ma_uint32)ma_min(pBuffer->requested, pBuffer->buffer->datas[0].maxsize / bytesPerFrame);
+        /*frameCount = (ma_uint32)ma_min(pBuffer->requested, pBuffer->buffer->datas[0].maxsize / bytesPerFrame);*/
         frameCount = (ma_uint32)(pBuffer->buffer->datas[0].maxsize / bytesPerFrame);
         if (frameCount > 0) {
             if (pStream == pDeviceStatePipeWire->pStreamPlayback) {

extras/backends/pipewire/miniaudio_pipewire.h

@@ -13,6 +13,9 @@ Unfortunately PipeWire has a hard dependency on the above package, and because i
 entirely of non-trivial inlined code, it's not possible to avoid this dependency. It's for
 this reason the PipeWire backend cannot be included in miniaudio.h since it has a requirement
 that it does not depend on external development packages.
+
+The PipeWire backend cannot be used with `-std=c89`. This is because the SPA headers do not
+support it.
 */
 #ifndef miniaudio_backend_pipewire_h
 #define miniaudio_backend_pipewire_h