Vendor libprojectM in projectm-sys crate

.gitignore

@@ -8,3 +8,7 @@ Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
+
+.DS_Store
+
+.idea/

.gitmodules

@@ -0,0 +1,5 @@
+[submodule "projectm-sys/libprojectM"]
+	path = projectm-sys/libprojectM
+	url = https://github.com/projectM-visualizer/projectm.git
+[submodule "libprojectM"]
+	branch = v4.1.2

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "projectm"
-version = "2.0.1-alpha"
+version = "4.1.2"
 edition = "2021"
 rust-version = "1.65"
-authors = ["AnomieVision <anomievision@gmail.com.com>"]
+authors = ["AnomieVision <anomievision@gmail.com.com>", "Mischa Spiegelmock <me@mish.dev>"]
 description = "Bindings for ProjectM"
 license = "	LGPL-3.0-or-later"
 repository = "https://github.com/projectM-visualizer/projectm-rs" #https://github.com/anomievision/projectm-rs
@@ -13,7 +13,8 @@ readme = "README.md"
 
 [dependencies]
 libc = "0.2.147"
-projectm-sys = { path = "projectm-sys", version = "1.0.8", features = ["playlist"] }
+#projectm-sys = { path = "projectm-sys", version = "4.1.2", features = ["playlist"] }
+projectm-sys = { version = "4.1.2", features = ["playlist"] }
 rand = "0.8.5"
 
 [features]

projectm-sys/Cargo.toml

@@ -1,25 +1,49 @@
 [package]
 name = "projectm-sys"
-version = "1.0.8"
+version = "4.1.2"
 edition = "2021"
 rust-version = "1.65"
-authors = ["AnomieVision <anomievision@gmail.com.com>"]
+authors = ["AnomieVision <anomievision@gmail.com.com>", "Mischa Spiegelmock <me@mish.dev>"]
 description = "Bindings for ProjectM"
 license = "LGPL-3.0-or-later"
-repository = "https://github.com/anomievision/projectm-sys"
+repository = "https://github.com/projectM-visualizer/projectm-rs"
 documentation = "https://docs.rs/projectm-sys/latest"
-keywords = ["visualization", "audio", "sound",  "projectm"]
+keywords = ["visualization", "audio", "sound", "projectm"]
 categories = ["multimedia", "multimedia::video", "multimedia::audio"]
 readme = "README.md"
 links = "projectm"
 
+include = ["src/**",
+    "src/**",
+    "Cargo.toml",
+    "build.rs",
+    "README.md",
+    "LICENSE",
+    "build_bindgen.rs",
+    "libprojectM/CMakeLists.txt",
+    "libprojectM/src/**",
+    "libprojectM/include/**",
+    "libprojectM/presets/**",
+    "libprojectM/cmake/**",
+    "libprojectM/vendor/**",
+    "libprojectM/vendor/projectm-eval/**",
+    "libprojectM/vendor/**/CMakeLists.txt",
+    "libprojectM/vendor/**/cmake/**",
+    "libprojectM/**/*.cmake",
+    "libprojectM/**/*.h",
+    "libprojectM/**/*.hpp",
+    "libprojectM/config*",
+    "bindgen/**",
+]
+exclude = ["docs/**", "libprojectM/docs/**", "libprojectM/web/**", "libprojectM/screenshots/**"]
+
 [dependencies]
 
 [build-dependencies]
 cmake = "0.1.50"
-bindgen = "0.66.1"
+bindgen = "0.69.4"
 lazy_static = "1.4.0"
 
 [features]
 default = ["playlist"]
-playlist = []
+playlist = []

projectm-sys/build.rs

@@ -1,30 +1,43 @@
-#[macro_use]
 extern crate lazy_static;
 
-use std::{env, path::Path, process::Command};
+use lazy_static::lazy_static;
+use std::env;
+use std::path::PathBuf;
+use std::process::{Command, Stdio};
 
 mod build_bindgen;
 use crate::build_bindgen::bindgen;
 
-lazy_static! {
-    static ref PROJECTM_BUILD: String = format!("{}/projectm", env::var("OUT_DIR").unwrap());
+fn update_submodules() -> Result<(), Box<dyn std::error::Error>> {
+    let status = Command::new("git")
+        .args(["submodule", "update", "--init", "--recursive"])
+        .stdout(Stdio::inherit()) // Optionally output stdout/stderr to help with debugging
+        .stderr(Stdio::inherit())
+        .status()?;
+
+    if !status.success() {
+        return Err(Box::new(std::io::Error::new(
+            std::io::ErrorKind::Other,
+            "Submodule update failed",
+        )));
+    }
+
+    Ok(())
 }
 
 fn main() {
-    if !Path::new(PROJECTM_BUILD.as_str()).exists() {
-        let _ = Command::new("git")
-            .args([
-                "-c",
-                "advice.detachedHead=false",
-                "clone",
-                "--recurse-submodules",
-                "--depth=1",
-                "--branch",
-                "v4.0.0",
-                "https://github.com/projectM-visualizer/projectm.git",
-                &PROJECTM_BUILD,
-            ])
-            .status();
+    let projectm_path = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()).join("libprojectM");
+
+    // Ensure the submodule is updated and initialized
+    if !projectm_path.exists() {
+        println!("cargo:warning=The libprojectM submodule is not checked out. Please run 'git submodule update --init --recursive' and try building again.");
+        std::process::exit(1);
+    }
+
+    // Attempt to update and initialize submodules recursively
+    if let Err(e) = update_submodules() {
+        println!("cargo:warning=Failed to update submodules: {}", e);
+        std::process::exit(1);
     }
 
     // Feature: enable-playlist
@@ -37,7 +50,7 @@ fn main() {
     }
 
     #[cfg(target_os = "windows")]
-    let dst = cmake::Config::new(PROJECTM_BUILD.as_str())
+    let dst = cmake::Config::new(&*projectm_path)
         .generator("Visual Studio 17 2022")
         .define(
             "CMAKE_TOOLCHAIN_FILE",
@@ -55,17 +68,17 @@ fn main() {
         .build();
 
     #[cfg(target_os = "linux")]
-    let dst = cmake::Config::new(PROJECTM_BUILD.as_str())
+    let dst = cmake::Config::new(&*projectm_path)
         .define("ENABLE_PLAYLIST", enable_playlist().as_str())
         .build();
 
     #[cfg(target_os = "macos")]
-    let dst = cmake::Config::new(PROJECTM_BUILD.as_str())
+    let dst = cmake::Config::new(&*projectm_path)
         .define("ENABLE_PLAYLIST", enable_playlist().as_str())
         .build();
 
     #[cfg(target_os = "emscripten")]
-    let dst = cmake::Config::new(PROJECTM_BUILD.as_str())
+    let dst = cmake::Config::new(&*projectm_path)
         .define("ENABLE_PLAYLIST", enable_playlist().as_str())
         .define("ENABLE_EMSCRIPTEN", "ON")
         .build();

projectm-sys/build_bindgen.rs

@@ -18,7 +18,7 @@ pub fn bindgen() {
         .header(get_header())
         .allowlist_function("projectm_.*")
         .clang_arg(format!("-I{}/include", out_dir.display()))
-        .parse_callbacks(Box::new(bindgen::CargoCallbacks))
+        .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
         .generate()
         .expect("Unable to generate bindings");