diff --git a/SOURCES/libwebp-0.3.0-endian-check.patch b/SOURCES/libwebp-0.3.0-endian-check.patch new file mode 100644 index 0000000..acde69c --- /dev/null +++ b/SOURCES/libwebp-0.3.0-endian-check.patch @@ -0,0 +1,73 @@ +--- libwebp-0.3.0/examples/tiffdec.c.orig 2013-03-29 22:55:16.000000000 +0000 ++++ libwebp-0.3.0/examples/tiffdec.c 2014-08-19 00:06:28.972859672 +0100 +@@ -95,7 +95,7 @@ + pic->width = width; + pic->height = height; + // TIFF data is ABGR +-#ifdef __BIG_ENDIAN__ ++#if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) + TIFFSwabArrayOfLong(raster, width * height); + #endif + ok = keep_alpha +--- libwebp-0.3.0/src/dec/vp8.c.orig 2013-03-29 22:55:16.000000000 +0000 ++++ libwebp-0.3.0/src/dec/vp8.c 2014-08-19 00:06:28.972859672 +0100 +@@ -540,7 +540,7 @@ + + // Macro to pack four LSB of four bytes into four bits. + #if defined(__PPC__) || defined(_M_PPC) || defined(_ARCH_PPC) || \ +- defined(__BIG_ENDIAN__) ++ (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) + #define PACK_CST 0x08040201U + #else + #define PACK_CST 0x01020408U +--- libwebp-0.3.0/src/dsp/lossless.c.orig 2014-08-19 00:06:28.973859689 +0100 ++++ libwebp-0.3.0/src/dsp/lossless.c 2014-08-19 00:09:58.349573103 +0100 +@@ -1255,7 +1255,7 @@ + uint32_t argb = *src++; + + #if !defined(WEBP_REFERENCE_IMPLEMENTATION) +-#if !defined(__BIG_ENDIAN__) && (defined(__i386__) || defined(__x86_64__)) ++#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile("bswap %0" : "=r"(argb) : "0"(argb)); + *(uint32_t*)dst = argb; + #elif !defined(__BIG_ENDIAN__) && defined(_MSC_VER) +--- libwebp-0.3.0/src/utils/bit_reader.h.orig 2013-03-29 22:55:16.000000000 +0000 ++++ libwebp-0.3.0/src/utils/bit_reader.h 2014-08-19 00:06:28.973859689 +0100 +@@ -155,7 +155,7 @@ + bit_t bits; + lbit_t in_bits = *(lbit_t*)br->buf_; + br->buf_ += (BITS) >> 3; +-#if !defined(__BIG_ENDIAN__) ++#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + #if (BITS > 32) + // gcc 4.3 has builtin functions for swap32/swap64 + #if defined(__GNUC__) && \ +@@ -192,7 +192,7 @@ + #else // BITS == 8 + bits = (bit_t)in_bits; + #endif +-#else // BIG_ENDIAN ++#else // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + bits = (bit_t)in_bits; + #endif + #ifndef USE_RIGHT_JUSTIFY +--- libwebp-0.3.0/src/utils/bit_writer.c.orig 2013-03-29 22:55:16.000000000 +0000 ++++ libwebp-0.3.0/src/utils/bit_writer.c 2014-08-19 00:06:28.973859689 +0100 +@@ -236,7 +236,7 @@ + + void VP8LWriteBits(VP8LBitWriter* const bw, int n_bits, uint32_t bits) { + if (n_bits < 1) return; +-#if !defined(__BIG_ENDIAN__) ++#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + // Technically, this branch of the code can write up to 25 bits at a time, + // but in prefix encoding, the maximum number of bits written is 18 at a time. + { +@@ -246,7 +246,7 @@ + *(uint32_t*)p = v; + bw->bit_pos_ += n_bits; + } +-#else // BIG_ENDIAN ++#else // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + { + uint8_t* p = &bw->buf_[bw->bit_pos_ >> 3]; + const int bits_reserved_in_first_byte = bw->bit_pos_ & 7; diff --git a/SOURCES/libwebp-0.3.0-endian-check2.patch b/SOURCES/libwebp-0.3.0-endian-check2.patch new file mode 100644 index 0000000..15e2a33 --- /dev/null +++ b/SOURCES/libwebp-0.3.0-endian-check2.patch @@ -0,0 +1,13 @@ +diff -Naur libwebp-0.3.0.orig/src/dec/vp8.c libwebp-0.3.0/src/dec/vp8.c +--- libwebp-0.3.0.orig/src/dec/vp8.c 2014-10-13 17:06:58.000000000 +0200 ++++ libwebp-0.3.0/src/dec/vp8.c 2014-10-13 17:06:18.000000000 +0200 +@@ -539,8 +539,7 @@ + {{0, 0, 1, 1}}, {{1, 0, 1, 1}}, {{0, 1, 1, 1}}, {{1, 1, 1, 1}} }; + + // Macro to pack four LSB of four bytes into four bits. +-#if defined(__PPC__) || defined(_M_PPC) || defined(_ARCH_PPC) || \ +- (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) ++#if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) + #define PACK_CST 0x08040201U + #else + #define PACK_CST 0x01020408U diff --git a/SPECS/libwebp.spec b/SPECS/libwebp.spec index e0e8211..e2e2d69 100644 --- a/SPECS/libwebp.spec +++ b/SPECS/libwebp.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: libwebp Version: 0.3.0 -Release: 3%{?dist} +Release: 7%{?dist} Group: Development/Libraries URL: http://webmproject.org/ Summary: Library and tools for the WebP graphics format @@ -9,6 +9,8 @@ Summary: Library and tools for the WebP graphics format License: BSD Source0: http://webp.googlecode.com/files/%{name}-%{version}.tar.gz Source1: libwebp_jni_example.java +Patch0: libwebp-0.3.0-endian-check.patch +Patch1: libwebp-0.3.0-endian-check2.patch BuildRequires: libjpeg-devel libpng-devel libtool swig BuildRequires: giflib-devel BuildRequires: libtiff-devel @@ -25,6 +27,7 @@ images more efficiently. %package tools Group: Development/Tools Summary: The WebP command line tools +Requires: %{name}%{?_isa} = %{version}-%{release} %description tools WebP is an image format that does lossy compression of digital @@ -57,6 +60,8 @@ Java bindings for libwebp. %prep %setup -q +%patch0 -p1 -b .endian +%patch1 -p1 -b .endian2 %build mkdir -p m4 @@ -119,6 +124,19 @@ cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/ %{_libdir}/%{name}-java/ %changelog +* Tue Feb 21 2017 Martin Stransky - 0.3.0-7 +- Added libwebp dependency to libwebp-tools + +* Tue Feb 21 2017 Martin Stransky - 0.3.0-6 +- Rebuilt + +* Mon Oct 13 2014 Jaromir Capik - 0.3.0-5 +- Removing __PPC__ macro conflicting with __BYTE_ORDER__ endian check (#1127230) +- Resolves: rhbz#1127230 + +* Mon Aug 18 2014 Peter Robinson 0.3.0-4 +- Fix ppc64le build + * Fri Jan 24 2014 Daniel Mach - 0.3.0-3 - Mass rebuild 2014-01-24