From f03bd0f12733bd95f18257087bd54618274e0860 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 22 Nov 2018 00:31:16 +0100
Subject: [PATCH] libwebp: Update from 1.0.0 to 1.0.1

---
 packages/libwebp/CMakeLists.txt.patch  | 20 +++++++++-----------
 packages/libwebp/build.sh              |  4 ++--
 packages/libwebp/cmake-cpu.cmake.patch | 20 --------------------
 3 files changed, 11 insertions(+), 33 deletions(-)
 delete mode 100644 packages/libwebp/cmake-cpu.cmake.patch

diff --git a/packages/libwebp/CMakeLists.txt.patch b/packages/libwebp/CMakeLists.txt.patch
index 6175d23fd..e041c6aea 100644
--- a/packages/libwebp/CMakeLists.txt.patch
+++ b/packages/libwebp/CMakeLists.txt.patch
@@ -1,20 +1,18 @@
-diff -u -r ../libwebp-1.0.0/CMakeLists.txt ./CMakeLists.txt
---- ../libwebp-1.0.0/CMakeLists.txt	2018-04-21 03:04:55.000000000 +0000
-+++ ./CMakeLists.txt	2018-08-26 00:26:35.791990624 +0000
-@@ -37,21 +37,7 @@
+diff -u -r ../libwebp-1.0.1/CMakeLists.txt ./CMakeLists.txt
+--- ../libwebp-1.0.1/CMakeLists.txt	2018-11-08 23:29:51.000000000 +0000
++++ ./CMakeLists.txt	2018-11-21 23:28:58.956387540 +0000
+@@ -58,19 +58,7 @@
  
- ################################################################################
+ # ##############################################################################
  # Android only.
 -if(ANDROID)
 -  include_directories(${ANDROID_NDK}/sources/android/cpufeatures)
 -  add_library(cpufeatures STATIC
--    ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c
--  )
+-              ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
 -  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
--  )
+-      ${ANDROID_NDK}/sources/android/cpufeatures)
 -  add_definitions(-DHAVE_CPU_FEATURES_H=1)
 -  set(HAVE_CPU_FEATURES_H 1)
 -else()
@@ -22,5 +20,5 @@ diff -u -r ../libwebp-1.0.0/CMakeLists.txt ./CMakeLists.txt
 -endif()
 +set(HAVE_CPU_FEATURES_H 0)
  
- ################################################################################
- # WebP source files.
+ 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 3a7740961..85fcb9e54 100644
--- a/packages/libwebp/build.sh
+++ b/packages/libwebp/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/webmproject/libwebp
 TERMUX_PKG_DESCRIPTION="Library to encode and decode images in WebP format"
-TERMUX_PKG_VERSION=1.0.0
-TERMUX_PKG_SHA256=c5c5ebf979543ac1f3348df8f6245262abd787a147b9632c880d92bfc38dbbeb
+TERMUX_PKG_VERSION=1.0.1
+TERMUX_PKG_SHA256=c2838544d4898a4bbb6c1d113e0aa50c4bdfc886df0dcfbfa5c42e788cb6f382
 TERMUX_PKG_SRCURL=https://github.com/webmproject/libwebp/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-gif
diff --git a/packages/libwebp/cmake-cpu.cmake.patch b/packages/libwebp/cmake-cpu.cmake.patch
deleted file mode 100644
index c313310da..000000000
--- a/packages/libwebp/cmake-cpu.cmake.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -u -r ../libwebp-1.0.0/cmake/cpu.cmake ./cmake/cpu.cmake
---- ../libwebp-1.0.0/cmake/cpu.cmake	2018-04-21 03:04:55.000000000 +0000
-+++ ./cmake/cpu.cmake	2018-08-26 00:25:11.905018914 +0000
-@@ -45,16 +45,6 @@
- set(WEBP_SIMD_FILES_TO_INCLUDE)
- set(WEBP_SIMD_FLAGS_TO_INCLUDE)
- 
--if(${ANDROID})
--  if(${ANDROID_ABI} STREQUAL "armeabi-v7a")
--    # This is because Android studio uses the configuration
--    # "-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16"
--    # that does not trigger neon optimizations but should
--    # (as this configuration does not exist anymore).
--    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon ")
--  endif()
--endif()
--
- list(LENGTH WEBP_SIMD_FLAGS WEBP_SIMD_FLAGS_LENGTH)
- math(EXPR WEBP_SIMD_FLAGS_RANGE "${WEBP_SIMD_FLAGS_LENGTH} - 1")
-