diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-03-20 18:26:12 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2021-03-20 21:05:40 -0700 |
| commit | 83c45e18a824c9e30a5518d152328630f2a83c87 (patch) | |
| tree | 86327b33667b552c2e46471a7d8a45acb9793017 /libs/libgd | |
| parent | e5d61027a9d0f0bde578ab689a9a8f1b7db4af13 (diff) | |
libgd: update to 2.3.2
Switch to building with Ninja for faster compilation.
Refreshed patches.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'libs/libgd')
| -rw-r--r-- | libs/libgd/Makefile | 8 | ||||
| -rw-r--r-- | libs/libgd/patches/010-webp.patch | 10 | ||||
| -rw-r--r-- | libs/libgd/patches/100-no-cxx.patch | 6 |
3 files changed, 11 insertions, 13 deletions
diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile index ead713bc8..49ad7003c 100644 --- a/libs/libgd/Makefile +++ b/libs/libgd/Makefile @@ -8,22 +8,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgd -PKG_VERSION:=2.3.1 +PKG_VERSION:=2.3.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/gd-$(PKG_VERSION)/ -PKG_HASH:=9767917d9f818faec4ddd763fe4a4ad9f6322c3d25da290ab2ea3e2ce4b52a7b +PKG_HASH:=478a047084e0d89b83616e4c2cf3c9438175fb0cc55d8c8967f06e0427f7d7fb PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:libgd:libgd -PKG_BUILD_PARALLEL:=1 - include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk +include ../../devel/ninja/ninja-cmake.mk define Package/libgd/default SECTION:=libs diff --git a/libs/libgd/patches/010-webp.patch b/libs/libgd/patches/010-webp.patch index 1aa49c573..e68a8ac53 100644 --- a/libs/libgd/patches/010-webp.patch +++ b/libs/libgd/patches/010-webp.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -116,7 +116,7 @@ else (USE_EXT_GD) +@@ -118,7 +118,7 @@ else (USE_EXT_GD) endif (ENABLE_ICONV) IF (ENABLE_WEBP) @@ -8,8 +8,8 @@ + FIND_PACKAGE(WebP REQUIRED) ENDIF (ENABLE_WEBP) - IF (ENABLE_LIQ) -@@ -166,10 +166,10 @@ else (USE_EXT_GD) + IF (ENABLE_HEIF) +@@ -179,10 +179,10 @@ else (USE_EXT_GD) LIST(APPEND PKG_REQUIRES_PRIVATES zlib) ENDIF(ZLIB_FOUND) @@ -21,5 +21,5 @@ - ENDIF(WEBP_FOUND) + ENDIF(WebP_FOUND) - IF(PNG_FOUND) - INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) + IF(HEIF_FOUND) + INCLUDE_DIRECTORIES(${HEIF_INCLUDE_DIR}) diff --git a/libs/libgd/patches/100-no-cxx.patch b/libs/libgd/patches/100-no-cxx.patch index d73a7ebc6..3deb6cc94 100644 --- a/libs/libgd/patches/100-no-cxx.patch +++ b/libs/libgd/patches/100-no-cxx.patch @@ -1,6 +1,6 @@ --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -22,8 +22,6 @@ SET (LIBGD_SRC_FILES +@@ -24,8 +24,6 @@ SET (LIBGD_SRC_FILES gd_io_dp.c gd_io_file.c gd_io_ss.c @@ -9,7 +9,7 @@ gd_jpeg.c gd_matrix.c gd_nnquant.c -@@ -59,8 +57,6 @@ SET (LIBGD_SRC_FILES +@@ -61,8 +59,6 @@ SET (LIBGD_SRC_FILES gdhelpers.c gdhelpers.h gdkanji.c @@ -18,7 +18,7 @@ gdtables.c gdxpm.c jisx0208.h -@@ -204,7 +200,6 @@ install(FILES +@@ -203,7 +199,6 @@ install(FILES gdfonts.h gdfontt.h gdfx.h |