Skip to content

Commit

Permalink
Revert sharpyuv as standalone subspec because it depends webp as well
Browse files Browse the repository at this point in the history
  • Loading branch information
dreampiggy committed Aug 2, 2022
1 parent 1a4ea0e commit 0f3bdb2
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions libwebp.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 <inttypes.h> cause 'Include of non-modular header inside framework module error'
s.prepare_command = <<-CMD
sed -i.bak 's/<inttypes.h>/<stdint.h>/g' './src/webp/types.h'
Expand Down

0 comments on commit 0f3bdb2

Please sign in to comment.