From 9e7bed405e4fc27c5d9e240ff8c5659b4cbf7210 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Apr 26 2018 13:25:07 +0000 Subject: Update to 1.0.0 --- diff --git a/.gitignore b/.gitignore index a639b17..898c2d8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /libwebp-0.5.2.tar.gz /libwebp-0.6.0.tar.gz /libwebp-0.6.1.tar.gz +/libwebp-1.0.0.tar.gz diff --git a/libwebp.spec b/libwebp.spec index a816be8..ce62efa 100644 --- a/libwebp.spec +++ b/libwebp.spec @@ -1,16 +1,14 @@ %global _hardened_build 1 Name: libwebp -Version: 0.6.1 -Release: 8%{?dist} +Version: 1.0.0 +Release: 1%{?dist} URL: http://webmproject.org/ Summary: Library and tools for the WebP graphics format # Additional IPR is licensed as well. See PATENTS file for details License: BSD Source0: http://downloads.webmproject.org/releases/webp/%{name}-%{version}.tar.gz Source1: libwebp_jni_example.java -# Backport upstream big-endian fixes -Patch0: libwebp_big-endian.patch BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -142,6 +140,9 @@ cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/ %changelog +* Thu Apr 26 2018 Sandro Mani - 1.0.0-1 +- Update to 1.0.0 + * Tue Feb 27 2018 Sandro Mani - 0.6.1-8 - Fix LDFLAGS not passed when building libwebp_jni.so (#1548718) diff --git a/libwebp_big-endian.patch b/libwebp_big-endian.patch deleted file mode 100644 index ac73a53..0000000 --- a/libwebp_big-endian.patch +++ /dev/null @@ -1,287 +0,0 @@ -Description: big endian fixes - Webp 0.6.1 was totally busted on big endian machines. Backporting - the fixes, which will be part of 0.6.2. Close coordination with - upstream for this. - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: upstream -Forwarded: yes -Reviewed-By: James Zern, Jeff Breidenbach -Last-Update: 2018-02-23 - ---- libwebp-0.6.1.orig/imageio/webpdec.c -+++ libwebp-0.6.1/imageio/webpdec.c -@@ -9,6 +9,10 @@ - // - // WebP decode. - -+#ifdef HAVE_CONFIG_H -+#include "webp/config.h" -+#endif -+ - #include "./webpdec.h" - - #include -@@ -162,7 +166,11 @@ int ReadWebP(const uint8_t* const data, - break; - } - if (pic->use_argb) { -+#ifdef WORDS_BIGENDIAN -+ output_buffer->colorspace = MODE_ARGB; -+#else - output_buffer->colorspace = MODE_BGRA; -+#endif - output_buffer->u.RGBA.rgba = (uint8_t*)pic->argb; - output_buffer->u.RGBA.stride = pic->argb_stride * sizeof(uint32_t); - output_buffer->u.RGBA.size = output_buffer->u.RGBA.stride * pic->height; ---- libwebp-0.6.1.orig/src/dsp/alpha_processing.c -+++ libwebp-0.6.1/src/dsp/alpha_processing.c -@@ -366,6 +366,16 @@ static WEBP_INLINE uint32_t MakeARGB32(i - return (((uint32_t)a << 24) | (r << 16) | (g << 8) | b); - } - -+#ifdef WORDS_BIGENDIAN -+static void PackARGB_C(const uint8_t* a, const uint8_t* r, const uint8_t* g, -+ const uint8_t* b, int len, uint32_t* out) { -+ int i; -+ for (i = 0; i < len; ++i) { -+ out[i] = MakeARGB32(a[4 * i], r[4 * i], g[4 * i], b[4 * i]); -+ } -+} -+#endif -+ - static void PackRGB_C(const uint8_t* r, const uint8_t* g, const uint8_t* b, - int len, int step, uint32_t* out) { - int i, offset = 0; -@@ -381,6 +391,10 @@ int (*WebPDispatchAlpha)(const uint8_t*, - void (*WebPDispatchAlphaToGreen)(const uint8_t*, int, int, int, uint32_t*, int); - int (*WebPExtractAlpha)(const uint8_t*, int, int, int, uint8_t*, int); - void (*WebPExtractGreen)(const uint32_t* argb, uint8_t* alpha, int size); -+#ifdef WORDS_BIGENDIAN -+void (*WebPPackARGB)(const uint8_t* a, const uint8_t* r, const uint8_t* g, -+ const uint8_t* b, int, uint32_t*); -+#endif - void (*WebPPackRGB)(const uint8_t* r, const uint8_t* g, const uint8_t* b, - int len, int step, uint32_t* out); - -@@ -405,6 +419,9 @@ WEBP_TSAN_IGNORE_FUNCTION void WebPInitA - WebPMultRow = WebPMultRow_C; - WebPApplyAlphaMultiply4444 = ApplyAlphaMultiply_16b_C; - -+#ifdef WORDS_BIGENDIAN -+ WebPPackARGB = PackARGB_C; -+#endif - WebPPackRGB = PackRGB_C; - #if !WEBP_NEON_OMIT_C_CODE - WebPApplyAlphaMultiply = ApplyAlphaMultiply_C; -@@ -451,6 +468,9 @@ WEBP_TSAN_IGNORE_FUNCTION void WebPInitA - assert(WebPDispatchAlphaToGreen != NULL); - assert(WebPExtractAlpha != NULL); - assert(WebPExtractGreen != NULL); -+#ifdef WORDS_BIGENDIAN -+ assert(WebPPackARGB != NULL); -+#endif - assert(WebPPackRGB != NULL); - assert(WebPHasAlpha8b != NULL); - assert(WebPHasAlpha32b != NULL); ---- libwebp-0.6.1.orig/src/dsp/alpha_processing_mips_dsp_r2.c -+++ libwebp-0.6.1/src/dsp/alpha_processing_mips_dsp_r2.c -@@ -125,6 +125,49 @@ static void MultARGBRow_MIPSdspR2(uint32 - } - } - -+#ifdef WORDS_BIGENDIAN -+static void PackARGB_MIPSdspR2(const uint8_t* a, const uint8_t* r, -+ const uint8_t* g, const uint8_t* b, int len, -+ uint32_t* out) { -+ int temp0, temp1, temp2, temp3, offset; -+ const int rest = len & 1; -+ const uint32_t* const loop_end = out + len - rest; -+ const int step = 4; -+ __asm__ volatile ( -+ "xor %[offset], %[offset], %[offset] \n\t" -+ "beq %[loop_end], %[out], 0f \n\t" -+ "2: \n\t" -+ "lbux %[temp0], %[offset](%[a]) \n\t" -+ "lbux %[temp1], %[offset](%[r]) \n\t" -+ "lbux %[temp2], %[offset](%[g]) \n\t" -+ "lbux %[temp3], %[offset](%[b]) \n\t" -+ "ins %[temp1], %[temp0], 16, 16 \n\t" -+ "ins %[temp3], %[temp2], 16, 16 \n\t" -+ "addiu %[out], %[out], 4 \n\t" -+ "precr.qb.ph %[temp0], %[temp1], %[temp3] \n\t" -+ "sw %[temp0], -4(%[out]) \n\t" -+ "addu %[offset], %[offset], %[step] \n\t" -+ "bne %[loop_end], %[out], 2b \n\t" -+ "0: \n\t" -+ "beq %[rest], $zero, 1f \n\t" -+ "lbux %[temp0], %[offset](%[a]) \n\t" -+ "lbux %[temp1], %[offset](%[r]) \n\t" -+ "lbux %[temp2], %[offset](%[g]) \n\t" -+ "lbux %[temp3], %[offset](%[b]) \n\t" -+ "ins %[temp1], %[temp0], 16, 16 \n\t" -+ "ins %[temp3], %[temp2], 16, 16 \n\t" -+ "precr.qb.ph %[temp0], %[temp1], %[temp3] \n\t" -+ "sw %[temp0], 0(%[out]) \n\t" -+ "1: \n\t" -+ : [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), [temp2]"=&r"(temp2), -+ [temp3]"=&r"(temp3), [offset]"=&r"(offset), [out]"+&r"(out) -+ : [a]"r"(a), [r]"r"(r), [g]"r"(g), [b]"r"(b), [step]"r"(step), -+ [loop_end]"r"(loop_end), [rest]"r"(rest) -+ : "memory" -+ ); -+} -+#endif // WORDS_BIGENDIAN -+ - static void PackRGB_MIPSdspR2(const uint8_t* r, const uint8_t* g, - const uint8_t* b, int len, int step, - uint32_t* out) { -@@ -172,6 +215,9 @@ extern void WebPInitAlphaProcessingMIPSd - WEBP_TSAN_IGNORE_FUNCTION void WebPInitAlphaProcessingMIPSdspR2(void) { - WebPDispatchAlpha = DispatchAlpha_MIPSdspR2; - WebPMultARGBRow = MultARGBRow_MIPSdspR2; -+#ifdef WORDS_BIGENDIAN -+ WebPPackARGB = PackARGB_MIPSdspR2; -+#endif - WebPPackRGB = PackRGB_MIPSdspR2; - } - ---- libwebp-0.6.1.orig/src/dsp/dsp.h -+++ libwebp-0.6.1/src/dsp/dsp.h -@@ -166,6 +166,13 @@ extern "C" { - #define WEBP_SWAP_16BIT_CSP 0 - #endif - -+// some endian fix (e.g.: mips-gcc doesn't define __BIG_ENDIAN__) -+#if !defined(WORDS_BIGENDIAN) && \ -+ (defined(__BIG_ENDIAN__) || defined(_M_PPC) || \ -+ (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))) -+#define WORDS_BIGENDIAN -+#endif -+ - typedef enum { - kSSE2, - kSSE3, -@@ -578,6 +585,13 @@ void WebPMultRow_C(uint8_t* const ptr, c - int width, int inverse); - void WebPMultARGBRow_C(uint32_t* const ptr, int width, int inverse); - -+#ifdef WORDS_BIGENDIAN -+// ARGB packing function: a/r/g/b input is rgba or bgra order. -+extern void (*WebPPackARGB)(const uint8_t* a, const uint8_t* r, -+ const uint8_t* g, const uint8_t* b, int len, -+ uint32_t* out); -+#endif -+ - // RGB packing function. 'step' can be 3 or 4. r/g/b input is rgb or bgr order. - extern void (*WebPPackRGB)(const uint8_t* r, const uint8_t* g, const uint8_t* b, - int len, int step, uint32_t* out); ---- libwebp-0.6.1.orig/src/enc/picture_csp_enc.c -+++ libwebp-0.6.1/src/enc/picture_csp_enc.c -@@ -28,11 +28,11 @@ - // If defined, use table to compute x / alpha. - #define USE_INVERSE_ALPHA_TABLE - --static const union { -- uint32_t argb; -- uint8_t bytes[4]; --} test_endian = { 0xff000000u }; --#define ALPHA_IS_LAST (test_endian.bytes[3] == 0xff) -+#ifdef WORDS_BIGENDIAN -+#define ALPHA_OFFSET 0 // uint32_t 0xff000000 is 0xff,00,00,00 in memory -+#else -+#define ALPHA_OFFSET 3 // uint32_t 0xff000000 is 0x00,00,00,ff in memory -+#endif - - //------------------------------------------------------------------------------ - // Detection of non-trivial transparency -@@ -61,7 +61,7 @@ int WebPPictureHasTransparency(const Web - return CheckNonOpaque(picture->a, picture->width, picture->height, - 1, picture->a_stride); - } else { -- const int alpha_offset = ALPHA_IS_LAST ? 3 : 0; -+ const int alpha_offset = ALPHA_OFFSET; - return CheckNonOpaque((const uint8_t*)picture->argb + alpha_offset, - picture->width, picture->height, - 4, picture->argb_stride * sizeof(*picture->argb)); -@@ -990,10 +990,10 @@ static int PictureARGBToYUVA(WebPPicture - return WebPEncodingSetError(picture, VP8_ENC_ERROR_INVALID_CONFIGURATION); - } else { - const uint8_t* const argb = (const uint8_t*)picture->argb; -- const uint8_t* const r = ALPHA_IS_LAST ? argb + 2 : argb + 1; -- const uint8_t* const g = ALPHA_IS_LAST ? argb + 1 : argb + 2; -- const uint8_t* const b = ALPHA_IS_LAST ? argb + 0 : argb + 3; -- const uint8_t* const a = ALPHA_IS_LAST ? argb + 3 : argb + 0; -+ const uint8_t* const a = argb + (0 ^ ALPHA_OFFSET); -+ const uint8_t* const r = argb + (1 ^ ALPHA_OFFSET); -+ const uint8_t* const g = argb + (2 ^ ALPHA_OFFSET); -+ const uint8_t* const b = argb + (3 ^ ALPHA_OFFSET); - - picture->colorspace = WEBP_YUV420; - return ImportYUVAFromRGBA(r, g, b, a, 4, 4 * picture->argb_stride, -@@ -1044,7 +1044,8 @@ int WebPPictureYUVAToARGB(WebPPicture* p - const int argb_stride = 4 * picture->argb_stride; - uint8_t* dst = (uint8_t*)picture->argb; - const uint8_t *cur_u = picture->u, *cur_v = picture->v, *cur_y = picture->y; -- WebPUpsampleLinePairFunc upsample = WebPGetLinePairConverter(ALPHA_IS_LAST); -+ WebPUpsampleLinePairFunc upsample = -+ WebPGetLinePairConverter(ALPHA_OFFSET > 0); - - // First row, with replicated top samples. - upsample(cur_y, NULL, cur_u, cur_v, cur_u, cur_v, dst, NULL, width); -@@ -1087,6 +1088,7 @@ static int Import(WebPPicture* const pic - const uint8_t* rgb, int rgb_stride, - int step, int swap_rb, int import_alpha) { - int y; -+ // swap_rb -> b,g,r,a , !swap_rb -> r,g,b,a - const uint8_t* r_ptr = rgb + (swap_rb ? 2 : 0); - const uint8_t* g_ptr = rgb + 1; - const uint8_t* b_ptr = rgb + (swap_rb ? 0 : 2); -@@ -1104,16 +1106,25 @@ static int Import(WebPPicture* const pic - WebPInitAlphaProcessing(); - - if (import_alpha) { -+ // dst[] byte order is {a,r,g,b} for big-endian, {b,g,r,a} for little endian - uint32_t* dst = picture->argb; -- const int do_copy = -- (!swap_rb && !ALPHA_IS_LAST) || (swap_rb && ALPHA_IS_LAST); -+ const int do_copy = (ALPHA_OFFSET == 3) && swap_rb; - assert(step == 4); - for (y = 0; y < height; ++y) { - if (do_copy) { - memcpy(dst, rgb, width * 4); - } else { -+#ifdef WORDS_BIGENDIAN -+ // BGRA or RGBA input order. -+ const uint8_t* a_ptr = rgb + 3; -+ WebPPackARGB(a_ptr, r_ptr, g_ptr, b_ptr, width, dst); -+ r_ptr += rgb_stride; -+ g_ptr += rgb_stride; -+ b_ptr += rgb_stride; -+#else - // RGBA input order. Need to swap R and B. - VP8LConvertBGRAToRGBA((const uint32_t*)rgb, width, (uint8_t*)dst); -+#endif - } - rgb += rgb_stride; - dst += picture->argb_stride; ---- libwebp-0.6.1.orig/src/utils/endian_inl_utils.h -+++ libwebp-0.6.1/src/utils/endian_inl_utils.h -@@ -19,13 +19,6 @@ - #include "src/dsp/dsp.h" - #include "src/webp/types.h" - --// some endian fix (e.g.: mips-gcc doesn't define __BIG_ENDIAN__) --#if !defined(WORDS_BIGENDIAN) && \ -- (defined(__BIG_ENDIAN__) || defined(_M_PPC) || \ -- (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))) --#define WORDS_BIGENDIAN --#endif -- - #if defined(WORDS_BIGENDIAN) - #define HToLE32 BSwap32 - #define HToLE16 BSwap16 diff --git a/sources b/sources index 877e862..1f99b95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libwebp-0.6.1.tar.gz) = fece551d8fabdd8d7ba6807baa54a69a345f8690be4415dd0c0dea54002d78fe893a5d5aacfc13800300edd462b969d596709ac3213f6bc90f8e3698b2490d5f +SHA512 (libwebp-1.0.0.tar.gz) = 2af7036957722a3f1533fa2da0da15c76d7eb8ac98ec4ad5cf71dd4262f3d7c9897fb6b50befab83b7de22f0abceeb2c0ff52d60927513d40f8a41aa6a9abd99