workaround: libcdio ABI changes

Author: joshstoik1

.github/workflows/ci.yaml

@@ -45,7 +45,7 @@ jobs:
     
     - name: Apt Dependencies
       run: |
-        sudo dpkg -i libcdio19t64_2.2.0-4_amd64.deb libcdio-dev_2.2.0-4_amd64.deb
+        sudo apt-get install -y libcdio-dev
 
     - name: Build
       run: |

libcdio-dev_2.2.0-4_amd64.deb

@@ -37,6 +37,7 @@ default-features = false
 [build-dependencies]
 dactyl = "0.10.*"
 oxford_join = "0.5.*"
+pkg-config = "0.3.*"
 
 [build-dependencies.cdtoc]
 version = "0.8.*"

libcdio19t64_2.2.0-4_amd64.deb

@@ -37,6 +37,31 @@ fn main() {
 	println!("cargo:rerun-if-env-changed=CARGO_PKG_VERSION");
 	println!("cargo:rerun-if-changed=skel");
 
+	// The `libcdio_sys` crate handles bindings to `libcdio`, but those
+	// bindings unfortunately vary by version.
+	let lib = match pkg_config::Config::new().atleast_version("2.1.0").probe("libcdio") {
+		Ok(l) => l,
+		Err(e) => panic!("{e}"),
+	};
+	let data =
+		if lib.version.starts_with("2.1.") {
+			"/// # `libcdio` True.
+const LIBCDIO_TRUE: u8 = 1;
+
+/// # `libcdio` False.
+const LIBCDIO_FALSE: u8 = 0;"
+		}
+		else {
+			"/// # `libcdio` True.
+const LIBCDIO_TRUE: bool = true;
+
+/// # `libcdio` False.
+const LIBCDIO_FALSE: bool = false;"
+		};
+	File::create(out_path("libcdio-bools.rs"))
+		.and_then(|mut f| f.write_all(data.as_bytes()).and_then(|_| f.flush()))
+		.expect("Unable to save drive data.");
+
 	let raw = fetch_offsets();
 	let offsets = parse_offsets(&raw);
 	let caches = parse_caches(&offsets);

riprip_core/Cargo.toml

@@ -54,6 +54,11 @@ use std::{
 
 
 
+// The bool types annoyingly changed between `2.1.x` and `2.2.x` so build.rs
+// generates `LIBCDIO_TRUE` and `LIBCDIO_FALSE` constants that we can use
+// instead, ensuring compatibility with both.
+include!(concat!(env!("OUT_DIR"), "/libcdio-bools.rs"));
+
 /// # Cache Bust Timeout.
 const CACHE_BUST_TIMEOUT: Duration = Duration::from_secs(45);
 
@@ -383,7 +388,7 @@ impl LibcdioInstance {
 		// The return code is a bool, true for good, instead of the usual
 		// 0 FFI normally kicks back.
 		// Safety: this is an FFI call…
-		if unsafe { libcdio_sys::cdio_get_hwinfo(self.as_ptr(), &mut raw) } {
+		if LIBCDIO_TRUE == unsafe { libcdio_sys::cdio_get_hwinfo(self.as_ptr(), &mut raw) } {
 			// Rather than deal with the uncertainty of pointers, let's recast
 			// the signs since we have everything right here.
 			let vendor_u8 = raw.psz_vendor.map(u8::saturating_from);
@@ -586,16 +591,16 @@ impl LibcdioInstance {
 				self.as_ptr(),
 				buf.as_mut_ptr().cast(),
 				lsn,
-				1,            // Sector type: CDDA.
-				false,        // No random data manipulation thank you kindly.
-				false,        // No header syncing.
-				0,            // No headers.
-				true,         // YES audio block!
-				false,        // No EDC.
-				u8::from(c2), // C2 or no C2?
-				sub,          // Subchannel? What kind?
-				block_size,   // Block size (varies by data requested).
-				1,            // Always read one block at a time.
+				1,             // Sector type: CDDA.
+				LIBCDIO_FALSE, // No random data manipulation thank you kindly.
+				LIBCDIO_FALSE, // No header syncing.
+				0,             // No headers.
+				LIBCDIO_TRUE,  // YES audio block!
+				LIBCDIO_FALSE, // No EDC.
+				u8::from(c2),  // C2 or no C2?
+				sub,           // Subchannel? What kind?
+				block_size,    // Block size (varies by data requested).
+				1,             // Always read one block at a time.
 			)
 		};