Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libwebp: bump to version 1.2.3

Browse source 
Drop upstreamed patch '001-fix-cmake-webpmux-linking.patch'.
Re-adapted patch '010-mips16.patch'

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean 2022-07-18 18:21:46 +03:00 committed by Hannu Nyman
parent 281d156a35
commit a125119195
3 changed files with 8 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/libwebp/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libwebp
PKG_VERSION:=1.2.1
PKG_VERSION:=1.2.3
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:=808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018
PKG_HASH:=f5d7ab2390b06b8a934a4fc35784291b3885b557780d099bd32f09241f9d83f9
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_LICENSE:=BSD-3-Clause

55
libs/libwebp/patches/001-fix-cmake-webpmux-linking.patch
View file

@ -1,55 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -471,19 +471,18 @@ endif()
if(WEBP_BUILD_LIBWEBPMUX)
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "")
- add_library(libwebpmux ${WEBP_MUX_SRCS})
- target_link_libraries(libwebpmux webp)
- target_include_directories(libwebpmux
+ add_library(webpmux ${WEBP_MUX_SRCS})
+ target_link_libraries(webpmux webp)
+ target_include_directories(webpmux
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR})
- set_version(mux/Makefile.am libwebpmux webpmux)
- set_target_properties(libwebpmux
+ set_version(mux/Makefile.am webpmux webpmux)
+ set_target_properties(webpmux
PROPERTIES PUBLIC_HEADER
"${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\
${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\
${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;")
- set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux)
- list(APPEND INSTALLED_LIBRARIES libwebpmux)
+ list(APPEND INSTALLED_LIBRARIES webpmux)
configure_pkg_config("src/mux/libwebpmux.pc")
endif()
@@ -497,7 +496,7 @@ if(WEBP_BUILD_GIF2WEBP)
exampleutil
imageioutil
webp
- libwebpmux
+ webpmux
${WEBP_DEP_GIF_LIBRARIES})
target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
install(TARGETS gif2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -514,7 +513,7 @@ if(WEBP_BUILD_IMG2WEBP)
imagedec
imageioutil
webp
- libwebpmux)
+ webpmux)
target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
install(TARGETS img2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
@@ -563,7 +562,7 @@ if(WEBP_BUILD_WEBPMUX)
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "WEBPMUX_SRCS"
"webpmux")
add_executable(webpmux ${WEBPMUX_SRCS})
- target_link_libraries(webpmux exampleutil imageioutil libwebpmux webp)
+ target_link_libraries(webpmux exampleutil imageioutil webpmux webp)
target_include_directories(webpmux PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
install(TARGETS webpmux RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()

12
libs/libwebp/patches/010-mips16.patch
View file

@ -1,11 +1,11 @@
--- a/src/dsp/dsp.h
+++ b/src/dsp/dsp.h
@@ -128,7 +128,7 @@ extern "C" {
--- a/src/dsp/cpu.h
+++ b/src/dsp/cpu.h
@@ -106,7 +106,7 @@
#define WEBP_HAVE_NEON
#endif
-#if defined(__mips__) && !defined(__mips64) && \
+#if defined(__mips__) && !defined(__mips16) && !defined(__mips64) && \
defined(__mips_isa_rev) && (__mips_isa_rev >= 1) && (__mips_isa_rev < 6)
-#if defined(__mips__) && !defined(__mips64) && defined(__mips_isa_rev) && \
+#if defined(__mips__) && !defined(__mips16) && !defined(__mips64) && defined(__mips_isa_rev) && \
(__mips_isa_rev >= 1) && (__mips_isa_rev < 6)
#define WEBP_USE_MIPS32
#if (__mips_isa_rev >= 2)