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
This commit is contained in:
DistroBaker 2021-02-01 11:09:31 +00:00
parent 617d2432f3
commit bff74006ab
4 changed files with 14 additions and 10 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@
/libwebp-1.0.2.tar.gz /libwebp-1.0.2.tar.gz
/libwebp-1.0.3.tar.gz /libwebp-1.0.3.tar.gz
/libwebp-1.1.0.tar.gz /libwebp-1.1.0.tar.gz
/libwebp-1.2.0.tar.gz

View File

@ -1,7 +1,7 @@
diff -rupN --no-dereference libwebp-1.1.0/CMakeLists.txt libwebp-1.1.0-new/CMakeLists.txt diff -rupN --no-dereference libwebp-1.2.0/CMakeLists.txt libwebp-1.2.0-new/CMakeLists.txt
--- libwebp-1.1.0/CMakeLists.txt 2019-12-21 14:37:43.000000000 +0100 --- libwebp-1.2.0/CMakeLists.txt 2021-01-21 04:43:45.000000000 +0100
+++ libwebp-1.1.0-new/CMakeLists.txt 2020-01-07 08:40:04.574415507 +0100 +++ libwebp-1.2.0-new/CMakeLists.txt 2021-02-01 11:37:20.760764115 +0100
@@ -459,8 +459,8 @@ endif() @@ -506,8 +506,8 @@ endif()
if(WEBP_BUILD_VWEBP) if(WEBP_BUILD_VWEBP)
# 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}) include_directories(${WEBP_DEP_IMG_INCLUDE_DIRS})
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "VWEBP_SRCS" "vwebp") parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "VWEBP_SRCS" "vwebp")
add_executable(vwebp ${VWEBP_SRCS}) add_executable(vwebp ${VWEBP_SRCS})
diff -rupN --no-dereference libwebp-1.1.0/examples/vwebp.c libwebp-1.1.0-new/examples/vwebp.c diff -rupN --no-dereference libwebp-1.2.0/examples/vwebp.c libwebp-1.2.0-new/examples/vwebp.c
--- libwebp-1.1.0/examples/vwebp.c 2019-12-21 14:37:43.000000000 +0100 --- libwebp-1.2.0/examples/vwebp.c 2021-01-21 04:43:45.000000000 +0100
+++ libwebp-1.1.0-new/examples/vwebp.c 2020-01-07 08:40:04.575415463 +0100 +++ libwebp-1.2.0-new/examples/vwebp.c 2021-02-01 11:37:20.760764115 +0100
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
#if defined(HAVE_GLUT_GLUT_H) #if defined(HAVE_GLUT_GLUT_H)
#include <GLUT/glut.h> #include <GLUT/glut.h>

View File

@ -1,8 +1,8 @@
%global _hardened_build 1 %global _hardened_build 1
Name: libwebp Name: libwebp
Version: 1.1.0 Version: 1.2.0
Release: 6%{?dist} Release: 1%{?dist}
URL: http://webmproject.org/ URL: http://webmproject.org/
Summary: Library and tools for the WebP graphics format Summary: Library and tools for the WebP graphics format
# Additional IPR is licensed as well. See PATENTS file for details # 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 %changelog
* Mon Feb 01 2021 Sandro Mani <manisandro@gmail.com> - 1.2.0-1
- Update to 1.2.0
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-6 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (libwebp-1.1.0.tar.gz) = c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549 SHA512 (libwebp-1.2.0.tar.gz) = c46b41899a543cc80914c89646dd607dbb5d025a9727dd83ef70994b9310eedc697666bd812141a90aa16632a9a354a031d9360a9ee1112295c7e154e69f0b74