Added Podspec

Added README

Author: dreampiggy

Package.swift

@@ -104,13 +104,12 @@ let package = Package(
  publicHeadersPath: "libjxl/lib/include",
  cSettings: [.headerSearchPath("generate"),
  .headerSearchPath("libjxl"),
- .headerSearchPath("libjxl/third_party/highway"),
  .define("CMS_NO_REGISTER_KEYWORD")]
  ),
  .target(
  name: "brotli",
  path: "libjxl/third_party/brotli/c",
- exclude: ["fuzz"],
+ exclude: ["fuzz", "tools"],
  publicHeadersPath: "include"
  ),
  .target(
@@ -122,7 +121,7 @@ let package = Package(
  "hwy/nanobenchmark_test.cc",
  "hwy/targets_test.cc",
  "hwy/base_test.cc"],
- cSettings: [.headerSearchPath(".")]
+ publicHeadersPath: "."
  ),
  .target(
  name: "lcms",

README.md

@@ -0,0 +1,74 @@
+# libjxl + Xcode
+
+A wrapper for [libjxl](https://github.com/libjxl/libjxl) + Xcode project.
+This enables Carthage support
+This also contains the Swift Package Manager support
+
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/SDWebImage/libjxl-Xcode)
+[![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg)](https://swift.org/package-manager/)
+
+## Requirements
+
++ iOS 9+
++ macOS 10.11+
++ tvOS 9.0+
++ watchOS 2.0+
++ visionOS 1.0+
+
+## Installation
+
+#### CocoaPods
+
+libjxl is available through [CocoaPods](http://cocoapods.org). To install it, simply add the following line to your Podfile:
+
+```ruby
+pod 'libjxl'
+```
+
+### Carthage
+
+libjxl is (via this repo) available through [Carthage](https://github.com/Carthage/Carthage).
+
+```
+github "SDWebImage/libjxl-Xcode"
+```
+
+### SwiftPM
+
+Libjxl is available through [Swift Package Manager](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg).
+
+```swift
+let package = Package(
+ dependencies: [
+ .package(url: "https://github.com/SDWebImage/libjxl-Xcode", from: "0.10.0")
+ ],
+ // ...
+)
+```
+
+## Usage
+
+Use libjxl as you would normally, this is just a repo that adds an Xcode proj.
+
+For Swift Package Manager user, it's recommended to use the modular import instead of C headers.
+
++ Objective-C
+
+```objective-c
+@import libjxl;
+// or if you don't use module
+#import <jxl/decode.h>
+#import <jxl/encode.h>
+```
+
++ Swift
+
+```swift
+import libjxl
+```
+
+## License
+
+libjxl is available under the BSD 3-Clause license. See [the LICENSE file](https://github.com/libjxl/libjxl/blob/main/LICENSE) for more info.
+
+

libjxl.podspec

@@ -0,0 +1,85 @@
+#
+# Be sure to run `pod lib lint TestLibrary.podspec' to ensure this is a
+# valid spec before submitting.
+#
+# Any lines starting with a # are optional, but their use is encouraged
+# To learn more about a Podspec see https://guides.cocoapods.org/syntax/podspec.html
+#
+
+Pod::Spec.new do |s|
+ s.name = 'libjxl'
+ s.version = '0.10.0'
+ s.summary = 'JPEG XL image format reference implementation'
+
+# This description is used to generate tags and improve search results.
+# * Think: What does it do? Why did you write it? What is the focus?
+# * Try to keep it short, snappy and to the point.
+# * Write the description between the DESC delimiters below.
+# * Finally, don't worry about the indent, CocoaPods strips it!
+
+ s.description = <<-DESC
+JPEG XL image format reference implementation
+ DESC
+
+ s.homepage = 'https://jpeg.org/jpegxl/'
+ s.license = { :type => 'BSD 3-Clause' }
+ s.author = 'Google Inc.', 'Cloudinary Ltd.'
+ s.source = { :git => 'https://github.com/SDWebImage/libjxl-Xcode.git', :tag => s.version.to_s, :submodules => true }
+
+ s.ios.deployment_target = '9.0'
+ s.osx.deployment_target = '10.11'
+ s.tvos.deployment_target = '9.0'
+ s.watchos.deployment_target = '2.0'
+ s.visionos.deployment_target = '1.0'
+
+ s.subspec 'brotli' do |ss|
+ ss.source_files = 'libjxl/third_party/brotli/c/**/*.{c,cc}'
+ ss.exclude_files = 'libjxl/third_party/brotli/c/fuzz', 'libjxl/third_party/brotli/c/tools'
+ ss.pod_target_xcconfig = {
+ 'HEADER_SEARCH_PATHS' => '${PODS_ROOT}/libjxl/libjxl/third_party/brotli/c/include ${PODS_ROOT}/libjxl/libjxl/third_party/brotli/c'
+ }
+ end
+
+ s.subspec 'lcms' do |ss|
+ ss.source_files = 'libjxl/third_party/lcms/src/**/*.{c,cc}'
+ ss.pod_target_xcconfig = {
+ 'HEADER_SEARCH_PATHS' => '${PODS_ROOT}/libjxl/libjxl/third_party/lcms/include ${PODS_ROOT}/libjxl/libjxl/third_party/lcms/src'
+ }
+ end
+
+ s.subspec 'hwy' do |ss|
+ ss.source_files = 'libjxl/third_party/highway/hwy/**/*.{c,cc}'
+ ss.exclude_files = 'libjxl/third_party/highway/hwy/tests', 'libjxl/third_party/highway/hwy/examples', 'libjxl/third_party/highway/hwy/contrib', 'libjxl/third_party/highway/hwy/*_test.{c,cc}'
+ ss.pod_target_xcconfig = {
+ 'HEADER_SEARCH_PATHS' => '${PODS_ROOT}/libjxl/libjxl/third_party/highway'
+ }
+ end
+
+ s.subspec 'jxl' do |ss|
+ ss.dependency 'libjxl/brotli'
+ ss.dependency 'libjxl/lcms'
+ ss.dependency 'libjxl/hwy'
+ ss.source_files = 'libjxl/lib/jxl/**/*.{c,cc}', 'generate/**/*.{c,cc}', 'libjxl/lib/include/**/*.h'
+ ss.exclude_files = [
+ 'libjxl/lib/jxl/**/*_test.{c,cc}', # gtest
+ 'libjxl/lib/jxl/dec_transforms_testonly.{c,cc}', # test
+ 'libjxl/lib/jxl/test_utils.{c,cc}', # test
+ 'libjxl/lib/jxl/**/*_gbench.{c,cc}' # gbench
+ ]
+ ss.header_mappings_dir = 'libjxl/lib/include'
+ ss.public_header_files = 'libjxl/lib/include/**/*.h'
+ ss.compiler_flags = '-DCMS_NO_REGISTER_KEYWORD', '-fnew-alignment=8', '-fno-cxx-exceptions', '-fno-slp-vectorize', '-fno-vectorize'
+ ss.pod_target_xcconfig = {
+ 'HEADER_SEARCH_PATHS' => '${PODS_ROOT}/libjxl/libjxl/lib/include ${PODS_ROOT}/libjxl/generate ${PODS_ROOT}/libjxl/libjxl'
+ }
+ end
+
+ # Copy generate headers into include folder
+ s.prepare_command = <<-CMD
+ cp -R './generate/jxl' './libjxl/lib/include/'
+ CMD
+
+ s.default_subspecs = 'jxl'
+ s.libraries = 'c++'
+ s.preserve_paths = 'libjxl', 'generate'
+end

libjxl.xcodeproj/project.pbxproj

@@ -373,7 +373,6 @@
 323E4E272B88A39D001C4C15 /* jxl_cms_export.h in Headers */ = {isa = PBXBuildFile; fileRef = 323E4E232B88A39D001C4C15 /* jxl_cms_export.h */; };
 323E4E282B88A39D001C4C15 /* jxl_threads_export.h in Headers */ = {isa = PBXBuildFile; fileRef = 323E4E242B88A39D001C4C15 /* jxl_threads_export.h */; };
 323E4E292B88A39D001C4C15 /* jxl_export.h in Headers */ = {isa = PBXBuildFile; fileRef = 323E4E252B88A39D001C4C15 /* jxl_export.h */; };
-32CE8CFF2B8C692500B4E1F4 /* brotli.c in Sources */ = {isa = PBXBuildFile; fileRef = 32CE8C532B8C692500B4E1F4 /* brotli.c */; };
 32CE8D002B8C692500B4E1F4 /* dictionary_hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 32CE8C622B8C692500B4E1F4 /* dictionary_hash.c */; };
 32CE8D012B8C692500B4E1F4 /* backward_references_hq.c in Sources */ = {isa = PBXBuildFile; fileRef = 32CE8C632B8C692500B4E1F4 /* backward_references_hq.c */; };
 32CE8D022B8C692500B4E1F4 /* histogram.c in Sources */ = {isa = PBXBuildFile; fileRef = 32CE8C662B8C692500B4E1F4 /* histogram.c */; };
@@ -865,8 +864,6 @@
 323E4E252B88A39D001C4C15 /* jxl_export.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jxl_export.h; sourceTree = "<group>"; };
 32C268362B88987300CA29AE /* libjxl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libjxl.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 32CE8B242B8C691700B4E1F4 /* libbrotli.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libbrotli.a; sourceTree = BUILT_PRODUCTS_DIR; };
-32CE8C522B8C692500B4E1F4 /* brotli.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = brotli.md; sourceTree = "<group>"; };
-32CE8C532B8C692500B4E1F4 /* brotli.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = brotli.c; sourceTree = "<group>"; };
 32CE8C562B8C692500B4E1F4 /* shared_dictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shared_dictionary.h; sourceTree = "<group>"; };
 32CE8C572B8C692500B4E1F4 /* port.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = port.h; sourceTree = "<group>"; };
 32CE8C582B8C692500B4E1F4 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
@@ -1609,7 +1606,6 @@
 32CE8C502B8C692500B4E1F4 /* c */ = {
 isa = PBXGroup;
 children = (
-32CE8C512B8C692500B4E1F4 /* tools */,
 32CE8C542B8C692500B4E1F4 /* include */,
 32CE8C5B2B8C692500B4E1F4 /* enc */,
 32CE8C9D2B8C692500B4E1F4 /* common */,
@@ -1618,15 +1614,6 @@
 path = c;
 sourceTree = "<group>";
 };
-32CE8C512B8C692500B4E1F4 /* tools */ = {
-isa = PBXGroup;
-children = (
-32CE8C522B8C692500B4E1F4 /* brotli.md */,
-32CE8C532B8C692500B4E1F4 /* brotli.c */,
-);
-path = tools;
-sourceTree = "<group>";
-};
 32CE8C542B8C692500B4E1F4 /* include */ = {
 isa = PBXGroup;
 children = (
@@ -2404,7 +2391,6 @@
 32CE8D0D2B8C692500B4E1F4 /* utf8_util.c in Sources */,
 32CE8D192B8C692500B4E1F4 /* shared_dictionary.c in Sources */,
 32CE8D022B8C692500B4E1F4 /* histogram.c in Sources */,
-32CE8CFF2B8C692500B4E1F4 /* brotli.c in Sources */,
 32CE8D002B8C692500B4E1F4 /* dictionary_hash.c in Sources */,
 32CE8D102B8C692500B4E1F4 /* brotli_bit_stream.c in Sources */,
 32CE8D0F2B8C692500B4E1F4 /* fast_log.c in Sources */,
@@ -2500,7 +2486,7 @@
 ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 CLANG_ANALYZER_NONNULL = YES;
 CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 CLANG_ENABLE_MODULES = YES;
 CLANG_ENABLE_OBJC_ARC = YES;
 CLANG_ENABLE_OBJC_WEAK = YES;
@@ -2532,7 +2518,7 @@
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 ENABLE_TESTABILITY = YES;
 ENABLE_USER_SCRIPT_SANDBOXING = YES;
-GCC_C_LANGUAGE_STANDARD = gnu17;
+GCC_C_LANGUAGE_STANDARD = gnu11;
 GCC_DYNAMIC_NO_PIC = NO;
 GCC_NO_COMMON_BLOCKS = YES;
 GCC_OPTIMIZATION_LEVEL = 0;
@@ -2564,7 +2550,7 @@
 ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 CLANG_ANALYZER_NONNULL = YES;
 CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 CLANG_ENABLE_MODULES = YES;
 CLANG_ENABLE_OBJC_ARC = YES;
 CLANG_ENABLE_OBJC_WEAK = YES;
@@ -2596,7 +2582,7 @@
 ENABLE_NS_ASSERTIONS = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 ENABLE_USER_SCRIPT_SANDBOXING = YES;
-GCC_C_LANGUAGE_STANDARD = gnu17;
+GCC_C_LANGUAGE_STANDARD = gnu11;
 GCC_NO_COMMON_BLOCKS = YES;
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -2616,15 +2602,13 @@
 32C2683E2B88987300CA29AE /* Debug */ = {
 isa = XCBuildConfiguration;
 buildSettings = {
-CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 1;
 DEFINES_MODULE = YES;
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = 1;
 DYLIB_INSTALL_NAME_BASE = "@rpath";
 ENABLE_MODULE_VERIFIER = YES;
-GCC_C_LANGUAGE_STANDARD = gnu11;
 GCC_PREPROCESSOR_DEFINITIONS = (
 "DEBUG=1",
 "$(inherited)",
@@ -2680,15 +2664,13 @@
 32C2683F2B88987300CA29AE /* Release */ = {
 isa = XCBuildConfiguration;
 buildSettings = {
-CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 1;
 DEFINES_MODULE = YES;
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = 1;
 DYLIB_INSTALL_NAME_BASE = "@rpath";
 ENABLE_MODULE_VERIFIER = YES;
-GCC_C_LANGUAGE_STANDARD = gnu11;
 GCC_PREPROCESSOR_DEFINITIONS = "CMS_NO_REGISTER_KEYWORD=1";
 GENERATE_INFOPLIST_FILE = YES;
 HEADER_SEARCH_PATHS = (
@@ -2740,9 +2722,7 @@
 32CE8B2B2B8C691700B4E1F4 /* Debug */ = {
 isa = XCBuildConfiguration;
 buildSettings = {
-CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 CODE_SIGN_STYLE = Automatic;
-GCC_C_LANGUAGE_STANDARD = gnu11;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/libjxl/third_party/brotli/c/include";
 IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -2760,9 +2740,7 @@
 32CE8B2C2B8C691700B4E1F4 /* Release */ = {
 isa = XCBuildConfiguration;
 buildSettings = {
-CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 CODE_SIGN_STYLE = Automatic;
-GCC_C_LANGUAGE_STANDARD = gnu11;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/libjxl/third_party/brotli/c/include";
 IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -2781,9 +2759,7 @@
 32CE8D2E2B8C6A0C00B4E1F4 /* Debug */ = {
 isa = XCBuildConfiguration;
 buildSettings = {
-CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 CODE_SIGN_STYLE = Automatic;
-GCC_C_LANGUAGE_STANDARD = gnu11;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/libjxl/third_party/highway/";
 IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -2801,9 +2777,7 @@
 32CE8D2F2B8C6A0C00B4E1F4 /* Release */ = {
 isa = XCBuildConfiguration;
 buildSettings = {
-CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 CODE_SIGN_STYLE = Automatic;
-GCC_C_LANGUAGE_STANDARD = gnu11;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/libjxl/third_party/highway/";
 IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -2822,9 +2796,7 @@
 32CE8E922B8C6B2E00B4E1F4 /* Debug */ = {
 isa = XCBuildConfiguration;
 buildSettings = {
-CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 CODE_SIGN_STYLE = Automatic;
-GCC_C_LANGUAGE_STANDARD = gnu11;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/libjxl/third_party/lcms/include";
 IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -2842,9 +2814,7 @@
 32CE8E932B8C6B2E00B4E1F4 /* Release */ = {
 isa = XCBuildConfiguration;
 buildSettings = {
-CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 CODE_SIGN_STYLE = Automatic;
-GCC_C_LANGUAGE_STANDARD = gnu11;
 HEADER_SEARCH_PATHS = "$(SRCROOT)/libjxl/third_party/lcms/include";
 IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 MACOSX_DEPLOYMENT_TARGET = 10.11;