From 52ad58ce50bcc02e88c46c93d4f9854b094c445b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 02 2023 07:58:46 +0000
Subject: import libwebp-1.2.0-6.el9_1


---

diff --git a/SOURCES/mozilla-1819244.patch b/SOURCES/mozilla-1819244.patch
new file mode 100644
index 0000000..05fa0f8
--- /dev/null
+++ b/SOURCES/mozilla-1819244.patch
@@ -0,0 +1,68 @@
+
+# HG changeset patch
+# User Timothy Nikkel <tnikkel@gmail.com>
+# Date 1678835815 0
+# Node ID 53b805c752ff23080e100eda2b3b4280d4370b2e
+# Parent  8fcdaf8d685d5903b127e041feb1716637b6008f
+Bug 1819244. Cherry pic webp commit fix. r=aosmond, a=dsmith
+
+https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129
+
+Differential Revision: https://phabricator.services.mozilla.com/D171814
+
+diff --git a/media/libwebp/src/enc/alpha_enc.c b/media/libwebp/src/enc/alpha_enc.c
+--- a/src/enc/alpha_enc.c
++++ b/src/enc/alpha_enc.c
+@@ -8,16 +8,17 @@
+ // -----------------------------------------------------------------------------
+ //
+ // Alpha-plane compression.
+ //
+ // Author: Skal (pascal.massimino@gmail.com)
+ 
+ #include <assert.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "src/enc/vp8i_enc.h"
+ #include "src/dsp/dsp.h"
+ #include "src/utils/filters_utils.h"
+ #include "src/utils/quant_levels_utils.h"
+ #include "src/utils/utils.h"
+ #include "src/webp/format_constants.h"
+ 
+@@ -143,31 +144,32 @@ static int EncodeAlphaInternal(const uin
+       output_size = VP8LBitWriterNumBytes(&tmp_bw);
+       if (output_size > data_size) {
+         // compressed size is larger than source! Revert to uncompressed mode.
+         method = ALPHA_NO_COMPRESSION;
+         VP8LBitWriterWipeOut(&tmp_bw);
+       }
+     } else {
+       VP8LBitWriterWipeOut(&tmp_bw);
++      memset(&result->bw, 0, sizeof(result->bw));
+       return 0;
+     }
+   }
+ 
+   if (method == ALPHA_NO_COMPRESSION) {
+     output = alpha_src;
+     output_size = data_size;
+     ok = 1;
+   }
+ 
+   // Emit final result.
+   header = method | (filter << 2);
+   if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4;
+ 
+-  VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size);
++  if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0;
+   ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN);
+   ok = ok && VP8BitWriterAppend(&result->bw, output, output_size);
+ 
+   if (method != ALPHA_NO_COMPRESSION) {
+     VP8LBitWriterWipeOut(&tmp_bw);
+   }
+   ok = ok && !result->bw.error_;
+   result->score = VP8BitWriterSize(&result->bw);
+
diff --git a/SPECS/libwebp.spec b/SPECS/libwebp.spec
index 42f5852..fc61db7 100644
--- a/SPECS/libwebp.spec
+++ b/SPECS/libwebp.spec
@@ -2,7 +2,7 @@
 
 Name:          libwebp
 Version:       1.2.0
-Release:       3%{?dist}
+Release:       6%{?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
@@ -10,6 +10,7 @@ License:       BSD
 Source0:       http://downloads.webmproject.org/releases/webp/%{name}-%{version}.tar.gz
 Source1:       libwebp_jni_example.java
 Patch0:        libwebp-freeglut.patch
+Patch1:        mozilla-1819244.patch
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -32,6 +33,7 @@ images more efficiently.
 
 %package 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
@@ -143,6 +145,12 @@ cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/
 
 
 %changelog
+* Wed Apr 26 2023 Martin Stransky <stransky@redhat.com> - 1.2.0-6
+- Fix tools subpackage dependency
+
+* Wed Apr 26 2023 Martin Stransky <stransky@redhat.com> - 1.2.0-4
+- Added fix for mzbz#1819244
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.0-3
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688