From 0f3bdb28a1edc5e8e43876d3835d20c601ef331f Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Wed, 3 Aug 2022 01:40:18 +0800 Subject: [PATCH] Revert sharpyuv as standalone subspec because it depends webp as well --- libwebp.podspec | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libwebp.podspec b/libwebp.podspec index 035c734..49ed3b1 100644 --- a/libwebp.podspec +++ b/libwebp.podspec @@ -19,12 +19,11 @@ Pod::Spec.new do |s| 'USER_HEADER_SEARCH_PATHS' => '$(inherited) ${PODS_ROOT}/libwebp/ ${PODS_TARGET_SRCROOT}/' } s.preserve_paths = 'src', 'sharpyuv' - s.default_subspecs = 'webp', 'demux', 'mux', 'sharpyuv' + s.default_subspecs = 'webp', 'demux', 'mux' # webp decoding && encoding s.subspec 'webp' do |ss| - ss.dependency 'libwebp/sharpyuv' - ss.source_files = 'src/webp/decode.h', 'src/webp/encode.h', 'src/webp/types.h', 'src/webp/mux_types.h', 'src/webp/format_constants.h', 'src/utils/*.{h,c}', 'src/dsp/*.{h,c}', 'src/dec/*.{h,c}', 'src/enc/*.{h,c}' + ss.source_files = 'src/webp/decode.h', 'src/webp/encode.h', 'src/webp/types.h', 'src/webp/mux_types.h', 'src/webp/format_constants.h', 'src/utils/*.{h,c}', 'src/dsp/*.{h,c}', 'src/dec/*.{h,c}', 'src/enc/*.{h,c}', 'sharpyuv/*.{h,c}' ss.public_header_files = 'src/webp/decode.h', 'src/webp/encode.h', 'src/webp/types.h', 'src/webp/mux_types.h', 'src/webp/format_constants.h' end @@ -42,12 +41,6 @@ Pod::Spec.new do |s| ss.public_header_files = 'src/webp/mux.h' end - # sharpyuv converter - s.subspec 'sharpyuv' do |ss| - ss.source_files = 'sharpyuv/*.{h,c}' - ss.public_header_files = 'sharpyuv/*.h' - end - # fix #include cause 'Include of non-modular header inside framework module error' s.prepare_command = <<-CMD sed -i.bak 's///g' './src/webp/types.h'