Bump flatpak SDK to 47. Fix build.rs.

Author: saivert

build-aux/com.saivert.pwvucontrol.json

@@ -1,30 +1,29 @@
 {
     "app-id": "com.saivert.pwvucontrol",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "46",
+    "runtime-version": "47",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm16"
+        "org.freedesktop.Sdk.Extension.llvm18"
     ],
     "command": "pwvucontrol",
     "finish-args": [
         "--share=network",
         "--share=ipc",
         "--socket=fallback-x11",
+        "--socket=pulseaudio",
         "--device=dri",
         "--socket=wayland",
         "--filesystem=xdg-run/pipewire-0"
     ],
     "build-options": {
-        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin",
-        "prepend-ld-library-path": "/usr/lib/sdk/llvm16/lib",
+        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin",
+        "prepend-ld-library-path": "/usr/lib/sdk/llvm18/lib",
         "build-args" : [
             "--share=network"
         ],
         "env": {
-            "RUST_BACKTRACE": "1",
-            "RUST_LOG": "pwvucontrol=debug",
             "CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse",
             "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",
             "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold",
@@ -59,7 +58,7 @@
                 {
                     "type": "git",
                     "tag": "0.4.16",
-                    "url": "https://gitlab.freedesktop.org/pipewire/wireplumber.git"
+                    "url": "https://github.com/PipeWire/wireplumber.git"
                 }
             ]
         },
@@ -87,4 +86,4 @@
             ]
         }
     ]
-}
+}

build.rs

@@ -9,7 +9,8 @@ fn main() {
     // also need to copy the generated config.rs file there.
     println!("cargo::rerun-if-changed=src/config.rs.in");
     let out_dir = env::var("OUT_DIR").unwrap();
-    let sourcepath: PathBuf = ["builddir", "src", "config.rs"].iter().collect();
+    let codegen_dir = env::var("CODEGEN_DIR").unwrap();
+    let sourcepath: PathBuf = [&codegen_dir, "config.rs"].iter().collect();
     if !Path::exists(&sourcepath) {
         panic!("Please configure the project with meson once to generate config.rs!");
     }

src/meson.build

@@ -27,7 +27,7 @@ endif
 
 cargo_env = [
   'CARGO_HOME=' + meson.project_build_root() / 'cargo-home',
-  'OUT_DIR=' + meson.current_build_dir(),
+  'CODEGEN_DIR=' + meson.current_build_dir(),
 ]
 
 custom_target(
@@ -50,4 +50,4 @@ custom_target(
     'src' / rust_target / meson.project_name(),
     '@OUTPUT@',
   ],
-)
+)