strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libwebp: Upgrade to 1.4.0

Browse source 
Change-Id: I196316b0c7efbe27c06b8dfed90db5248db6dce4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166185
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli 2024-04-17 16:54:13 +02:00
parent 828c1999e0
commit f1c8804636
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download.lst
View file

@ -414,8 +414,8 @@ LIBTOMMATH_TARBALL := ltm-1.3.0.tar.xz
# three static lines # three static lines
# so that git cherry-pick # so that git cherry-pick
# will not run into conflicts # will not run into conflicts
LIBWEBP_SHA256SUM := 2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4 LIBWEBP_SHA256SUM := 61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5
LIBWEBP_TARBALL := libwebp-1.3.2.tar.gz LIBWEBP_TARBALL := libwebp-1.4.0.tar.gz
# three static lines # three static lines
# so that git cherry-pick # so that git cherry-pick
# will not run into conflicts # will not run into conflicts

21
external/libwebp/Makefile.vc.patch vendored
View file

@ -1,6 +1,6 @@
--- Makefile.vc.sav 2021-07-30 00:55:37.000000000 +0200 --- Makefile.vc.sav 2021-07-30 00:55:37.000000000 +0200
+++ Makefile.vc 2022-01-25 17:35:30.206117700 +0100 +++ Makefile.vc 2022-01-25 17:35:30.206117700 +0100
@@ -8,11 +8,11 @@ @@ -8,13 +8,13 @@
LIBSHARPYUV_BASENAME = libsharpyuv LIBSHARPYUV_BASENAME = libsharpyuv
!IFNDEF ARCH !IFNDEF ARCH
@ -10,12 +10,15 @@
-!ELSE IF ! [ cl 2>&1 | find "x64" > NUL ] -!ELSE IF ! [ cl 2>&1 | find "x64" > NUL ]
+!ELSE IF ! [ $(CC) 2>&1 | grep -q "x64" > NUL ] +!ELSE IF ! [ $(CC) 2>&1 | grep -q "x64" > NUL ]
ARCH = x64 ARCH = x64
-!ELSE IF ! [ cl 2>&1 | find "ARM64" > NUL ]
+!ELSE IF ! [ $(CC) 2>&1 | grep -q "ARM64" > NUL ]
ARCH = ARM64
-!ELSE IF ! [ cl 2>&1 | find "ARM" > NUL ] -!ELSE IF ! [ cl 2>&1 | find "ARM" > NUL ]
+!ELSE IF ! [ $(CC) 2>&1 | grep -q "ARM" > NUL ] +!ELSE IF ! [ $(CC) 2>&1 | grep -q "ARM" > NUL ]
ARCH = ARM ARCH = ARM
!ELSE !ELSE
!ERROR Unable to auto-detect toolchain architecture! \ !ERROR Unable to auto-detect toolchain architecture! \
@@ -28,8 +28,8 @@ @@ -30,8 +30,8 @@
## Nothing more to do below this line! ## Nothing more to do below this line!
NOLOGO = /nologo NOLOGO = /nologo
@ -26,7 +29,7 @@
CFLAGS = /I. /Isrc $(NOLOGO) /W3 /EHsc /c CFLAGS = /I. /Isrc $(NOLOGO) /W3 /EHsc /c
CFLAGS = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN CFLAGS = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN
LDFLAGS = /LARGEADDRESSAWARE /MANIFEST:EMBED /NXCOMPAT /DYNAMICBASE LDFLAGS = /LARGEADDRESSAWARE /MANIFEST:EMBED /NXCOMPAT /DYNAMICBASE
@@ -67,7 +67,7 @@ @@ -69,7 +69,7 @@
RTLIB = /MD RTLIB = /MD
RTLIBD = /MDd RTLIBD = /MDd
!ENDIF !ENDIF
@ -35,7 +38,7 @@
DIROBJ = $(DIRBASE)\obj DIROBJ = $(DIRBASE)\obj
DIRLIB = $(DIRBASE)\lib DIRLIB = $(DIRBASE)\lib
DIRINC = $(DIRBASE)\include DIRINC = $(DIRBASE)\include
@@ -87,10 +87,10 @@ @@ -89,10 +89,10 @@
# Target configuration # Target configuration
!IF "$(CFG)" == "release-static" !IF "$(CFG)" == "release-static"
@ -48,7 +51,7 @@
RTLIB = $(RTLIBD) RTLIB = $(RTLIBD)
STATICLIBBUILD = TRUE STATICLIBBUILD = TRUE
LIBWEBPDECODER_BASENAME = $(LIBWEBPDECODER_BASENAME)_debug LIBWEBPDECODER_BASENAME = $(LIBWEBPDECODER_BASENAME)_debug
@@ -99,11 +99,11 @@ @@ -101,11 +101,11 @@
LIBWEBPDEMUX_BASENAME = $(LIBWEBPDEMUX_BASENAME)_debug LIBWEBPDEMUX_BASENAME = $(LIBWEBPDEMUX_BASENAME)_debug
LIBSHARPYUV_BASENAME = $(LIBSHARPYUV_BASENAME)_debug LIBSHARPYUV_BASENAME = $(LIBSHARPYUV_BASENAME)_debug
!ELSE IF "$(CFG)" == "release-dynamic" !ELSE IF "$(CFG)" == "release-dynamic"
@ -62,7 +65,7 @@
RC = $(RCDEBUG) RC = $(RCDEBUG)
RTLIB = $(RTLIBD) RTLIB = $(RTLIBD)
DLLBUILD = TRUE DLLBUILD = TRUE
@@ -115,7 +115,7 @@ @@ -117,7 +117,7 @@
!ENDIF !ENDIF
!IF "$(STATICLIBBUILD)" == "TRUE" !IF "$(STATICLIBBUILD)" == "TRUE"
@ -71,7 +74,7 @@
CFGSET = TRUE CFGSET = TRUE
LIBWEBPDECODER = $(DIRLIB)\$(LIBWEBPDECODER_BASENAME).lib LIBWEBPDECODER = $(DIRLIB)\$(LIBWEBPDECODER_BASENAME).lib
LIBWEBP = $(DIRLIB)\$(LIBWEBP_BASENAME).lib LIBWEBP = $(DIRLIB)\$(LIBWEBP_BASENAME).lib
@@ -123,7 +123,7 @@ @@ -125,7 +125,7 @@
LIBWEBPDEMUX = $(DIRLIB)\$(LIBWEBPDEMUX_BASENAME).lib LIBWEBPDEMUX = $(DIRLIB)\$(LIBWEBPDEMUX_BASENAME).lib
LIBSHARPYUV = $(DIRLIB)\$(LIBSHARPYUV_BASENAME).lib LIBSHARPYUV = $(DIRLIB)\$(LIBSHARPYUV_BASENAME).lib
!ELSE IF "$(DLLBUILD)" == "TRUE" !ELSE IF "$(DLLBUILD)" == "TRUE"
@ -80,7 +83,7 @@
LIBWEBPDECODER = $(DIRLIB)\$(LIBWEBPDECODER_BASENAME)_dll.lib LIBWEBPDECODER = $(DIRLIB)\$(LIBWEBPDECODER_BASENAME)_dll.lib
LIBWEBP = $(DIRLIB)\$(LIBWEBP_BASENAME)_dll.lib LIBWEBP = $(DIRLIB)\$(LIBWEBP_BASENAME)_dll.lib
LIBWEBPMUX = $(DIRLIB)\$(LIBWEBPMUX_BASENAME)_dll.lib LIBWEBPMUX = $(DIRLIB)\$(LIBWEBPMUX_BASENAME)_dll.lib
@@ -434,7 +434,7 @@ @@ -438,7 +438,7 @@
!IF "$(DLLBUILD)" == "TRUE" !IF "$(DLLBUILD)" == "TRUE"
{$(DIROBJ)}.c{$(DIROBJ)}.obj: {$(DIROBJ)}.c{$(DIROBJ)}.obj:
@ -89,7 +92,7 @@
{src}.rc{$(DIROBJ)}.res: {src}.rc{$(DIROBJ)}.res:
$(RC) /fo$@ $< $(RC) /fo$@ $<
@@ -467,41 +467,41 @@ @@ -471,41 +471,41 @@
# File-specific flag builds. Note batch rules take precedence over wildcards, # File-specific flag builds. Note batch rules take precedence over wildcards,
# so for now name each file individually. # so for now name each file individually.
$(DIROBJ)\examples\anim_diff.obj: examples\anim_diff.c $(DIROBJ)\examples\anim_diff.obj: examples\anim_diff.c