From bff74006ab9c8b0baafbf0eea42d32a96aab56fe Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 1 Feb 2021 11:09:31 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libwebp.git#749e681bfe70e9be6a652eadd3375a80c99e5dd0 --- .gitignore | 1 + libwebp-freeglut.patch | 14 +++++++------- libwebp.spec | 7 +++++-- sources | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a52d011..abbb2cb 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /libwebp-1.0.2.tar.gz /libwebp-1.0.3.tar.gz /libwebp-1.1.0.tar.gz +/libwebp-1.2.0.tar.gz diff --git a/libwebp-freeglut.patch b/libwebp-freeglut.patch index 04d63f6..99facf6 100644 --- a/libwebp-freeglut.patch +++ b/libwebp-freeglut.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference libwebp-1.1.0/CMakeLists.txt libwebp-1.1.0-new/CMakeLists.txt ---- libwebp-1.1.0/CMakeLists.txt 2019-12-21 14:37:43.000000000 +0100 -+++ libwebp-1.1.0-new/CMakeLists.txt 2020-01-07 08:40:04.574415507 +0100 -@@ -459,8 +459,8 @@ endif() +diff -rupN --no-dereference libwebp-1.2.0/CMakeLists.txt libwebp-1.2.0-new/CMakeLists.txt +--- libwebp-1.2.0/CMakeLists.txt 2021-01-21 04:43:45.000000000 +0100 ++++ libwebp-1.2.0-new/CMakeLists.txt 2021-02-01 11:37:20.760764115 +0100 +@@ -506,8 +506,8 @@ endif() if(WEBP_BUILD_VWEBP) # vwebp @@ -12,9 +12,9 @@ diff -rupN --no-dereference libwebp-1.1.0/CMakeLists.txt libwebp-1.1.0-new/CMake include_directories(${WEBP_DEP_IMG_INCLUDE_DIRS}) parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "VWEBP_SRCS" "vwebp") add_executable(vwebp ${VWEBP_SRCS}) -diff -rupN --no-dereference libwebp-1.1.0/examples/vwebp.c libwebp-1.1.0-new/examples/vwebp.c ---- libwebp-1.1.0/examples/vwebp.c 2019-12-21 14:37:43.000000000 +0100 -+++ libwebp-1.1.0-new/examples/vwebp.c 2020-01-07 08:40:04.575415463 +0100 +diff -rupN --no-dereference libwebp-1.2.0/examples/vwebp.c libwebp-1.2.0-new/examples/vwebp.c +--- libwebp-1.2.0/examples/vwebp.c 2021-01-21 04:43:45.000000000 +0100 ++++ libwebp-1.2.0-new/examples/vwebp.c 2021-02-01 11:37:20.760764115 +0100 @@ -27,7 +27,7 @@ #if defined(HAVE_GLUT_GLUT_H) #include diff --git a/libwebp.spec b/libwebp.spec index 1f87c35..306f5c4 100644 --- a/libwebp.spec +++ b/libwebp.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: libwebp -Version: 1.1.0 -Release: 6%{?dist} +Version: 1.2.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 @@ -143,6 +143,9 @@ cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/ %changelog +* Mon Feb 01 2021 Sandro Mani - 1.2.0-1 +- Update to 1.2.0 + * Tue Jan 26 2021 Fedora Release Engineering - 1.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 111f377..e40726d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libwebp-1.1.0.tar.gz) = c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549 +SHA512 (libwebp-1.2.0.tar.gz) = c46b41899a543cc80914c89646dd607dbb5d025a9727dd83ef70994b9310eedc697666bd812141a90aa16632a9a354a031d9360a9ee1112295c7e154e69f0b74