From 3110b26af7765034429d71c34f3acaf71c52e7fb Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 1 May 2020 17:09:33 -0700
Subject: [PATCH 1/2] libwebp: update to 1.1.0

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 libs/libwebp/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/libwebp/Makefile b/libs/libwebp/Makefile
index a82af951a..d68083247 100644
--- a/libs/libwebp/Makefile
+++ b/libs/libwebp/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwebp
-PKG_VERSION:=1.0.3
-PKG_RELEASE:=2
+PKG_VERSION:=1.1.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://storage.googleapis.com/downloads.webmproject.org/releases/webp
-PKG_HASH:=e20a07865c8697bba00aebccc6f54912d6bc333bb4d604e6b07491c1a226b34f
+PKG_HASH:=98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f50ef043
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=BSD-3-Clause

From 61efe7dc3e58987a99d6f1db227b9bd809a96520 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 1 May 2020 17:29:07 -0700
Subject: [PATCH 2/2] libwebp: switch to CMake

Allows simplifying the Makefile.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 libs/libwebp/Makefile | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/libs/libwebp/Makefile b/libs/libwebp/Makefile
index d68083247..bb0ce974b 100644
--- a/libs/libwebp/Makefile
+++ b/libs/libwebp/Makefile
@@ -12,10 +12,11 @@ PKG_MAINTAINER:=
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
 
-PKG_INSTALL:=1
+CMAKE_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/libwebp
   SECTION:=libs
@@ -28,33 +29,19 @@ define Package/libwebp/description
   The libwebp package contains a library for the WebP format.
 endef
 
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--disable-static \
-	--disable-neon-rtcd \
-	--disable-gl \
-	--disable-sdl \
-	--disable-gif \
-	--disable-jpeg \
-	--disable-png \
-	--disable-tiff \
-	--disable-wic \
-	--disable-libwebpmux \
-	--disable-libwebpdemux \
-	--disable-libwebpdecoder \
-	--disable-libwebpextras \
-	--without-pic
+CMAKE_OPTIONS += \
+	-DBUILD_SHARED_LIBS=ON \
+	-DWEBP_BUILD_ANIM_UTILS=OFF \
+	-DWEBP_BUILD_CWEBP=OFF \
+	-DWEBP_BUILD_DWEBP=OFF \
+	-DWEBP_BUILD_GIF2WEBP=OFF \
+	-DWEBP_BUILD_IMG2WEBP=OFF \
+	-DWEBP_BUILD_VWEBP=OFF \
+	-DWEBP_BUILD_WEBPINFO=OFF \
+	-DWEBP_BUILD_WEBPMUX=OFF \
+	-DWEBP_BUILD_EXTRAS=OFF
 
-TARGET_CFLAGS += $(FPIC) -flto
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/webp
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/webp/* $(1)/usr/include/webp/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebp* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libwebp.pc $(1)/usr/lib/pkgconfig/
-endef
+TARGET_CFLAGS += -flto
 
 define Package/libwebp/install
 	$(INSTALL_DIR) $(1)/usr/lib