From 495e1861869b2168fdccfd2ff0282e56d852c7cb Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 9 Mar 2016 10:22:25 +0100 Subject: libwebp: update patches to 0.5.0 for Qt usage Change-Id: I7999f23f919ddf435fbb247371c008879adc6f42 Reviewed-by: aavit --- src/3rdparty/libwebp.pri | 41 +++++++++++++++++++++++++++++++--- src/3rdparty/libwebp/src/webp/config.h | 6 ++--- 2 files changed, 41 insertions(+), 6 deletions(-) (limited to 'src/3rdparty') diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri index 2197953..75ada7d 100644 --- a/src/3rdparty/libwebp.pri +++ b/src/3rdparty/libwebp.pri @@ -5,6 +5,7 @@ INCLUDEPATH += \ $$PWD/libwebp/src \ $$PWD/libwebp/src/dec \ $$PWD/libwebp/src/enc \ + $$PWD/libwebp/src/extra \ $$PWD/libwebp/src/dsp \ $$PWD/libwebp/src/mux \ $$PWD/libwebp/src/utils \ @@ -22,22 +23,50 @@ SOURCES += \ $$PWD/libwebp/src/dec/vp8l.c \ $$PWD/libwebp/src/dec/webp.c \ $$PWD/libwebp/src/demux/demux.c \ + $$PWD/libwebp/src/demux/anim_decode.c \ + $$PWD/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/alpha_processing_sse41.c \ + $$PWD/libwebp/src/dsp/argb.c \ + $$PWD/libwebp/src/dsp/argb_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/argb_sse2.c \ + $$PWD/libwebp/src/dsp/cost.c \ + $$PWD/libwebp/src/dsp/cost_mips32.c \ + $$PWD/libwebp/src/dsp/cost_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/cost_sse2.c \ $$PWD/libwebp/src/dsp/cpu.c \ $$PWD/libwebp/src/dsp/dec.c \ + $$PWD/libwebp/src/dsp/dec_mips_dsp_r2.c \ $$PWD/libwebp/src/dsp/dec_sse2.c \ + $$PWD/libwebp/src/dsp/dec_sse41.c \ $$PWD/libwebp/src/dsp/enc.c \ + $$PWD/libwebp/src/dsp/enc_mips_dsp_r2.c \ $$PWD/libwebp/src/dsp/enc_sse2.c \ + $$PWD/libwebp/src/dsp/enc_sse41.c \ + $$PWD/libwebp/src/dsp/filters.c \ + $$PWD/libwebp/src/dsp/filters_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/filters_sse2.c \ $$PWD/libwebp/src/dsp/lossless.c \ + $$PWD/libwebp/src/dsp/lossless_enc.c \ + $$PWD/libwebp/src/dsp/lossless_enc_mips32.c \ + $$PWD/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/lossless_enc_sse2.c \ + $$PWD/libwebp/src/dsp/lossless_enc_sse41.c \ + $$PWD/libwebp/src/dsp/lossless_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/rescaler.c \ + $$PWD/libwebp/src/dsp/rescaler_mips32.c \ + $$PWD/libwebp/src/dsp/rescaler_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/rescaler_sse2.c \ $$PWD/libwebp/src/dsp/upsampling.c \ + $$PWD/libwebp/src/dsp/upsampling_mips_dsp_r2.c \ $$PWD/libwebp/src/dsp/upsampling_sse2.c \ $$PWD/libwebp/src/dsp/yuv.c \ + $$PWD/libwebp/src/dsp/yuv_mips_dsp_r2.c \ $$PWD/libwebp/src/dsp/alpha_processing.c \ $$PWD/libwebp/src/dsp/alpha_processing_sse2.c \ $$PWD/libwebp/src/dsp/dec_clip_tables.c \ $$PWD/libwebp/src/dsp/dec_mips32.c \ $$PWD/libwebp/src/dsp/enc_avx2.c \ $$PWD/libwebp/src/dsp/enc_mips32.c \ - $$PWD/libwebp/src/dsp/lossless_mips32.c \ $$PWD/libwebp/src/dsp/lossless_sse2.c \ $$PWD/libwebp/src/dsp/yuv_mips32.c \ $$PWD/libwebp/src/dsp/yuv_sse2.c \ @@ -46,10 +75,12 @@ SOURCES += \ $$PWD/libwebp/src/enc/backward_references.c \ $$PWD/libwebp/src/enc/config.c \ $$PWD/libwebp/src/enc/cost.c \ + $$PWD/libwebp/src/enc/delta_palettization.c \ $$PWD/libwebp/src/enc/filter.c \ $$PWD/libwebp/src/enc/frame.c \ $$PWD/libwebp/src/enc/histogram.c \ $$PWD/libwebp/src/enc/iterator.c \ + $$PWD/libwebp/src/enc/near_lossless.c \ $$PWD/libwebp/src/enc/picture.c \ $$PWD/libwebp/src/enc/quant.c \ $$PWD/libwebp/src/enc/syntax.c \ @@ -61,6 +92,8 @@ SOURCES += \ $$PWD/libwebp/src/enc/picture_psnr.c \ $$PWD/libwebp/src/enc/picture_rescale.c \ $$PWD/libwebp/src/enc/picture_tools.c \ + $$PWD/libwebp/src/extras/extras.c \ + $$PWD/libwebp/src/mux/anim_encode.c \ $$PWD/libwebp/src/mux/muxedit.c \ $$PWD/libwebp/src/mux/muxinternal.c \ $$PWD/libwebp/src/mux/muxread.c \ @@ -86,8 +119,10 @@ equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) { SOURCES_FOR_NEON += \ $$PWD/libwebp/src/dsp/dec_neon.c \ $$PWD/libwebp/src/dsp/enc_neon.c \ - $$PWD/libwebp/src/dsp/upsampling_neon.c \ - $$PWD/libwebp/src/dsp/lossless_neon.c + $$PWD/libwebp/src/dsp/lossless_enc_neon.c \ + $$PWD/libwebp/src/dsp/lossless_neon.c \ + $$PWD/libwebp/src/dsp/rescaler_neon.c \ + $$PWD/libwebp/src/dsp/upsampling_neon.c contains(QT_CPU_FEATURES.$$QT_ARCH, neon) { # Default compiler settings include this feature, so just add to SOURCES diff --git a/src/3rdparty/libwebp/src/webp/config.h b/src/3rdparty/libwebp/src/webp/config.h index 7762a46..4ea0737 100644 --- a/src/3rdparty/libwebp/src/webp/config.h +++ b/src/3rdparty/libwebp/src/webp/config.h @@ -79,7 +79,7 @@ #define PACKAGE_NAME "libwebp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libwebp 0.4.4" +#define PACKAGE_STRING "libwebp 0.5.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libwebp" @@ -88,7 +88,7 @@ #define PACKAGE_URL "http://developers.google.com/speed/webp" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.4.4" +#define PACKAGE_VERSION "0.5.0" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -98,7 +98,7 @@ /* #undef STDC_HEADERS */ /* Version number of package */ -#define VERSION "0.4.4" +#define VERSION "0.5.0" /* Enable experimental code */ /* #undef WEBP_EXPERIMENTAL_FEATURES */ -- cgit v1.2.3