Linux: Fix minizip linker errors & link OCIO to expat.

wabiverse · Jan 11, 2024 · 63bd37f · 63bd37f
1 parent 5f22ae4
commit 63bd37f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 31 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -27,24 +27,6 @@
         "version" : "4.2.0"
       }
     },
-    {
-      "identity" : "metaversepythonframework",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/wabiverse/MetaversePythonFramework",
-      "state" : {
-        "revision" : "7e0507f8c9bd4aa18e23b62f896b0ee766d696c1",
-        "version" : "3.11.4"
-      }
-    },
-    {
-      "identity" : "metaversevulkanframework",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/wabiverse/MetaverseVulkanFramework",
-      "state" : {
-        "revision" : "d81c5b35576887a5e04211657cca1535b43ab0a5",
-        "version" : "1.26.1"
-      }
-    },
     {
       "identity" : "pathkit",
       "kind" : "remoteSourceControl",
@@ -54,15 +36,6 @@
         "version" : "1.0.1"
       }
     },
-    {
-      "identity" : "pythonkit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pvieito/PythonKit.git",
-      "state" : {
-        "revision" : "41dd1e76bb31661f59efbc1784e8f60ccc32a9d5",
-        "version" : "0.4.1"
-      }
-    },
     {
       "identity" : "rainbow",
       "kind" : "remoteSourceControl",

diff --git a/Package.swift b/Package.swift
@@ -39,7 +39,7 @@ let package = Package(
       ],
       publicHeadersPath: ".",
       cxxSettings: [
-        .define("_XOPEN_SOURCE", to: "1", .when(platforms: Arch.OS.apple.platform))
+        .define("_XOPEN_SOURCE", to: "1", .when(platforms: Arch.OS.apple.platform)),
       ]
     ),
 
@@ -129,7 +129,7 @@ let package = Package(
         .define("HAVE_WZAES", to: "1"),
       ],
       linkerSettings: [
-        .linkedLibrary("bz2", .when(platforms: Arch.OS.apple.platform)),
+        .linkedLibrary("bz2"),
       ]
     ),
 
@@ -370,7 +370,7 @@ let package = Package(
         .headerSearchPath("."),
       ],
       linkerSettings: [
-        .linkedLibrary("expat", .when(platforms: Arch.OS.apple.platform)),
+        .linkedLibrary("expat"),
       ]
     ),
 
@@ -753,8 +753,12 @@ func getConfig(for target: PkgTarget) -> TargetInfo
     case .minizip:
       config.exclude = [
         "mz_crypt_winxp.c",
-        "mz_crypt_openssl.c",
       ]
+      #if os(macOS)
+        config.exclude += [
+          "mz_crypt_openssl.c",
+        ]
+      #endif /* os(macOS) */
       #if !os(Windows)
         config.exclude += [
           "mz_strm_os_win32.c",