Vendor libprojectM in projectm-sys crate (#13)

* Use git submodule reference to libprojectM

* v4.1.0

* bump

* bump

* oops

* oops

* projectm-4.1.2

* projectm-4.1.2

* projectm-4.1.2

* projectm-4.1.2

* ignore

* exclude

* make package smaller

* version updates

* improve packaging of libprojectM source

* improve packaging of libprojectM source

* fix package include files list

* bump versions

* update bindgen

* bump versions

* build paths

* rc

* bump versions

* fmt

* update submodules when cloning

* versions

* add vcpkg stuff back

* restore platform-specific build steps

* use static linking on windows/emscripten

* vcpkg root

* bump versions

* bump versions

* rustfmt

* bump versions

Author: revmischa

.github/workflows/build_emscripten.yml

@@ -21,6 +21,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Setup EMSDK
         uses: mymindstorm/setup-emsdk@v14

.github/workflows/build_linux.yml

@@ -21,7 +21,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      
+        with:
+          submodules: recursive
+
       - name: Install Packages
         run: |
           sudo apt-get update

.github/workflows/build_osx.yml

@@ -21,6 +21,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Update Local Toolchain
         run: |

.github/workflows/build_windows.yml

@@ -21,10 +21,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      
+        with:
+          submodules: recursive
+
       - name: Install Dependencies
         run: vcpkg --triplet=x64-windows-static-md install glew
-        
+
       - name: Update Local Toolchain
         run: |
           rustup update

.github/workflows/publish_crate.yml

@@ -14,6 +14,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Install Packages
         run: |
@@ -52,6 +54,6 @@ jobs:
 
       - name: Publish
         env:
-            CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
         run: |
           cargo publish --token $CARGO_REGISTRY_TOKEN

.github/workflows/publish_sys_crate.yml

@@ -14,6 +14,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Install Packages
         run: |
@@ -45,7 +47,7 @@ jobs:
 
       - name: Publish
         env:
-            CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
         run: |
           cd projectm-sys
           cargo publish --token $CARGO_REGISTRY_TOKEN

.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,21 +1,22 @@
 [package]
 name = "projectm"
-version = "2.0.1-alpha"
+version = "2.0.2"
 edition = "2021"
 rust-version = "1.65"
-authors = ["AnomieVision <[email protected]>"]
+authors = ["AnomieVision <[email protected]>", "Mischa Spiegelmock <[email protected]>"]
 description = "Bindings for ProjectM"
 license = "	LGPL-3.0-or-later"
 repository = "https://github.com/projectM-visualizer/projectm-rs" #https://github.com/anomievision/projectm-rs
-keywords = ["visualization", "audio", "sound",  "projectm"]
+keywords = ["visualization", "audio", "sound", "projectm"]
 categories = ["multimedia", "multimedia::video", "multimedia::audio"]
 readme = "README.md"
 
 [dependencies]
-libc = "0.2.147"
-projectm-sys = { path = "projectm-sys", version = "1.0.8", features = ["playlist"] }
-rand = "0.8.5"
+libc = "0.2"
+#projectm-sys = { path = "projectm-sys", version = "1.0.9-rc.1", features = ["playlist"] }
+projectm-sys = { version = "1.0.10" }
+rand = "0.8"
 
 [features]
 default = ["playlist"]
-playlist = []
+playlist = ["projectm-sys/playlist"]

projectm-sys/Cargo.toml

@@ -1,25 +1,49 @@
 [package]
 name = "projectm-sys"
-version = "1.0.8"
+version = "1.0.10"
 edition = "2021"
 rust-version = "1.65"
-authors = ["AnomieVision <[email protected]>"]
+authors = ["AnomieVision <[email protected]>", "Mischa Spiegelmock <[email protected]>"]
 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/**",
+    "Cargo.toml",
+    "build.rs",
+    "README.md",
+    "LICENSE",
+    "build_bindgen.rs",
+    "libprojectM/CMakeLists.txt",
+    "libprojectM/src/**",
+    "libprojectM/include/**",
+    "libprojectM/presets/CMakeLists.txt",
+    "libprojectM/cmake/**",
+    "libprojectM/vendor/**",
+    "libprojectM/vendor/projectm-eval/**",
+    "libprojectM/vendor/**/CMakeLists.txt",
+    "libprojectM/vendor/**/cmake/**",
+    "libprojectM/**/*.cmake",
+    "libprojectM/**/*.h",
+    "libprojectM/**/*.hpp",
+    "libprojectM/config*",
+    "libprojectM/vcpkg*",
+    "bindgen/**",
+]
+
 [dependencies]
 
 [build-dependencies]
 cmake = "0.1.50"
-bindgen = "0.66.1"
+bindgen = "0.70.1"
 lazy_static = "1.4.0"
 
 [features]
 default = ["playlist"]
-playlist = []
+playlist = []