From 4e15239393bdbe7b933723b79a1f95af1bc9d754 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Tue, 31 Dec 2019 10:48:57 -0800
Subject: [PATCH 01/17] Added ios support

---
 .travis.yml |  1 +
 build.rs    | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eea814f..6cd8596 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,3 +18,4 @@ script:
 - if [ "$TRAVIS_OS_NAME" = linux ]; then curl -sL https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/MacOSX10.13.sdk.tar.xz | tar -Jxf -; export COREAUDIO_SDK_PATH="$PWD/MacOSX10.13.sdk"; fi
 - RUSTFMT=rustfmt cargo build --verbose --target=x86_64-apple-darwin
 - if [ "$TRAVIS_OS_NAME" = osx ]; then RUSTFMT=rustfmt cargo test --verbose; fi
+- if [ "$TRAVIS_OS_NAME" = osx ]; then rustup target add aarch64-apple-ios armv7-apple-ios armv7s-apple-ios; for i in aarch64-apple-ios armv7-apple-ios armv7s-apple-ios; do RUSTFMT=rustfmt cargo build --verbose --target=$i; done; fi
diff --git a/build.rs b/build.rs
index 2b511e0..dad3234 100644
--- a/build.rs
+++ b/build.rs
@@ -54,7 +54,12 @@ fn build(sdk_path: Option<&str>, target: &str) {
     #[cfg(feature = "core_audio")]
     {
         println!("cargo:rustc-link-lib=framework=CoreAudio");
-        headers.push("CoreAudio/CoreAudio.h");
+
+        if target.contains("apple-ios") {
+            headers.push("CoreAudio/CoreAudioTypes.h");
+        } else {
+            headers.push("CoreAudio/CoreAudio.h");
+        }
     }
 
     #[cfg(feature = "open_al")]
@@ -79,7 +84,14 @@ fn build(sdk_path: Option<&str>, target: &str) {
     // Begin building the bindgen params.
     let mut builder = bindgen::Builder::default();
 
-    builder = builder.clang_args(&[&format!("--target={}", target)]);
+    if target == "aarch64-apple-ios" {
+        // See https://github.com/rust-lang/rust-bindgen/issues/1211
+        // Technically according to the llvm mailing list, the argument to clang here should be
+        // -arch arm64 but it looks cleaner to just change the target.
+        builder = builder.clang_args(&[&format!("--target={}", "arm64-apple-ios")]);
+    } else {
+        builder = builder.clang_args(&[&format!("--target={}", target)]);
+    }
 
     if let Some(sdk_path) = sdk_path {
         builder = builder.clang_args(&["-isysroot", sdk_path]);

From e3715b0b21c714f7ea69fbb6947a4d2038bcddf5 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Tue, 31 Dec 2019 13:42:42 -0800
Subject: [PATCH 02/17] Updates from comments and ran cargo fmt

---
 build.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.rs b/build.rs
index dad3234..3f37f3f 100644
--- a/build.rs
+++ b/build.rs
@@ -84,14 +84,16 @@ fn build(sdk_path: Option<&str>, target: &str) {
     // Begin building the bindgen params.
     let mut builder = bindgen::Builder::default();
 
-    if target == "aarch64-apple-ios" {
-        // See https://github.com/rust-lang/rust-bindgen/issues/1211
-        // Technically according to the llvm mailing list, the argument to clang here should be
-        // -arch arm64 but it looks cleaner to just change the target.
-        builder = builder.clang_args(&[&format!("--target={}", "arm64-apple-ios")]);
+    // See https://github.com/rust-lang/rust-bindgen/issues/1211
+    // Technically according to the llvm mailing list, the argument to clang here should be
+    // -arch arm64 but it looks cleaner to just change the target.
+    let target = if target == "aarch64-apple-ios" {
+        "arm64-apple-ios"
     } else {
-        builder = builder.clang_args(&[&format!("--target={}", target)]);
-    }
+        target
+    };
+
+    builder = builder.clang_args(&[&format!("--target={}", target)]);
 
     if let Some(sdk_path) = sdk_path {
         builder = builder.clang_args(&["-isysroot", sdk_path]);
@@ -105,9 +107,7 @@ fn build(sdk_path: Option<&str>, target: &str) {
     builder = builder.header_contents("coreaudio.h", &meta_header.concat());
 
     // Generate the bindings.
-    builder = builder
-        .trust_clang_mangling(false)
-        .derive_default(true);
+    builder = builder.trust_clang_mangling(false).derive_default(true);
 
     let bindings = builder.generate().expect("unable to generate bindings");
 

From 2861140e6944e55810e39f73d9312336f57e7026 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Thu, 2 Jan 2020 12:05:11 -0800
Subject: [PATCH 03/17] Messing around with objective-c bindgen support

---
 build.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/build.rs b/build.rs
index 3f37f3f..cfe1a81 100644
--- a/build.rs
+++ b/build.rs
@@ -96,7 +96,18 @@ fn build(sdk_path: Option<&str>, target: &str) {
     builder = builder.clang_args(&[&format!("--target={}", target)]);
 
     if let Some(sdk_path) = sdk_path {
-        builder = builder.clang_args(&["-isysroot", sdk_path]);
+        builder = builder.clang_args(
+            &[
+            "-isysroot", sdk_path,
+            ]
+        );
+    }
+    if target.contains("apple-ios") {
+        builder = builder.clang_args(
+            &[
+            "-x", "objective-c",
+            ]
+        );
     }
 
     let meta_header: Vec<_> = headers

From 4bb5fd85d073f5a5b67140ba1a812b8b1a2394bf Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Thu, 2 Jan 2020 16:41:54 -0800
Subject: [PATCH 04/17] Broken version of objective-c generation

---
 Cargo.toml | 7 ++++++-
 build.rs   | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 309da9e..44ac7ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,8 +10,13 @@ homepage = "https://github.com/RustAudio/coreaudio-sys"
 repository = "https://github.com/RustAudio/coreaudio-sys.git"
 build = "build.rs"
 
+[target.'cfg(target_os = "ios")'.dependencies]
+objc = "0.2.7"
+block = "*"
+
 [build-dependencies.bindgen]
-version = "0.51"
+version = "0.52"
+#path = "../rust-bindgen/"
 default-features = false
 
 [features]
diff --git a/build.rs b/build.rs
index cfe1a81..8294603 100644
--- a/build.rs
+++ b/build.rs
@@ -37,7 +37,7 @@ fn build(sdk_path: Option<&str>, target: &str) {
     use std::env;
     use std::path::PathBuf;
 
-    let mut headers = vec![];
+    let mut headers : Vec<&str> = vec![];
 
     #[cfg(feature = "audio_toolbox")]
     {
@@ -106,8 +106,13 @@ fn build(sdk_path: Option<&str>, target: &str) {
         builder = builder.clang_args(
             &[
             "-x", "objective-c",
+            "-fblocks",
             ]
         );
+        builder = builder.objc_extern_crate(true);
+        builder = builder.block_extern_crate(true);
+        builder = builder.rustfmt_bindings(true);
+        //builder = builder.raw_line("use objc::runtime::Object;");
     }
 
     let meta_header: Vec<_> = headers

From 6fe6d08bcf43530fef26c6891458b901d3d148ba Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Fri, 3 Jan 2020 19:30:54 -0800
Subject: [PATCH 05/17] Added blacklist to timezone item

---
 Cargo.toml | 5 +++--
 build.rs   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 44ac7ab..e468075 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,8 +15,9 @@ objc = "0.2.7"
 block = "*"
 
 [build-dependencies.bindgen]
-version = "0.52"
-#path = "../rust-bindgen/"
+#version = "0.52"
+git = "https://github.com/simlay/rust-bindgen.git"
+branch = "objc-generics-erasing"
 default-features = false
 
 [features]
diff --git a/build.rs b/build.rs
index 8294603..2241cc7 100644
--- a/build.rs
+++ b/build.rs
@@ -112,7 +112,7 @@ fn build(sdk_path: Option<&str>, target: &str) {
         builder = builder.objc_extern_crate(true);
         builder = builder.block_extern_crate(true);
         builder = builder.rustfmt_bindings(true);
-        //builder = builder.raw_line("use objc::runtime::Object;");
+        builder = builder.blacklist_item("timezone");
     }
 
     let meta_header: Vec<_> = headers

From e70b780d2a64c0739cd2c7ae373762623aa145fc Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Fri, 3 Jan 2020 19:37:07 -0800
Subject: [PATCH 06/17] Added comment for timezone blacklist

---
 build.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.rs b/build.rs
index 2241cc7..6c8bed7 100644
--- a/build.rs
+++ b/build.rs
@@ -112,6 +112,8 @@ fn build(sdk_path: Option<&str>, target: &str) {
         builder = builder.objc_extern_crate(true);
         builder = builder.block_extern_crate(true);
         builder = builder.rustfmt_bindings(true);
+        // time.h as has a variable called timezone that conflicts with some of the objective-c
+        // calls from NSCalendar.h in the Foundation framework. This removes that one variable.
         builder = builder.blacklist_item("timezone");
     }
 

From d1be2eb560a343ab9645dece5c981cc1ad18ead9 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Fri, 3 Jan 2020 19:40:37 -0800
Subject: [PATCH 07/17] Remove 32 bit ios targets from CI as they're not tier 1
 anymore

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6cd8596..c350cf1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,4 +18,4 @@ script:
 - if [ "$TRAVIS_OS_NAME" = linux ]; then curl -sL https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/MacOSX10.13.sdk.tar.xz | tar -Jxf -; export COREAUDIO_SDK_PATH="$PWD/MacOSX10.13.sdk"; fi
 - RUSTFMT=rustfmt cargo build --verbose --target=x86_64-apple-darwin
 - if [ "$TRAVIS_OS_NAME" = osx ]; then RUSTFMT=rustfmt cargo test --verbose; fi
-- if [ "$TRAVIS_OS_NAME" = osx ]; then rustup target add aarch64-apple-ios armv7-apple-ios armv7s-apple-ios; for i in aarch64-apple-ios armv7-apple-ios armv7s-apple-ios; do RUSTFMT=rustfmt cargo build --verbose --target=$i; done; fi
+- if [ "$TRAVIS_OS_NAME" = osx ]; then rustup target add aarch64-apple-ios ; RUSTFMT=rustfmt cargo build --verbose --target=aarch64-apple-ios; fi

From 2ea8ab59c4c7438405f66f13ddde305eccee9d65 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Fri, 3 Jan 2020 22:56:40 -0800
Subject: [PATCH 08/17] Updated for specific version of block

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index e468075..a27ec8a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ build = "build.rs"
 
 [target.'cfg(target_os = "ios")'.dependencies]
 objc = "0.2.7"
-block = "*"
+block = "0.1.6"
 
 [build-dependencies.bindgen]
 #version = "0.52"

From 1a538b1b630de868a68a614ad4dfeb01c9d32125 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Mon, 6 Jan 2020 19:18:48 -0800
Subject: [PATCH 09/17] Updated remote dependency

---
 Cargo.toml | 4 ++--
 build.rs   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a27ec8a..f6cc61d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,8 +16,8 @@ block = "0.1.6"
 
 [build-dependencies.bindgen]
 #version = "0.52"
-git = "https://github.com/simlay/rust-bindgen.git"
-branch = "objc-generics-erasing"
+git = "https://github.com/rust-lang/rust-bindgen.git"
+revision = "ba409edf5d3a1acc6ac4dcb32d1e168cc3a2a41b"
 default-features = false
 
 [features]
diff --git a/build.rs b/build.rs
index 6c8bed7..872b7e9 100644
--- a/build.rs
+++ b/build.rs
@@ -110,6 +110,7 @@ fn build(sdk_path: Option<&str>, target: &str) {
             ]
         );
         builder = builder.objc_extern_crate(true);
+        builder = builder.generate_block(true);
         builder = builder.block_extern_crate(true);
         builder = builder.rustfmt_bindings(true);
         // time.h as has a variable called timezone that conflicts with some of the objective-c

From be5a43d2df4ba77471e491eb2b3f6766128a4b4c Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Wed, 8 Jan 2020 19:40:10 -0800
Subject: [PATCH 10/17] Add support for the ios simulator.

---
 .travis.yml |  2 +-
 build.rs    | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c350cf1..873ee62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,4 +18,4 @@ script:
 - if [ "$TRAVIS_OS_NAME" = linux ]; then curl -sL https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/MacOSX10.13.sdk.tar.xz | tar -Jxf -; export COREAUDIO_SDK_PATH="$PWD/MacOSX10.13.sdk"; fi
 - RUSTFMT=rustfmt cargo build --verbose --target=x86_64-apple-darwin
 - if [ "$TRAVIS_OS_NAME" = osx ]; then RUSTFMT=rustfmt cargo test --verbose; fi
-- if [ "$TRAVIS_OS_NAME" = osx ]; then rustup target add aarch64-apple-ios ; RUSTFMT=rustfmt cargo build --verbose --target=aarch64-apple-ios; fi
+- if [ "$TRAVIS_OS_NAME" = osx ]; then rustup target add aarch64-apple-ios x86_64-apple-ios; for i in aarch64-apple-ios x86_64-apple-ios; do RUSTFMT=rustfmt cargo build --verbose --target=$i; done; fi
diff --git a/build.rs b/build.rs
index 872b7e9..c02ef17 100644
--- a/build.rs
+++ b/build.rs
@@ -11,7 +11,12 @@ fn sdk_path(target: &str) -> Result<String, std::io::Error> {
 
     let sdk = if target.contains("apple-darwin") {
         "macosx"
-    } else if target.contains("apple-ios") {
+    } else if target == "x86_64-apple-ios" || target == "i386-apple-ios" {
+        "iphonesimulator"
+    } else if target == "aarch64-apple-ios"
+        || target == "armv7-apple-ios"
+        || target == "armv7s-apple-ios"
+    {
         "iphoneos"
     } else {
         unreachable!();
@@ -37,7 +42,7 @@ fn build(sdk_path: Option<&str>, target: &str) {
     use std::env;
     use std::path::PathBuf;
 
-    let mut headers : Vec<&str> = vec![];
+    let mut headers: Vec<&str> = vec![];
 
     #[cfg(feature = "audio_toolbox")]
     {
@@ -96,19 +101,10 @@ fn build(sdk_path: Option<&str>, target: &str) {
     builder = builder.clang_args(&[&format!("--target={}", target)]);
 
     if let Some(sdk_path) = sdk_path {
-        builder = builder.clang_args(
-            &[
-            "-isysroot", sdk_path,
-            ]
-        );
+        builder = builder.clang_args(&["-isysroot", sdk_path]);
     }
     if target.contains("apple-ios") {
-        builder = builder.clang_args(
-            &[
-            "-x", "objective-c",
-            "-fblocks",
-            ]
-        );
+        builder = builder.clang_args(&["-x", "objective-c", "-fblocks"]);
         builder = builder.objc_extern_crate(true);
         builder = builder.generate_block(true);
         builder = builder.block_extern_crate(true);

From f1354c780970b06b9a764b9b800f5262b2398a7c Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Mon, 17 Aug 2020 01:00:02 -0700
Subject: [PATCH 11/17] updated to latest build objc build of bindgen

---
 Cargo.toml | 7 +++++--
 build.rs   | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f6cc61d..8e8cc80 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,8 +16,11 @@ block = "0.1.6"
 
 [build-dependencies.bindgen]
 #version = "0.52"
-git = "https://github.com/rust-lang/rust-bindgen.git"
-revision = "ba409edf5d3a1acc6ac4dcb32d1e168cc3a2a41b"
+git = "https://github.com/simlay/rust-bindgen.git"
+branch = "categories-and-better-return-types"
+#git = "https://github.com/rust-lang/rust-bindgen.git"
+#revision = "ba409edf5d3a1acc6ac4dcb32d1e168cc3a2a41b"
+#path = "../../rust-bindgen/"
 default-features = false
 
 [features]
diff --git a/build.rs b/build.rs
index c02ef17..88848ef 100644
--- a/build.rs
+++ b/build.rs
@@ -52,7 +52,7 @@ fn build(sdk_path: Option<&str>, target: &str) {
 
     #[cfg(feature = "audio_unit")]
     {
-        println!("cargo:rustc-link-lib=framework=AudioUnit");
+        println!("cargo:rustc-link-lib=framework=AudioToolbox");
         headers.push("AudioUnit/AudioUnit.h");
     }
 
@@ -112,6 +112,7 @@ fn build(sdk_path: Option<&str>, target: &str) {
         // time.h as has a variable called timezone that conflicts with some of the objective-c
         // calls from NSCalendar.h in the Foundation framework. This removes that one variable.
         builder = builder.blacklist_item("timezone");
+        builder = builder.blacklist_item("objc_object");
     }
 
     let meta_header: Vec<_> = headers

From 8c35bb1b09b37c6a79f8b23c9dc3d3f44135e565 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Mon, 17 Aug 2020 12:05:44 -0700
Subject: [PATCH 12/17] Updated to categories branch of rust-bindgen

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8e8cc80..19e0524 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ block = "0.1.6"
 [build-dependencies.bindgen]
 #version = "0.52"
 git = "https://github.com/simlay/rust-bindgen.git"
-branch = "categories-and-better-return-types"
+branch = "objc-category-inheritance"
 #git = "https://github.com/rust-lang/rust-bindgen.git"
 #revision = "ba409edf5d3a1acc6ac4dcb32d1e168cc3a2a41b"
 #path = "../../rust-bindgen/"

From 0dd155b6d58df4cff64b055d1a63e4a6b6eaeb60 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Sat, 19 Sep 2020 15:01:25 -0700
Subject: [PATCH 13/17] Fix aarch64 build

---
 build.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build.rs b/build.rs
index 88848ef..15b1448 100644
--- a/build.rs
+++ b/build.rs
@@ -113,6 +113,11 @@ fn build(sdk_path: Option<&str>, target: &str) {
         // calls from NSCalendar.h in the Foundation framework. This removes that one variable.
         builder = builder.blacklist_item("timezone");
         builder = builder.blacklist_item("objc_object");
+
+        // https://github.com/rust-lang/rust-bindgen/pull/1883 removed the Copy derive from
+        // objective-c class structs :/.
+        builder = builder.blacklist_item("os_workgroup_t");
+        builder = builder.raw_line("#[repr(C)] #[derive(Debug, Copy, Clone)] pub struct os_workgroup_s { _unused: [u8; 0], } pub type os_workgroup_t = *mut os_workgroup_s;");
     }
 
     let meta_header: Vec<_> = headers

From 6c7790bbbbe0c482b55ddc97206a1a02b1d01e57 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Sat, 26 Sep 2020 19:16:34 -0700
Subject: [PATCH 14/17] Updates from PR comments

---
 Cargo.toml | 9 +--------
 build.rs   | 9 ++++-----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f6cc61d..a8e668a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,15 +10,8 @@ homepage = "https://github.com/RustAudio/coreaudio-sys"
 repository = "https://github.com/RustAudio/coreaudio-sys.git"
 build = "build.rs"
 
-[target.'cfg(target_os = "ios")'.dependencies]
-objc = "0.2.7"
-block = "0.1.6"
-
 [build-dependencies.bindgen]
-#version = "0.52"
-git = "https://github.com/rust-lang/rust-bindgen.git"
-revision = "ba409edf5d3a1acc6ac4dcb32d1e168cc3a2a41b"
-default-features = false
+version = "0.55"
 
 [features]
 default = ["audio_toolbox", "audio_unit", "core_audio", "open_al", "core_midi"]
diff --git a/build.rs b/build.rs
index c02ef17..aa65ff3 100644
--- a/build.rs
+++ b/build.rs
@@ -54,6 +54,9 @@ fn build(sdk_path: Option<&str>, target: &str) {
     {
         println!("cargo:rustc-link-lib=framework=AudioUnit");
         headers.push("AudioUnit/AudioUnit.h");
+        if target.contains("apple-ios") {
+            println!("cargo:rustc-link-lib=framework=AudioToolbox");
+        }
     }
 
     #[cfg(feature = "core_audio")]
@@ -104,14 +107,10 @@ fn build(sdk_path: Option<&str>, target: &str) {
         builder = builder.clang_args(&["-isysroot", sdk_path]);
     }
     if target.contains("apple-ios") {
-        builder = builder.clang_args(&["-x", "objective-c", "-fblocks"]);
-        builder = builder.objc_extern_crate(true);
-        builder = builder.generate_block(true);
-        builder = builder.block_extern_crate(true);
-        builder = builder.rustfmt_bindings(true);
         // time.h as has a variable called timezone that conflicts with some of the objective-c
         // calls from NSCalendar.h in the Foundation framework. This removes that one variable.
         builder = builder.blacklist_item("timezone");
+        builder = builder.blacklist_item("objc_object");
     }
 
     let meta_header: Vec<_> = headers

From f603e290cd83e13661fe638f6fcfb4cce17b3702 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Sat, 26 Sep 2020 19:22:44 -0700
Subject: [PATCH 15/17] Update CI

---
 .github/workflows/coreaudio-sys.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/coreaudio-sys.yml b/.github/workflows/coreaudio-sys.yml
index aecdee2..1da3ff2 100644
--- a/.github/workflows/coreaudio-sys.yml
+++ b/.github/workflows/coreaudio-sys.yml
@@ -21,6 +21,11 @@ jobs:
     - name: cargo test - all features
       run: cargo test --all-features --verbose
 
+    - name: add ios targets
+      run: rustup add aarch64-apple-ios x86_64-apple-ios
+    - name: Build ios targets
+      run: for i in aarch64-apple-ios x86_64-apple-ios; do cargo build --verbose --target=$i; done; fi
+
   # Build the docs with all features to make sure docs.rs will work.
   macos-docs:
     runs-on: macOS-latest

From adb3e2975a4d7c21ab8966ac21b122ae01018ff9 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Sat, 26 Sep 2020 19:27:41 -0700
Subject: [PATCH 16/17] 2nd try on CI

---
 .github/workflows/coreaudio-sys.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/coreaudio-sys.yml b/.github/workflows/coreaudio-sys.yml
index 1da3ff2..addb57e 100644
--- a/.github/workflows/coreaudio-sys.yml
+++ b/.github/workflows/coreaudio-sys.yml
@@ -22,7 +22,7 @@ jobs:
       run: cargo test --all-features --verbose
 
     - name: add ios targets
-      run: rustup add aarch64-apple-ios x86_64-apple-ios
+      run: rustup target add aarch64-apple-ios x86_64-apple-ios
     - name: Build ios targets
       run: for i in aarch64-apple-ios x86_64-apple-ios; do cargo build --verbose --target=$i; done; fi
 

From ff8b3fe55b506a74d50520fb9512691ff9d5a3d8 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Sat, 26 Sep 2020 19:30:58 -0700
Subject: [PATCH 17/17] 3rd try on CI

---
 .github/workflows/coreaudio-sys.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/coreaudio-sys.yml b/.github/workflows/coreaudio-sys.yml
index addb57e..8c07fcd 100644
--- a/.github/workflows/coreaudio-sys.yml
+++ b/.github/workflows/coreaudio-sys.yml
@@ -24,7 +24,7 @@ jobs:
     - name: add ios targets
       run: rustup target add aarch64-apple-ios x86_64-apple-ios
     - name: Build ios targets
-      run: for i in aarch64-apple-ios x86_64-apple-ios; do cargo build --verbose --target=$i; done; fi
+      run: for i in aarch64-apple-ios x86_64-apple-ios; do cargo build --verbose --target=$i; done
 
   # Build the docs with all features to make sure docs.rs will work.
   macos-docs: