From 69cdbb9980233b4305b521ecd1664ea34779ac1f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 20 Feb 2021 20:55:39 -0800 Subject: [PATCH 1/2] libwebp: update to 1.2.0 Switch to AUTORELEASE for easier changes. Fix not having all of the libraries. Remove upstream patches and refresh other one. Signed-off-by: Rosen Penev --- libs/libwebp/Makefile | 8 ++++---- libs/libwebp/patches/010-mips16.patch | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/libwebp/Makefile b/libs/libwebp/Makefile index 34510345b5..def4dc06df 100644 --- a/libs/libwebp/Makefile +++ b/libs/libwebp/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebp -PKG_VERSION:=1.1.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.2.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://storage.googleapis.com/downloads.webmproject.org/releases/webp -PKG_HASH:=98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f50ef043 +PKG_HASH:=2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c PKG_MAINTAINER:= PKG_LICENSE:=BSD-3-Clause @@ -51,7 +51,7 @@ TARGET_CFLAGS += -flto define Package/libwebp/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebp.s* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebp*.s* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libwebp)) diff --git a/libs/libwebp/patches/010-mips16.patch b/libs/libwebp/patches/010-mips16.patch index 3e69770ace..669773d152 100644 --- a/libs/libwebp/patches/010-mips16.patch +++ b/libs/libwebp/patches/010-mips16.patch @@ -1,6 +1,6 @@ --- a/src/dsp/dsp.h +++ b/src/dsp/dsp.h -@@ -95,7 +95,7 @@ extern "C" { +@@ -97,7 +97,7 @@ extern "C" { #define WEBP_USE_INTRINSICS #endif From dc5e0d0ccde55167ee9cfaedfabfb219dea44054 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 20 Feb 2021 21:13:08 -0800 Subject: [PATCH 2/2] libgd: update to 2.3.1 Remove upstreamed patches. Add one to fix finding libwebp. Signed-off-by: Rosen Penev --- libs/libgd/Makefile | 6 +- libs/libgd/patches/010-getlib.patch | 55 ------------------- libs/libgd/patches/010-webp.patch | 25 +++++++++ libs/libgd/patches/100-no-cxx.patch | 2 +- .../patches/220-exclude_host_headers.patch | 11 ---- 5 files changed, 29 insertions(+), 70 deletions(-) delete mode 100644 libs/libgd/patches/010-getlib.patch create mode 100644 libs/libgd/patches/010-webp.patch delete mode 100644 libs/libgd/patches/220-exclude_host_headers.patch diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile index 012eb4381f..ead713bc8e 100644 --- a/libs/libgd/Makefile +++ b/libs/libgd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgd -PKG_VERSION:=2.3.0 -PKG_RELEASE:=3 +PKG_VERSION:=2.3.1 +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:=ecd9155b9a417fb3f837f29e5966323796de247789163761dd72dbf83bfcac58 +PKG_HASH:=9767917d9f818faec4ddd763fe4a4ad9f6322c3d25da290ab2ea3e2ce4b52a7b PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=MIT diff --git a/libs/libgd/patches/010-getlib.patch b/libs/libgd/patches/010-getlib.patch deleted file mode 100644 index cf4de3383b..0000000000 --- a/libs/libgd/patches/010-getlib.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 635dd9a3065ed88e1741e6b963044b80e913f96a Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 24 Mar 2020 08:01:01 +0100 -Subject: [PATCH] distribute getlib.sh - ---- - config/getlib.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 42 insertions(+) - create mode 100755 config/getlib.sh - ---- /dev/null -+++ b/config/getlib.sh -@@ -0,0 +1,42 @@ -+#!/bin/sh -+ -+GETVER="${0%/*}/getver.pl" -+GDLIB_MAJOR=$("${GETVER}" MAJOR) -+GDLIB_MINOR=$("${GETVER}" MINOR) -+GDLIB_REVISION=$("${GETVER}" RELEASE) -+ -+# Dynamic library version information -+# See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info -+ -+GDLIB_LT_CURRENT=3 -+# This is the version where the soname (current above) changes. We use it -+# to reset the revision base back to zero. It's a bit of a pain, but some -+# systems restrict the revision range below to [0..255] (like OS X). -+GDLIB_PREV_MAJOR=2 -+GDLIB_PREV_MINOR=2 -+# This isn't 100% correct, but it tends to be a close enough approximation -+# for how we manage the codebase. It's rare to do a release that doesn't -+# modify the library since this project is centered around the library. -+GDLIB_LT_REVISION=$(( ((GDLIB_MAJOR - GDLIB_PREV_MAJOR) << 6) | ((GDLIB_MINOR - GDLIB_PREV_MINOR) << 3) | GDLIB_REVISION )) -+GDLIB_LT_AGE=0 -+ -+# The first three fields we feed into libtool and the OS target determines how -+# they get used. The last two fields we feed into cmake. We use the same rules -+# as Linux SONAME versioning in libtool, but cmake should handle it for us. -+case $1 in -+CURRENT) -+ printf '%s' "${GDLIB_LT_CURRENT}" -+ ;; -+REVISION) -+ printf '%s' "${GDLIB_LT_REVISION}" -+ ;; -+AGE) -+ printf '%s' "${GDLIB_LT_AGE}" -+ ;; -+VERSION) -+ printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE )).${GDLIB_LT_AGE}.${GDLIB_LT_REVISION}" -+ ;; -+SONAME) -+ printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE ))" -+ ;; -+esac diff --git a/libs/libgd/patches/010-webp.patch b/libs/libgd/patches/010-webp.patch new file mode 100644 index 0000000000..1aa49c5736 --- /dev/null +++ b/libs/libgd/patches/010-webp.patch @@ -0,0 +1,25 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -116,7 +116,7 @@ else (USE_EXT_GD) + endif (ENABLE_ICONV) + + IF (ENABLE_WEBP) +- FIND_PACKAGE(WEBP REQUIRED) ++ FIND_PACKAGE(WebP REQUIRED) + ENDIF (ENABLE_WEBP) + + IF (ENABLE_LIQ) +@@ -166,10 +166,10 @@ else (USE_EXT_GD) + LIST(APPEND PKG_REQUIRES_PRIVATES zlib) + ENDIF(ZLIB_FOUND) + +- IF(WEBP_FOUND) +- INCLUDE_DIRECTORIES(${WEBP_INCLUDE_DIR}) ++ IF(WebP_FOUND) ++ INCLUDE_DIRECTORIES(${WebP_INCLUDE_DIR}) + SET(HAVE_LIBWEBP 1) +- ENDIF(WEBP_FOUND) ++ ENDIF(WebP_FOUND) + + IF(PNG_FOUND) + INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) diff --git a/libs/libgd/patches/100-no-cxx.patch b/libs/libgd/patches/100-no-cxx.patch index 790ddd4c99..d73a7ebc64 100644 --- a/libs/libgd/patches/100-no-cxx.patch +++ b/libs/libgd/patches/100-no-cxx.patch @@ -18,7 +18,7 @@ gdtables.c gdxpm.c jisx0208.h -@@ -198,7 +194,6 @@ install(FILES +@@ -204,7 +200,6 @@ install(FILES gdfonts.h gdfontt.h gdfx.h diff --git a/libs/libgd/patches/220-exclude_host_headers.patch b/libs/libgd/patches/220-exclude_host_headers.patch deleted file mode 100644 index 3e6fc6c974..0000000000 --- a/libs/libgd/patches/220-exclude_host_headers.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,8 +94,6 @@ else (USE_EXT_GD) - GV_LT(VERSION GDLIB_LIB_VERSION) - MESSAGE(STATUS "gd shared lib version ${GDLIB_LIB_SOVERSION} (${GDLIB_LIB_VERSION})") - -- SET(CMAKE_REQUIRED_INCLUDES "/usr/include" "/usr/local/include") -- - include(CheckIncludeFiles) - include(CheckIncludeFile) -