From 4c8d0f03bba5b054a8b7604740bc3e016e974537 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 14 Mar 2021 19:05:34 -0700 Subject: [PATCH] leptonica: update to 1.80.0 Signed-off-by: Rosen Penev --- libs/leptonica/Makefile | 13 ++++++++----- libs/leptonica/patches/010-webp.patch | 10 ++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 libs/leptonica/patches/010-webp.patch diff --git a/libs/leptonica/Makefile b/libs/leptonica/Makefile index 3fcad2d59..b0155ca57 100644 --- a/libs/leptonica/Makefile +++ b/libs/leptonica/Makefile @@ -8,22 +8,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=leptonica -PKG_VERSION:=1.78.0 -PKG_RELEASE:=3 +PKG_VERSION:=1.80.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.leptonica.org/source/ -PKG_HASH:=e2ed2e81e7a22ddf45d2c05f0bc8b9ae7450545d995bfe28517ba408d14a5a88 +PKG_HASH:=ec9c46c2aefbb960fb6a6b7f800fe39de48343437b6ce08e30a8d9688ed14ba4 PKG_MAINTAINER:=Valentín Kivachuk PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=leptonica-license.txt -PKG_BUILD_PARALLEL:=1 CMAKE_BINARY_SUBDIR:=openwrt-build include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk +include ../../devel/ninja/ninja-cmake.mk define Package/libleptonica SECTION:=libs @@ -33,6 +32,10 @@ define Package/libleptonica DEPENDS:=+giflib +libjpeg +libpng +libtiff +libwebp +zlib endef +CMAKE_OPTIONS += \ + -DBUILD_SHARED_LIBS=ON \ + -DWEBPMUX_INCLUDE_DIR=$(STAGING_DIR)/usr/include + TARGET_CFLAGS:=$(filter-out -O%,$(TARGET_CFLAGS)) -O3 define Build/InstallDev diff --git a/libs/leptonica/patches/010-webp.patch b/libs/leptonica/patches/010-webp.patch new file mode 100644 index 000000000..bd62bf6d9 --- /dev/null +++ b/libs/leptonica/patches/010-webp.patch @@ -0,0 +1,10 @@ +--- a/cmake/Configure.cmake ++++ b/cmake/Configure.cmake +@@ -113,7 +113,6 @@ endif() + + if (WEBP_FOUND) + set(HAVE_LIBWEBP 1) +- set(HAVE_LIBWEBP_ANIM 1) + endif() + + if (ZLIB_FOUND)