Skip to content

Commit 6c65c64

Browse files
committed
add PA v15 version control
1 parent 382798a commit 6c65c64

File tree

9 files changed

+21
-2
lines changed

9 files changed

+21
-2
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
experimental: true
3434

3535
env:
36-
#TODO: add pa_v14 once environment supports it
36+
#TODO: add pa_v14 and pa_v15 once environment supports it
3737
PA_BUILD_VERSIONS: "pa_v13 pa_v12 pa_v8 pa_v6 pa_v5 minimum"
3838
PA_TEST_VERSION: pa_v13
3939

pulse-binding-mainloop-glib/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ default = ["pa_v8"]
2222

2323
# PA version compatibility selection
2424
# See the overall project `COMPATIBILITY.md` file for explanation.
25+
pa_v15 = ["pa_v14", "libpulse-binding/pa_v15", "libpulse-mainloop-glib-sys/pa_v15"]
2526
pa_v14 = ["pa_v13", "libpulse-binding/pa_v14", "libpulse-mainloop-glib-sys/pa_v14"]
2627
pa_v13 = ["pa_v12", "libpulse-binding/pa_v13", "libpulse-mainloop-glib-sys/pa_v13"]
2728
pa_v12 = ["pa_v8", "libpulse-binding/pa_v12", "libpulse-mainloop-glib-sys/pa_v12"]

pulse-binding-simple/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ default = ["pa_v8"]
2121

2222
# PA version compatibility selection
2323
# See the overall project `COMPATIBILITY.md` file for explanation.
24+
pa_v15 = ["pa_v14", "libpulse-binding/pa_v15", "libpulse-sys/pa_v15", "libpulse-simple-sys/pa_v15"]
2425
pa_v14 = ["pa_v13", "libpulse-binding/pa_v14", "libpulse-sys/pa_v14", "libpulse-simple-sys/pa_v14"]
2526
pa_v13 = ["pa_v12", "libpulse-binding/pa_v13", "libpulse-sys/pa_v13", "libpulse-simple-sys/pa_v13"]
2627
pa_v12 = ["pa_v8", "libpulse-binding/pa_v12", "libpulse-sys/pa_v12", "libpulse-simple-sys/pa_v12"]

pulse-binding/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ default = ["pa_v8"]
2626

2727
# PA version compatibility selection
2828
# See the overall project `COMPATIBILITY.md` file for explanation.
29+
pa_v15 = ["pa_v14", "libpulse-sys/pa_v15"]
2930
pa_v14 = ["pa_v13", "libpulse-sys/pa_v14"]
3031
pa_v13 = ["pa_v12", "libpulse-sys/pa_v13"]
3132
pa_v12 = ["pa_v8", "libpulse-sys/pa_v12"]

pulse-sys-mainloop-glib/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ default = ["pa_v8"]
2525

2626
# PA version compatibility selection
2727
# See the overall project `COMPATIBILITY.md` file for explanation.
28+
pa_v15 = ["pa_v14", "libpulse-sys/pa_v15"]
2829
pa_v14 = ["pa_v13", "libpulse-sys/pa_v14"]
2930
pa_v13 = ["pa_v12", "libpulse-sys/pa_v13"]
3031
pa_v12 = ["pa_v8", "libpulse-sys/pa_v12"]

pulse-sys-simple/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ default = ["pa_v8"]
2424

2525
# PA version compatibility selection
2626
# See the overall project `COMPATIBILITY.md` file for explanation.
27+
pa_v15 = ["pa_v14", "libpulse-sys/pa_v15"]
2728
pa_v14 = ["pa_v13", "libpulse-sys/pa_v14"]
2829
pa_v13 = ["pa_v12", "libpulse-sys/pa_v13"]
2930
pa_v12 = ["pa_v8", "libpulse-sys/pa_v12"]

pulse-sys/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ default = ["pa_v8"]
2929

3030
# PA version compatibility selection
3131
# See the overall project `COMPATIBILITY.md` file for explanation.
32+
pa_v15 = ["pa_v14"]
3233
pa_v14 = ["pa_v13"]
3334
pa_v13 = ["pa_v12"]
3435
pa_v12 = ["pa_v8"]

pulse-sys/build.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ fn main() {
1616
{ "pulse" }
1717
};
1818
let min_version = {
19-
#[cfg(feature = "pa_v14")]
19+
#[cfg(feature = "pa_v15")]
20+
{ "15.0" }
21+
#[cfg(all(feature = "pa_v14", not(feature = "pa_v15")))]
2022
{ "14.0" }
2123
#[cfg(all(feature = "pa_v13", not(feature = "pa_v14")))]
2224
{ "13.0" }

pulse-sys/src/version.rs

+11
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,20 @@ pub enum Compatibility {
7070
V13Plus,
7171
/// Support for PA version 14+ selected.
7272
V14Plus,
73+
/// Support for PA version 15+ selected.
74+
V15Plus,
7375
}
7476

7577
// Latest
78+
#[cfg(any(feature = "pa_v15", all(doc, not(feature = "pa_v5"))))]
79+
mod actual {
80+
pub const COMPATIBILITY: super::Compatibility = super::Compatibility::V15Plus;
81+
pub const TARGET_VERSION_STRING: &str = "15.0.0";
82+
pub const TARGET_VERSION: (u8, u8) = (15, 0);
83+
pub const PA_PROTOCOL_VERSION: u16 = 35;
84+
}
85+
86+
// Pre-v15
7687
#[cfg(any(feature = "pa_v14", all(doc, not(feature = "pa_v5"))))]
7788
mod actual {
7889
pub const COMPATIBILITY: super::Compatibility = super::Compatibility::V14Plus;

0 commit comments

Comments
 (0)