download.lst | 4 ++--
external/libwebp/Makefile.vc.patch | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit aa571bf0a4b2c7bfe4b044ac27f98393c95bae8e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Sep 14 19:20:31 2022 +0900
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Sep 17 21:54:07 2022 +0200
upgrade to libwebp-1.2.4
Change-Id: Iaa3872345abcc2b9042abb32a824ff4b95ec57b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139989
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/download.lst b/download.lst
index 3fe0bf0e039f..1f0c22727e30 100644
--- a/download.lst
+++ b/download.lst
@@ -158,8 +158,8 @@ export LIBNUMBERTEXT_SHA256SUM :=
a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31f
export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.10.tar.xz
export LIBTOMMATH_SHA256SUM :=
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
export LIBTOMMATH_TARBALL := ltm-1.0.zip
-export LIBWEBP_SHA256SUM :=
7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6
-export LIBWEBP_TARBALL := libwebp-1.2.2.tar.gz
+export LIBWEBP_SHA256SUM :=
7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df
+export LIBWEBP_TARBALL := libwebp-1.2.4.tar.gz
export XMLSEC_SHA256SUM :=
52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262
export XMLSEC_TARBALL := xmlsec1-1.2.34.tar.gz
export LIBXML_SHA256SUM :=
d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265
diff --git a/external/libwebp/Makefile.vc.patch
b/external/libwebp/Makefile.vc.patch
index 653998319b82..f13c12410e46 100644
--- a/external/libwebp/Makefile.vc.patch
+++ b/external/libwebp/Makefile.vc.patch
@@ -25,7 +25,7 @@
+CCDEBUG = $(CC) $(NOLOGO) /Od /Zi /D_DEBUG /RTC1
CFLAGS = /I. /Isrc $(NOLOGO) /W3 /EHsc /c
CFLAGS = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN
- LDFLAGS = /LARGEADDRESSAWARE /MANIFEST /NXCOMPAT /DYNAMICBASE
+ LDFLAGS = /LARGEADDRESSAWARE /MANIFEST:EMBED /NXCOMPAT /DYNAMICBASE
@@ -67,7 +67,7 @@
RTLIB = /MD
RTLIBD = /MDd
@@ -89,7 +89,7 @@
{src}.rc{$(DIROBJ)}.res:
$(RC) /fo$@ $<
-@@ -461,39 +461,39 @@
+@@ -469,41 +469,41 @@
# File-specific flag builds. Note batch rules take precedence over wildcards,
# so for now name each file individually.
$(DIROBJ)\examples\anim_diff.obj: examples\anim_diff.c
@@ -122,6 +122,9 @@
{imageio}.c{$(DIROBJ)\imageio}.obj::
- $(CC) $(CFLAGS) /Fd$(DIROBJ)\imageio\ /Fo$(DIROBJ)\imageio\ $<
+ $(CC_) $(CFLAGS) /Fd$(DIROBJ)\imageio\ /Fo$(DIROBJ)\imageio\ $<
+ {sharpyuv}.c{$(DIROBJ)\sharpyuv}.obj::
+- $(CC) $(CFLAGS) /Fd$(DIROBJ)\sharpyuv\ /Fo$(DIROBJ)\sharpyuv\ $<
++ $(CC_) $(CFLAGS) /Fd$(DIROBJ)\sharpyuv\ /Fo$(DIROBJ)\sharpyuv\ $<
{src\dec}.c{$(DIROBJ)\dec}.obj::
- $(CC) $(CFLAGS) /Fd$(LIBWEBP_PDBNAME) /Fo$(DIROBJ)\dec\ $<
+ $(CC_) $(CFLAGS) /Fd$(LIBWEBP_PDBNAME) /Fo$(DIROBJ)\dec\ $<
