Merge pull request #6 from SDWebImage/project_libbpg_cocoapods

Using CocoaPods dependency for libbpg

Example/Podfile.lock

@@ -1,5 +1,6 @@
 PODS:
   - Expecta (1.0.6)
+  - libbpg (0.9.8)
   - libx265 (3.0):
     - libx265/common (= 3.0)
     - libx265/core (= 3.0)
@@ -23,11 +24,12 @@ PODS:
     - libx265/input
     - libx265/output
   - SDWebImage/Core (5.0.0-beta5)
-  - SDWebImageBPGCoder/bpgenc (0.4.0):
+  - SDWebImageBPGCoder/bpgenc (0.5.0):
     - libx265
     - SDWebImage/Core (>= 5.0.0-beta4)
     - SDWebImageBPGCoder/libbpg
-  - SDWebImageBPGCoder/libbpg (0.4.0):
+  - SDWebImageBPGCoder/libbpg (0.5.0):
+    - libbpg
     - SDWebImage/Core (>= 5.0.0-beta4)
   - Specta (1.0.7)
 
@@ -40,6 +42,7 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - Expecta
+    - libbpg
     - libx265
     - SDWebImage
     - Specta
@@ -50,11 +53,12 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
+  libbpg: 0d5101762d34398ef336a0c79f4ad3f84b1417c1
   libx265: 23ab716aae3eff1e6b68b3db6ace8883867691c4
   SDWebImage: fd609df53c0f55fdcd4705bd14c01c9d5c348d0c
-  SDWebImageBPGCoder: 3c1d498041a124ed49453da4108957342ff04a03
+  SDWebImageBPGCoder: 7656350098535556e450a1ee05dbdf24ccee1a13
   Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
 
 PODFILE CHECKSUM: 0f81121cdc589dfdeb358147154e6bd7e7bcbd4f
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.1

Example/SDWebImageBPGCoder.xcodeproj/project.pbxproj

@@ -304,7 +304,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-SDWebImageBPGCoder_Tests/Pods-SDWebImageBPGCoder_Tests-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-SDWebImageBPGCoder_Tests/Pods-SDWebImageBPGCoder_Tests-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Expecta/Expecta.framework",
 				"${BUILT_PRODUCTS_DIR}/Specta/Specta.framework",
 			);
@@ -315,7 +315,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SDWebImageBPGCoder_Tests/Pods-SDWebImageBPGCoder_Tests-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SDWebImageBPGCoder_Tests/Pods-SDWebImageBPGCoder_Tests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		A405C467D52955920532A2E2 /* [CP] Embed Pods Frameworks */ = {
@@ -324,20 +324,22 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-SDWebImageBPGCoder_Example/Pods-SDWebImageBPGCoder_Example-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-SDWebImageBPGCoder_Example/Pods-SDWebImageBPGCoder_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImageBPGCoder/SDWebImageBPGCoder.framework",
+				"${BUILT_PRODUCTS_DIR}/libbpg/libbpg.framework",
 				"${BUILT_PRODUCTS_DIR}/libx265/libx265.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageBPGCoder.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libbpg.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libx265.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SDWebImageBPGCoder_Example/Pods-SDWebImageBPGCoder_Example-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SDWebImageBPGCoder_Example/Pods-SDWebImageBPGCoder_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		A682DAA5F0DD701CB2D76B90 /* [CP] Check Pods Manifest.lock */ = {

SDWebImageBPGCoder.podspec

@@ -35,12 +35,9 @@ TODO: Add long description of the pod here.
   s.module_map = 'SDWebImageBPGCoder/Module/SDWebImageBPGCoder.modulemap'
 
   s.subspec 'libbpg' do |ss|
-    ss.source_files = 'SDWebImageBPGCoder/Classes/SDImageBPGCoder.{h,m}', 'SDWebImageBPGCoder/Module/SDWebImageBPGCoder.h', 'Vendor/libbpg/include/libbpg.h'
-    ss.public_header_files = 'SDWebImageBPGCoder/Classes/SDImageBPGCoder.h', 'SDWebImageBPGCoder/Module/SDWebImageBPGCoder.h', 'Vendor/libbpg/include/libbpg.h'
-    ss.osx.vendored_libraries = 'Vendor/libbpg/lib/mac/libbpg.a'
-    ss.ios.vendored_libraries = 'Vendor/libbpg/lib/ios/libbpg.a'
-    ss.tvos.vendored_libraries = 'Vendor/libbpg/lib/tvos/libbpg.a'
-    ss.watchos.vendored_libraries = 'Vendor/libbpg/lib/watchos/libbpg.a'
+    ss.dependency 'libbpg'
+    ss.source_files = 'SDWebImageBPGCoder/Classes/SDImageBPGCoder.{h,m}', 'SDWebImageBPGCoder/Module/SDWebImageBPGCoder.h'
+    ss.public_header_files = 'SDWebImageBPGCoder/Classes/SDImageBPGCoder.h', 'SDWebImageBPGCoder/Module/SDWebImageBPGCoder.h'
   end
 
   s.subspec 'bpgenc' do |ss|

SDWebImageBPGCoder/Classes/bpgenc/bpgenc.h

@@ -25,7 +25,11 @@
 #ifndef _BPGENC_H
 #define _BPGENC_H
 
-#include "libbpg.h"
+#if __has_include(<libbpg/libbpg.h>)
+#import <libbpg/libbpg.h>
+#else
+#import "libbpg.h"
+#endif
 
 typedef struct {
     int w, h;

SDWebImageBPGCoder/Module/SDWebImageBPGCoder.h

@@ -10,7 +10,6 @@
 #endif
 
 #import <SDWebImageBPGCoder/SDImageBPGCoder.h>
-#import <SDWebImageBPGCoder/libbpg.h>
 #if defined(USE_X265)
 #import <SDWebImageBPGCoder/bpgenc.h>
 #endif