From c2fcd6258aca61d1a1fc458967958e63f153e65f Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Thu, 2 Jan 2020 01:43:54 +0200
Subject: [PATCH] libwebp: enable extra features

Requested in https://github.com/termux/termux-packages/issues/4443.
---
 packages/libwebp/CMakeLists.txt.patch | 25 -------------------------
 packages/libwebp/build.sh             | 19 ++++++++++++-------
 2 files changed, 12 insertions(+), 32 deletions(-)
 delete mode 100644 packages/libwebp/CMakeLists.txt.patch

diff --git a/packages/libwebp/CMakeLists.txt.patch b/packages/libwebp/CMakeLists.txt.patch
deleted file mode 100644
index 667ccccdd..000000000
--- a/packages/libwebp/CMakeLists.txt.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -u -r ../libwebp-1.0.3/CMakeLists.txt ./CMakeLists.txt
---- ../libwebp-1.0.3/CMakeLists.txt	2019-07-04 19:32:37.000000000 +0000
-+++ ./CMakeLists.txt	2019-07-14 17:21:56.050221574 +0000
-@@ -75,20 +75,7 @@
- 
- # ##############################################################################
- # Android only.
--if(ANDROID)
--  include_directories(${ANDROID_NDK}/sources/android/cpufeatures)
--  add_library(cpufeatures STATIC
--              ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
--  list(APPEND INSTALLED_LIBRARIES cpufeatures)
--  target_link_libraries(cpufeatures dl)
--  set(WEBP_DEP_LIBRARIES ${WEBP_DEP_LIBRARIES} cpufeatures)
--  set(WEBP_DEP_INCLUDE_DIRS ${WEBP_DEP_INCLUDE_DIRS}
--      ${ANDROID_NDK}/sources/android/cpufeatures)
--  add_definitions(-DHAVE_CPU_FEATURES_H=1)
--  set(HAVE_CPU_FEATURES_H 1)
--else()
--  set(HAVE_CPU_FEATURES_H 0)
--endif()
-+set(HAVE_CPU_FEATURES_H 0)
- 
- function(configure_pkg_config FILE)
-   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.in"
diff --git a/packages/libwebp/build.sh b/packages/libwebp/build.sh
index c3b3dcefe..6a56c96c9 100644
--- a/packages/libwebp/build.sh
+++ b/packages/libwebp/build.sh
@@ -2,17 +2,22 @@ TERMUX_PKG_HOMEPAGE=https://github.com/webmproject/libwebp
 TERMUX_PKG_DESCRIPTION="Library to encode and decode images in WebP format"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=1.0.3
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SRCURL=https://github.com/webmproject/libwebp/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=082d114bcb18a0e2aafc3148d43367c39304f86bf18ba0b2e766447e111a4a91
+TERMUX_PKG_DEPENDS="giflib, libjpeg-turbo, libpng, libtiff"
 TERMUX_PKG_BREAKS="libwebp-dev"
 TERMUX_PKG_REPLACES="libwebp-dev"
-TERMUX_PKG_SRCURL=https://github.com/webmproject/libwebp/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
---disable-gif
---disable-jpeg
---disable-libwebpdemux
---disable-png
---disable-tiff
+--enable-libwebpmux
+--enable-libwebpdemux
+--enable-libwebpdecoder
+--enable-libwebpextras
+--enable-swap-16bit-csp
+--enable-gif
+--enable-jpeg
+--enable-png
+--enable-tiff
 --disable-wic
 "
 TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1"