aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2020-05-12 20:18:08 -0700
committerGitHub <noreply@github.com>2020-05-12 20:18:08 -0700
commite86560c0c12849ad5195a8f33a2ef5a7c8c5a681 (patch)
tree36a7ad3269193ce5fc9d0cef483704330cd19008
parentfedc2804bc070ec470d89ce30c7c6525f5589284 (diff)
parent61efe7dc3e58987a99d6f1db227b9bd809a96520 (diff)
Merge pull request #12137 from neheb/webp
libwebp: update to 1.1.0
-rw-r--r--libs/libwebp/Makefile49
1 files changed, 18 insertions, 31 deletions
diff --git a/libs/libwebp/Makefile b/libs/libwebp/Makefile
index a82af951a..bb0ce974b 100644
--- a/libs/libwebp/Makefile
+++ b/libs/libwebp/Makefile
@@ -1,21 +1,22 @@
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
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
-
-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
+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 += -flto
define Package/libwebp/install
$(INSTALL_DIR) $(1)/usr/lib