diff --git a/aarch64-disable-neon.diff b/aarch64-disable-neon.diff index bed4fb4..791136e 100644 --- a/aarch64-disable-neon.diff +++ b/aarch64-disable-neon.diff @@ -1,11 +1,22 @@ ---- src/dsp/dsp.h -+++ src/dsp/dsp.h -@@ -66,7 +66,7 @@ - #define WEBP_ANDROID_NEON // Android targets that might support NEON - #endif - --#if defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON) || defined(__aarch64__) -+#if defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON) +From: dmueller@suse.com +Date: Tue Oct 28 06:45:02 UTC 2014 +Upstream: never + +incompatible types when initializing type 'int32x4_t' using type 'int32x2_t' +--- + src/dsp/dsp.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: libwebp-0.4.3/src/dsp/dsp.h +=================================================================== +--- libwebp-0.4.3.orig/src/dsp/dsp.h ++++ libwebp-0.4.3/src/dsp/dsp.h +@@ -69,7 +69,7 @@ extern "C" { + // The intrinsics currently cause compiler errors with arm-nacl-gcc and the + // inline assembly would need to be modified for use with Native Client. + #if (defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON) || \ +- defined(__aarch64__)) && !defined(__native_client__) ++ 0 ) && !defined(__native_client__) #define WEBP_USE_NEON #endif diff --git a/libwebp-0.4.2.tar.gz b/libwebp-0.4.2.tar.gz deleted file mode 100644 index 1e92ec5..0000000 --- a/libwebp-0.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14d825d7c2ef7d49621bcb6b83466be455585e671ae0a2ebc1f2e07775a1722d -size 977801 diff --git a/libwebp-0.4.3.tar.gz b/libwebp-0.4.3.tar.gz new file mode 100644 index 0000000..64a8252 --- /dev/null +++ b/libwebp-0.4.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efbe0d58fda936f2ed99d0b837ed7087d064d6838931f282c4618d2a3f7390c4 +size 990904 diff --git a/libwebp-0.4.3.tar.gz.asc b/libwebp-0.4.3.tar.gz.asc new file mode 100644 index 0000000..3bd67dc --- /dev/null +++ b/libwebp-0.4.3.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJVANiyAAoJEPnD1r24IytdIxYP/0Ejajg26GQgORNlxAQYLXBT +RJOfnN2kEY/rXQOgh7FIjKSeZio142q6f/SZTsQuq6WAQVOxYSyy2g9chn3ixtsZ +OgAbQ97Q7+zm53O1GuvQIca/0pHSWZtjWD2qDf8EFXqJ3sGmDrhJJAguCjUqrOaQ +PY6QO5uOW0TGGzm2m898z1bwF1o1aZcaJ0P6KWarCa/N81DhjFntWDT6aU4IkXEs +8pIfSrfoD+wfTFpnLBkqiZJXUZ+i4KEWRMmFksyHGf+kFEGPUcVJsi6KIPrkDsOr +ioiZZ/7X+kBz+l+ZK642iqdAWIW5n+XjQut1zJvZLfAd5nKPNFy/Dtyeas24NpyO +YwQHFSvU215RWyPrO5riiUaPmRxIvtA23lq1B2Mtc2UTtekXkEwtFlKRU12a5wHN +r+rMMUHLWrFlzyA8xlNEgrI/tZhrE02WPzfUpr4qo5S7snxU6bDyy0tCbu1GQn3s +eeA8dE7jAByWuKXJzWiJgBjBsP95GyJS1Izjki+i/+egK7FLqQXjY1ctqR3/KcS/ +FWMTlDzf6qpMUi4LlOTEo9UrrJQtStIAz0k1t5cHFU6ulNwFsMM75unkDfjJ9kfh +7K64jEN+6pqukpMBSsoQhmd+DcG18dbBvURtz7qV7uSwyPXS5Yt+RdR3eDleuBaq +/7vz3MtJMB9ywqHKvhWz +=enx5 +-----END PGP SIGNATURE----- diff --git a/libwebp.changes b/libwebp.changes index b18d0e6..3cb0621 100644 --- a/libwebp.changes +++ b/libwebp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Mar 29 12:44:43 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 0.4.3 +* lossless decode fix and a multi-threading fix +* documentation / vwebp updates for animation + ------------------------------------------------------------------- Wed Oct 29 08:21:16 UTC 2014 - dimstar@opensuse.org diff --git a/libwebp.keyring b/libwebp.keyring new file mode 100644 index 0000000..6ce6744 --- /dev/null +++ b/libwebp.keyring @@ -0,0 +1,33 @@ +pub 4096R/B8232B5D 2011-09-23 +uid [ unknown] WebP release signing key + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQINBE58xqEBEADG87qwtVN0i6d/YRCns/+RYHQawcxTOtIyOSh69aSjNeVg9wBo +9yoPrGtOOYwbYx/IQ3JZSWMwTj5o2LJfwO8sDXCXDTq+KmJ72RKe6WXIsr6ZP7u4 +BO/kz3IOIg+ON9YDYtLssFpJLELJNGGnjVo62gosPxwh2s8FwUyFCUm3yhVKYCee +IfFcxizM5W8MhApdEU9OprPndVpv9U7PLfXk30myG8wkIYR+7VRvbg/HIyuGPf9m +HjJ8Vlv7sezPqtkMtbgCRbmWxvlNd5WIO8fDHfBxQIspuFFIBgpKN8Q1TapApzE2 +VLxOxU2ezdAq9Q7uVKfCV2VkDx4tD2aS7Mx7UN0HMz1J47rgHeGc5qnVC0j6s26X +FtwLK6AjGkO8FncAl0A0qu7vipghhS3hlehBvZcWjbgtTdvEa2H4mxZmPWHlNLhk +6Jk6PaahKic1wmNldg9ndr7sSUo3IuFZnsx9QHvWyYolNKah/vAY6YESZKkrDJO8 +ksXbyt62uneUowIYNmv1DSVFPewWysjU+VwiEJQVO5H0cUmQlaFNVajuNK5lbN3+ +4EXAuEC63RIex0cvekJUuIWkGUkYUHYckwY0iZnfBDR/y4dhPqsFwBCJxBMbAzWn +9gcyEdtS4uD15BngjuFI7DgyVVP5ZQ8iU8sZA6Z2m3Z/wC71xSHrMfYqBQARAQAB +tDdXZWJQIHJlbGVhc2Ugc2lnbmluZyBrZXkgPHdlYnAtZGlzY3Vzc0B3ZWJtcHJv +amVjdC5vcmc+iQI4BBMBAgAiBQJOfMahAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe +AQIXgAAKCRD5w9a9uCMrXSHzEACv2zHG0SG/Avp41Mtnen1SUUNgBCEcexfDXhpk +ueKdSyxvwgW+J1BhprnYoUjRzQMk30oiZ8GUhwc84iObuvG3Ast0qWoxILlUkxfV +IhyfLNDMHVeRinpq2xSJSbeP3tM6njcZCUtL8mkzZ5bQMEZOcyv/cdwCE4TcdZsH +Ewhyds7l1KRcra7ajoVRRPQ5LNjPW2yJ0UjpDGvNfbt3Xq6BqTRxvMN6iwemY7lN +gWwIkxAgDyLzIdVbFf4glaHuXcMc7FFzf8KieyAKxHZ7xG/y90nBKI8nF2TEu/OK +Yp1CChIiQhCQOEccjiEaZ6t+b8iQ8E/QqQG8ng/DBt/EKr04rS7YtR7c4v9Hrv7w +jmS0eZmR7vlu9R6lDDvdCmKwRD1I33ksAWMZZKpQIpxy6cErQMG5RJ2CbQZuDN5J +T8OjoMdBv26VpaCgMui7mSc8ESBgsZv1fMvVA8LnfovznPHQhVLw7xPkJrt4n1Mw +IuRuw7VIUGJieG8aoPl8SkH55Xf9BXMisbMj9cxUuk3DVx0dwgW7PtxdYAVSwBWL +GVgZghAOel/LvLGi2at28bER2I8bGIkuxwqSsNWF42ToKJi1xFNJgJYUstT/p8lQ +uFL8jiavt4Gmt3uwIM4wZVWfC7n/F4hW+2xu9x0Ya1fvCh8EHb5lKuXTZCb7EqMJ +1jT8dg== +=YlGr +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libwebp.spec b/libwebp.spec index 010b6b0..1af3b33 100644 --- a/libwebp.spec +++ b/libwebp.spec @@ -17,7 +17,7 @@ Name: libwebp -Version: 0.4.2 +Version: 0.4.3 Release: 0 Summary: Library and tools for the WebP graphics format License: BSD-3-Clause @@ -26,9 +26,10 @@ Url: https://developers.google.com/speed/webp/ #Git-Clone: http://git.chromium.org/webm/libwebp.git Source: http://downloads.webmproject.org/releases/webp/%name-%version.tar.gz -Source2: baselibs.conf -# PATCH-UPSTREAM-NEVER: incompatible types when initializing type 'int32x4_t' using type 'int32x2_t' -Patch0: aarch64-disable-neon.diff +Source2: http://downloads.webmproject.org/releases/webp/%name-%version.tar.gz.asc +Source3: %name.keyring +Source4: baselibs.conf +Patch1: aarch64-disable-neon.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: giflib-devel BuildRequires: libjpeg-devel @@ -114,7 +115,7 @@ images more efficiently. %prep %setup -q -%patch0 +%patch -P 1 -p1 %build %configure --disable-static \ @@ -123,9 +124,8 @@ images more efficiently. make %{?_smp_mflags} %install -b="%buildroot"; -make install DESTDIR="$b"; -rm -f "$b/%_libdir"/*.la; +%make_install +rm -f "%buildroot/%_libdir"/*.la %post -n libwebp5 -p /sbin/ldconfig %postun -n libwebp5 -p /sbin/ldconfig