Temp x265 for SPM/Carthage

Author: dreampiggy

Cartfile

@@ -1 +1,2 @@
-github "SDWebImage/libde265-Xcode" >= 1.0.9-beta
+github "SDWebImage/libde265-Xcode" >= 1.0.9
+github "SDWebImage/libx265-Xcode" >= 3.4

Cartfile.resolved

@@ -1 +1,2 @@
-github "SDWebImage/libde265-Xcode" "1.0.9-beta"
+github "SDWebImage/libde265-Xcode" "1.0.15"
+github "SDWebImage/libx265-Xcode" "3.4.0"

Package.resolved

@@ -6,8 +6,17 @@
         "repositoryURL": "https://github.com/SDWebImage/libde265-Xcode.git",
         "state": {
           "branch": null,
-          "revision": "32508f7b91f74fddbac411b0c750392ae08c8f35",
-          "version": "1.0.9-beta"
+          "revision": "3410ee6f5f496681c545229e716f305862b4b5ac",
+          "version": "1.0.15"
+        }
+      },
+      {
+        "package": "libx265",
+        "repositoryURL": "https://github.com/SDWebImage/libx265-Xcode.git",
+        "state": {
+          "branch": null,
+          "revision": "c8df330791e353c7ed5034bc4784eb0ee8c3d6ee",
+          "version": "3.4.0"
         }
       }
     ]

Package.swift

@@ -16,14 +16,15 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/SDWebImage/libde265-Xcode.git", from: "1.0.9-beta")
+        .package(url: "https://github.com/SDWebImage/libde265-Xcode.git", from: "1.0.9"),
+        .package(url: "https://github.com/SDWebImage/libx265-Xcode.git", from: "3.4.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "libheif",
-            dependencies: ["libde265"],
+            dependencies: ["libde265", "libx265"],
             path: ".",
             exclude: ["libheif/libheif/plugins_unix.h",
                       "libheif/libheif/plugins_unix.cc",
@@ -33,17 +34,31 @@ let package = Package(
                       "libheif/libheif/plugins/encoder_aom.cc",
                       "libheif/libheif/plugins/decoder_aom.h",
                       "libheif/libheif/plugins/decoder_aom.cc",
-                      "libheif/libheif/plugins/encoder_x265.h",
-                      "libheif/libheif/plugins/encoder_x265.cc",
                       "libheif/libheif/plugins/decoder_dav1d.h",
                       "libheif/libheif/plugins/decoder_dav1d.cc",
                       "libheif/libheif/plugins/encoder_rav1e.h",
                       "libheif/libheif/plugins/encoder_rav1e.cc",
                       "libheif/libheif/plugins/encoder_svt.h",
+                      "libheif/libheif/plugins/encoder_svt.cc",
+                      "libheif/libheif/plugins/encoder_openjpeg.h",
+                      "libheif/libheif/plugins/encoder_openjpeg.cc",
+                      "libheif/libheif/plugins/decoder_openjpeg.h",
+                      "libheif/libheif/plugins/decoder_openjpeg.cc",
+                      "libheif/libheif/plugins/encoder_jpeg.h",
+                      "libheif/libheif/plugins/encoder_jpeg.cc",
+                      "libheif/libheif/plugins/decoder_jpeg.h",
+                      "libheif/libheif/plugins/decoder_jpeg.cc",
+                      "libheif/libheif/plugins/encoder_ffmpeg.h",
+                      "libheif/libheif/plugins/encoder_ffmpeg.cc",
+                      "libheif/libheif/plugins/decoder_ffmpeg.h",
+                      "libheif/libheif/plugins/decoder_ffmpeg.cc",
+                      "libheif/libheif/plugins/encoder_kvazaar.h",
+                      "libheif/libheif/plugins/encoder_kvazaar.cc",
+                      "libheif/libheif/plugins/encoder_svt.h",
                       "libheif/libheif/plugins/encoder_svt.cc"],
             sources: ["libheif/libheif"],
             publicHeadersPath: "include",
-            cSettings: [.headerSearchPath("libheif"), .define("HAVE_UNISTD_H"), .define("HAVE_LIBDE265")]
+            cSettings: [.headerSearchPath("libheif"), .define("HAVE_UNISTD_H"), .define("HAVE_LIBDE265"), .define("HAVE_X265")]
         )
     ],
     cLanguageStandard: .gnu11,

README.md

@@ -14,8 +14,8 @@ This repo also including the CocoaPods's spec file to use libheif.
 
 ## Requirements
 
-+ iOS 8+
-+ macOS 10.10+
++ iOS 9+
++ macOS 10.11+
 + tvOS 9+
 + watchOS 2+
 

Xcode/libheif.h

@@ -16,5 +16,5 @@ FOUNDATION_EXPORT const unsigned char libheifVersionString[];
 // In this header, you should import all the public headers of your framework using statements like #import <libheif/PublicHeader.h>
 
 
-#import <libheif/heif.h>
-#import <libheif/heif_version.h>
+#import "heif.h"
+#import "heif_version.h"

include/libheif/heif_version.h

@@ -28,9 +28,9 @@
 #define LIBHEIF_HEIF_VERSION_H
 
 /* Numeric representation of the version */
-#define LIBHEIF_NUMERIC_VERSION 0x01162000
+#define LIBHEIF_NUMERIC_VERSION 0x01170000
 
 /* Version string */
-#define LIBHEIF_VERSION "1.16.2"
+#define LIBHEIF_VERSION "1.17.0"
 
 #endif  // LIBHEIF_HEIF_VERSION_H

libheif.podspec

@@ -44,7 +44,7 @@ HEIF is a new image file format employing HEVC (h.265) image coding for the best
 
   # libde265 decoder
   s.subspec 'libde265' do |ss|
-    ss.dependency 'libde265', '>= 1.0.9-beta'
+    ss.dependency 'libde265', '>= 1.0.9'
     ss.dependency 'libheif/libheif'
     ss.source_files = 'libheif/plugins/decoder_libde265.{h,c,cc}'
     ss.private_header_files = 'libheif/plugins/decoder_libde265.h'