Skip to content

Commit f86e7fc

Browse files
committed
update miniaudio to v0.11.21
1 parent e3dc04f commit f86e7fc

File tree

10 files changed

+368
-122
lines changed

10 files changed

+368
-122
lines changed

MAINTAINERS.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Maintainers Guide
2+
3+
This document is intended primarily for project maintainers of the zig-gamedev monorepo but may also contain useful information for other contributors and users.
4+
5+
6+
## Branch Strategy
7+
8+
[Zig](https://ziglang.org) development happens fast; with stable releases being infrequent (once or twice a year). We want to take advantage of recent improvements and features of the compiler but maintain some stabilty and compatibilty with the wider Zig ecosystem.
9+
10+
Our branch strategy facilitates parallel development for contributors and users who want stabilty from a [nominated Zig version](#nominated-zig-version) and those seeking the bleeding edge of Zig's nightly build. This strategy should be reviewed as the Zig compiler and the zig-gamedev project mature.
11+
12+
Development primarily happens on the [main branch](https://github.com/zig-gamedev/zig-gamedev/tree/main). It tracks a periodically [nominated Zig version](#nominated-zig-version). This is this branch that we recommend for most users. We have [GitHub Actions](https://github.com/zig-gamedev/zig-gamedev/actions/workflows/main.yml) run on pushes and PRs to this branch and it receives the majority of testing effort. It should provide a fairly reliable foundation for users to base their projects on.
13+
14+
For users who wish to blaze ahead, the [unstable branch](https://github.com/zig-gamedev/zig-gamedev/tree/unstable) is intended to loosely track Zig nightly builds, although it will likely lag behind in practise. Users of this branch should expect things to break from time to time and be prepared to fix things. Features and fixes happening on the main branch are integrated into unstable requently.
15+
16+
Pull requests to either branch are welcome.
17+
18+
### PRs to main
19+
Pull requests to the [main branch](https://github.com/zig-gamedev/zig-gamedev/tree/main) are preferred as this is where the majority of development effort is focussed. [GitHub Actions](https://github.com/zig-gamedev/zig-gamedev/actions/workflows/main.yml) are setup to build all demo applications, libraries and run unit tests on each supported development environment. The maintainer who merges changes should run and test changes locally at their discretion.
20+
21+
### PRs to unstable
22+
Pull requests to the [unstable branch](https://github.com/zig-gamedev/zig-gamedev/tree/main) should at least be compatible with the minimum supported Zig version as asserted by the top-level [build.zig](https://github.com/zig-gamedev/zig-gamedev/blob/unstable/build.zig). Note that there is no
23+
24+
### Merging main -> unstable
25+
TODO
26+
27+
### Merging unstable -> main
28+
TODO
29+
30+
### Nominated Zig version
31+
TODO
32+
33+
34+
## Releases
35+
TODO
36+
37+
38+
## Package Releases
39+
TODO

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Refer to each lib's README.md for further usage intructions.
9797
| **[zsdl](libs/zsdl)** | 0.0.1 | Bindings for SDL2 (wip) |
9898
| **[zgpu](libs/zgpu)** | 0.9.1 | Small helper library built on top of native wgpu implementation ([Dawn](https://github.com/michal-z/dawn-bin)) |
9999
| **[zgui](libs/zgui)** | 1.89.6 | Easy to use [dear imgui](https://github.com/ocornut/imgui) bindings (includes [ImPlot](https://github.com/epezent/implot)) |
100-
| **[zaudio](libs/zaudio)** | 0.9.3 | Fully-featured audio library built on top of [miniaudio](https://github.com/mackron/miniaudio) |
100+
| **[zaudio](libs/zaudio)** | 0.9.4 | Zig build package and bindings for [miniaudio](https://github.com/mackron/miniaudio) |
101101
| **[zmath](libs/zmath)** | 0.9.6 | SIMD math library for game developers |
102102
| **[zstbi](libs/zstbi)** | 0.9.3 | Image reading, writing and resizing with [stb](https://github.com/nothings/stb) libraries |
103103
| **[zmesh](libs/zmesh)** | 0.9.0 | Loading, generating, processing and optimizing triangle meshes |

libs/zaudio/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# zaudio v0.9.3 - Cross-platform audio
1+
# zaudio v0.9.4 - Cross-platform audio
22

3-
Zig bindings for [miniaudio](https://github.com/mackron/miniaudio) library. Tested on Windows, Linux and macOS but should also work on mobile/web platforms.
3+
Zig build package and bindings for [miniaudio](https://github.com/mackron/miniaudio) v0.11.21
44

55
As an example program please see [audio experiments (wgpu)](https://github.com/michal-z/zig-gamedev/tree/main/samples/audio_experiments_wgpu).
66

libs/zaudio/build.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.{
22
.name = "zaudio",
3-
.version = "0.9.3",
3+
.version = "0.9.4",
44
.paths = .{
55
"build.zig",
66
"build.zig.zon",

libs/zaudio/libs/miniaudio/LICENSE

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
This software is available as a choice of the following licenses. Choose
2+
whichever you prefer.
3+
4+
===============================================================================
5+
ALTERNATIVE 1 - Public Domain (www.unlicense.org)
6+
===============================================================================
7+
This is free and unencumbered software released into the public domain.
8+
9+
Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
10+
software, either in source code form or as a compiled binary, for any purpose,
11+
commercial or non-commercial, and by any means.
12+
13+
In jurisdictions that recognize copyright laws, the author or authors of this
14+
software dedicate any and all copyright interest in the software to the public
15+
domain. We make this dedication for the benefit of the public at large and to
16+
the detriment of our heirs and successors. We intend this dedication to be an
17+
overt act of relinquishment in perpetuity of all present and future rights to
18+
this software under copyright law.
19+
20+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
23+
AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
24+
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
25+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26+
27+
For more information, please refer to <http://unlicense.org/>
28+
29+
===============================================================================
30+
ALTERNATIVE 2 - MIT No Attribution
31+
===============================================================================
32+
Copyright 2023 David Reid
33+
34+
Permission is hereby granted, free of charge, to any person obtaining a copy of
35+
this software and associated documentation files (the "Software"), to deal in
36+
the Software without restriction, including without limitation the rights to
37+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
38+
of the Software, and to permit persons to whom the Software is furnished to do
39+
so.
40+
41+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
42+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
43+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
44+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
45+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
46+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
47+
SOFTWARE.

0 commit comments

Comments
 (0)