feat(ios): add tvOS support (#144)

Author: LorenzGit

CanvasNative.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
 
     s.author       = { "Osei Fortune" => "fortune.osei@yahoo.com" }
 
-    s.platforms    = { :ios => "13.0", :visionos => "1.0" }
+    s.platforms    = { :ios => "13.0", :tvos => "13.0", :visionos => "1.0" }
 
     s.source       = { :git => "https://github.com/nativescript/canvas.git", :tag => "#{s.version}" }
 

Makefile

@@ -1,5 +1,6 @@
 ARCHS_IOS = x86_64-apple-ios aarch64-apple-ios aarch64-apple-ios-sim
 ARCHS_VISIONOS = aarch64-apple-visionos aarch64-apple-visionos-sim
+ARCHS_TVOS = aarch64-apple-tvos aarch64-apple-tvos-sim
 ARCHS_ANDROID = i686-linux-android x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
 
 XCFRAMEWORK = CanvasNative.xcframework
@@ -11,6 +12,8 @@ ios: $(XCFRAMEWORK)
 
 visionos: $(ARCHS_VISIONOS)
 
+tvos: $(ARCHS_TVOS)
+
 android: GENERATE_ANDROID
 
 ios-svg: GENERATE_IOS_SVG
@@ -39,6 +42,12 @@ $(ARCHS_VISIONOS): %:
 	cargo +nightly build -Z build-std='std,panic_abort' \
 	    --target $@ --release -p canvas-ios
 
+.PHONY: $(ARCHS_TVOS)
+$(ARCHS_TVOS): %:
+	RUSTFLAGS="-Zlocation-detail=none -Zunstable-options -Cpanic=immediate-abort" \
+	cargo +nightly build -Z build-std='std,panic_abort' \
+	    --target $@ --release -p canvas-ios
+
 .PHONY: $(ARCHS_ANDROID)
 $(ARCHS_ANDROID): %:
 	./tools/scripts/build-android.sh $@

Package.swift

@@ -17,7 +17,7 @@ import PackageDescription
 
 let package = Package(
     name: "CanvasNative",
-    platforms: [.iOS(.v12), .visionOS(.v1)],
+    platforms: [.iOS(.v12), .tvOS(.v12), .visionOS(.v1)],
     products: [
         .library(name: "NativeScriptV8", targets: ["NativeScriptV8"]),
     ],

crates/canvas-2d/Cargo.toml

@@ -26,7 +26,7 @@ raw-window-handle.workspace = true
 bitflags = "2.6.0"
 regex-lite = { workspace = true }
 
-[target.'cfg(any(target_os = "ios", target_os="macos", target_os = "visionos"))'.dependencies]
+[target.'cfg(any(target_os = "ios", target_os="macos", target_os = "visionos", target_os = "tvos"))'.dependencies]
 foreign-types-shared = "0.3.1"
 objc2 = {workspace = true}
 objc2-foundation = { workspace = true }

crates/canvas-2d/src/context/drawing_images/mod.rs

@@ -191,7 +191,7 @@ impl Context {
     }
 
     pub fn draw_image_dx_dy(&mut self, image: &Image, x: f32, y: f32) {
-        #[cfg(any(target_os = "macos", target_os = "ios", target_os = "visionos"))]
+        #[cfg(any(target_os = "macos", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
         let _ = unsafe { objc2_foundation::NSAutoreleasePool::new() };
         #[cfg(feature = "gl")]
         {
@@ -221,7 +221,7 @@ impl Context {
     }
 
     fn draw_image(&mut self, image: &Image, src_rect: impl Into<Rect>, dst_rect: impl Into<Rect>) {
-        #[cfg(any(target_os = "macos", target_os = "ios", target_os = "visionos"))]
+        #[cfg(any(target_os = "macos", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
         let _ = unsafe { objc2_foundation::NSAutoreleasePool::new() };
         #[cfg(feature = "gl")]
         {
@@ -259,7 +259,7 @@ impl Context {
     }
 
     fn draw_image_with_rect(&mut self, image: &Image, dst_rect: impl Into<Rect>) {
-        #[cfg(any(target_os = "macos", target_os = "ios", target_os = "visionos"))]
+        #[cfg(any(target_os = "macos", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
         let _ = unsafe { objc2_foundation::NSAutoreleasePool::new() };
         #[cfg(feature = "gl")]
         {

crates/canvas-2d/src/context/drawing_paths/mod.rs

@@ -12,7 +12,7 @@ impl Context {
         path: Option<&mut Path>,
         fill_rule: Option<FillRule>,
     ) {
-        #[cfg(any(target_os = "macos", target_os = "ios", target_os = "visionos"))]
+        #[cfg(any(target_os = "macos", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
         let _ = unsafe { objc2_foundation::NSAutoreleasePool::new() };
 
         #[cfg(feature = "gl")]

crates/canvas-2d/src/lib.rs

@@ -101,7 +101,7 @@ pub fn bytes_to_data_n32_url(
     encoded_prefix.push_str(format);
     encoded_prefix.push_str(";base64,");
 
-    #[cfg(any(target_os = "ios", target_os = "macos", target_os = "visionos"))]
+    #[cfg(any(target_os = "ios", target_os = "macos", target_os = "visionos", target_os = "tvos"))]
     let fmt = ColorType::BGRA8888;
 
     #[cfg(any(target_os = "android"))]

crates/canvas-c/Cargo.toml

@@ -44,7 +44,7 @@ objc2-metal = { workspace = true }
 
 # visionOS: display-link 0.2 is gated to ios/macos only, so RAF uses a CADisplayLink
 # shim (see src/raf/visionos.rs) built directly on objc2-quartz-core instead.
-[target.'cfg(target_os="visionos")'.dependencies]
+[target.'cfg(any(target_os="visionos", target_os="tvos"))'.dependencies]
 wgpu-core = { workspace = true, features = ["wgsl", "metal"] }
 wgpu-hal = { workspace = true, features = ["metal"] }
 objc2 = { workspace = true, features = ["std"] }

crates/canvas-c/src/c2d/context.rs

@@ -290,7 +290,7 @@ impl CanvasRenderingContext2D {
 }
 
 /* Raf */
-#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos"))]
+#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
 #[no_mangle]
 pub extern "C" fn canvas_native_raf_create(
     callback: isize,
@@ -305,7 +305,7 @@ pub extern "C" fn canvas_native_raf_create(
     ))))))
 }
 
-#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos"))]
+#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
 #[no_mangle]
 pub extern "C" fn canvas_native_raf_release(value: *mut crate::Raf) {
     if value.is_null() {
@@ -319,7 +319,7 @@ pub extern "C" fn canvas_native_raf_release(value: *mut crate::Raf) {
     }
 }
 
-#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos"))]
+#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
 #[no_mangle]
 pub extern "C" fn canvas_native_raf_start(raf: *mut crate::Raf) {
     if raf.is_null() {
@@ -329,7 +329,7 @@ pub extern "C" fn canvas_native_raf_start(raf: *mut crate::Raf) {
     raf.0.start();
 }
 
-#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos"))]
+#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
 #[no_mangle]
 pub extern "C" fn canvas_native_raf_stop(raf: *mut crate::Raf) {
     if raf.is_null() {
@@ -339,7 +339,7 @@ pub extern "C" fn canvas_native_raf_stop(raf: *mut crate::Raf) {
     raf.0.stop()
 }
 
-#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos"))]
+#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
 #[no_mangle]
 pub extern "C" fn canvas_native_raf_get_started(raf: *const crate::Raf) -> bool {
     if raf.is_null() {
@@ -349,7 +349,7 @@ pub extern "C" fn canvas_native_raf_get_started(raf: *const crate::Raf) -> bool
     raf.0.started()
 }
 
-#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos"))]
+#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
 #[no_mangle]
 pub extern "C" fn canvas_native_raf_stop_and_clear(raf: *mut crate::Raf, timeout_ms: u64) {
     if raf.is_null() {
@@ -361,7 +361,7 @@ pub extern "C" fn canvas_native_raf_stop_and_clear(raf: *mut crate::Raf, timeout
     raf.0.clear_callback();
 }
 
-#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos"))]
+#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
 #[no_mangle]
 pub extern "C" fn canvas_native_raf_clear_callback(raf: *mut crate::Raf) {
     if raf.is_null() {

crates/canvas-c/src/lib.rs

@@ -28,7 +28,7 @@ mod helper;
 pub use helper::*;
 mod image_asset;
 pub use image_asset::*;
-#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos"))]
+#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
 mod raf;
 mod text_decoder;
 pub use text_decoder::*;
@@ -38,7 +38,7 @@ mod webgl;
 pub use webgl::*;
 pub mod impl_test;
 /* Raf */
-#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos"))]
+#[cfg(any(target_os = "android", target_os = "ios", target_os = "visionos", target_os = "tvos"))]
 #[derive(Clone)]
 pub struct Raf(raf::Raf);
 /* Raf */