leptonica: update to 1.84.1

- remove upstreamed patch
- explicitly disable openjpeg to ignore host-installed library
- fix .cmake and .pc paths

Signed-off-by: krant <aleksey.vasilenko@gmail.com>

diff --git a/libs/leptonica/Makefile b/libs/leptonica/Makefile
index 79b055981ba766a1699be8ca111e07f5d70fe54a..e8fd80bc4e3ac090b36c9e00da4db3e1598c27bb 100644 (file)
--- a/libs/leptonica/Makefile
+++ b/libs/leptonica/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=leptonica
-PKG_VERSION:=1.80.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.84.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.leptonica.org/source/
-PKG_HASH:=ec9c46c2aefbb960fb6a6b7f800fe39de48343437b6ce08e30a8d9688ed14ba4
+PKG_HASH:=2b3e1254b1cca381e77c819b59ca99774ff43530209b9aeb511e1d46588a64f6
 
 PKG_MAINTAINER:=Valentín Kivachuk <vk18496@gmail.com>
 PKG_LICENSE:=BSD-2-Clause
@@ -34,6 +34,7 @@ endef
 
 CMAKE_OPTIONS += \
        -DBUILD_SHARED_LIBS=ON \
+       -DENABLE_OPENJPEG=OFF \
        -DWEBPMUX_INCLUDE_DIR=$(STAGING_DIR)/usr/include
 
 TARGET_CFLAGS:=$(filter-out -O%,$(TARGET_CFLAGS)) -O3
@@ -44,9 +45,9 @@ define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libleptonica.so* $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/lib/cmake
-       $(CP) $(PKG_INSTALL_DIR)/usr/cmake/*.cmake $(1)/usr/lib/cmake/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake/leptonica/*.cmake $(1)/usr/lib/cmake/
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lept.pc $(1)/usr/lib/pkgconfig/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lept_Release.pc $(1)/usr/lib/pkgconfig/lept.pc
 endef
 
 define Package/libleptonica/install

diff --git a/libs/leptonica/patches/010-webp.patch b/libs/leptonica/patches/010-webp.patch
deleted file mode 100644 (file)
index bd62bf6..0000000
--- a/libs/leptonica/patches/010-webp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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)