diff options
author | Caolán McNamara <caolanm@redhat.com> | 2022-12-29 20:36:07 +0000 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-04-04 22:52:32 +0200 |
commit | e4474f8d00bc32c70d1342e6bf4f721e4f2df9a5 (patch) | |
tree | 316febaa32ba8d851bcc238973e9a06d65ee9212 | |
parent | tdf#151971: Fix used implementation names of transliteration services (diff) | |
download | core-e4474f8d00bc32c70d1342e6bf4f721e4f2df9a5.tar.gz core-e4474f8d00bc32c70d1342e6bf4f721e4f2df9a5.zip |
Related: ofz Use-of-uninitialized-value
Change-Id: I2f6e726f713836295603bf7112371aa4aff2c7c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144868
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150011
-rw-r--r-- | RepositoryExternal.mk | 1 | ||||
-rwxr-xr-x | bin/lo-all-static-libs | 1 | ||||
-rw-r--r-- | download.lst | 4 | ||||
-rw-r--r-- | external/libwebp/Makefile.vc.patch | 28 |
4 files changed, 18 insertions, 16 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ad8f0204cd4e..92ea4ba17670 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2693,6 +2693,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ else $(call gb_LinkTarget_add_libs,$(1),\ -L$(call gb_UnpackedTarball_get_dir,libwebp)/src/.libs -lwebp \ + -L$(call gb_UnpackedTarball_get_dir,libwebp)/sharpyuv/.libs -lsharpyuv \ ) endif $(call gb_LinkTarget_use_external_project,$(1),libwebp) diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index af4ff25f348b..3db8d803d07a 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -125,6 +125,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \ $WORKDIR/UnpackedTarball/libvisio/src/lib/.libs/*.a \ $WORKDIR/UnpackedTarball/libtiff/libtiff/.libs/*.a \ $WORKDIR/UnpackedTarball/libwebp/src/.libs/*.a \ + $WORKDIR/UnpackedTarball/libwebp/sharpyuv/.libs/*.a \ $WORKDIR/UnpackedTarball/libwp?/src/lib/.libs/*.a \ $WORKDIR/UnpackedTarball/raptor/src/.libs/*.a \ $WORKDIR/UnpackedTarball/rasqal/src/.libs/*.a \ diff --git a/download.lst b/download.lst index e4332f8de06c..f9867db2cf53 100644 --- a/download.lst +++ b/download.lst @@ -330,8 +330,8 @@ LIBTOMMATH_TARBALL := ltm-1.0.zip # three static lines # so that git cherry-pick # will not run into conflicts -LIBWEBP_SHA256SUM := 7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df -LIBWEBP_TARBALL := libwebp-1.2.4.tar.gz +LIBWEBP_SHA256SUM := 17fd427d210702a595f08ec619afa2cd3bd323f838ad109666482eac8fff65f0 +LIBWEBP_TARBALL := libwebp-1.3.0-rc1.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/libwebp/Makefile.vc.patch b/external/libwebp/Makefile.vc.patch index f13c12410e46..41c899921a1c 100644 --- a/external/libwebp/Makefile.vc.patch +++ b/external/libwebp/Makefile.vc.patch @@ -1,7 +1,7 @@ --- Makefile.vc.sav 2021-07-30 00:55:37.000000000 +0200 +++ Makefile.vc 2022-01-25 17:35:30.206117700 +0100 -@@ -7,11 +7,11 @@ - LIBWEBPDEMUX_BASENAME = libwebpdemux +@@ -8,11 +8,11 @@ + LIBSHARPYUV_BASENAME = libsharpyuv !IFNDEF ARCH -!IF ! [ cl 2>&1 | find "x86" > NUL ] @@ -15,7 +15,7 @@ ARCH = ARM !ELSE !ERROR Unable to auto-detect toolchain architecture! \ -@@ -27,8 +27,8 @@ +@@ -28,8 +28,8 @@ ## Nothing more to do below this line! NOLOGO = /nologo @@ -35,7 +35,7 @@ DIROBJ = $(DIRBASE)\obj DIRLIB = $(DIRBASE)\lib DIRINC = $(DIRBASE)\include -@@ -86,10 +86,10 @@ +@@ -87,10 +87,10 @@ # Target configuration !IF "$(CFG)" == "release-static" @@ -48,9 +48,9 @@ RTLIB = $(RTLIBD) STATICLIBBUILD = TRUE LIBWEBPDECODER_BASENAME = $(LIBWEBPDECODER_BASENAME)_debug -@@ -97,11 +97,11 @@ - LIBWEBPMUX_BASENAME = $(LIBWEBPMUX_BASENAME)_debug +@@ -99,11 +99,11 @@ LIBWEBPDEMUX_BASENAME = $(LIBWEBPDEMUX_BASENAME)_debug + LIBSHARPYUV_BASENAME = $(LIBSHARPYUV_BASENAME)_debug !ELSE IF "$(CFG)" == "release-dynamic" -CC = $(CCNODBG) +CC_ = $(CCNODBG) @@ -62,7 +62,7 @@ RC = $(RCDEBUG) RTLIB = $(RTLIBD) DLLBUILD = TRUE -@@ -112,7 +112,7 @@ +@@ -115,7 +115,7 @@ !ENDIF !IF "$(STATICLIBBUILD)" == "TRUE" @@ -71,25 +71,25 @@ CFGSET = TRUE LIBWEBPDECODER = $(DIRLIB)\$(LIBWEBPDECODER_BASENAME).lib LIBWEBP = $(DIRLIB)\$(LIBWEBP_BASENAME).lib -@@ -120,7 +120,7 @@ +@@ -123,7 +123,7 @@ LIBWEBPDEMUX = $(DIRLIB)\$(LIBWEBPDEMUX_BASENAME).lib + LIBSHARPYUV = $(DIRLIB)\$(LIBSHARPYUV_BASENAME).lib !ELSE IF "$(DLLBUILD)" == "TRUE" - DLLINC = webp_dll.h --CC = $(CC) /I$(DIROBJ) /FI$(DLLINC) $(RTLIB) /DWEBP_DLL -+CC_ = $(CC_) /I$(DIROBJ) /FI$(DLLINC) $(RTLIB) /DWEBP_DLL +-CC = $(CC) /I$(DIROBJ) $(RTLIB) /DWEBP_DLL ++CC_ = $(CC_) /I$(DIROBJ) $(RTLIB) /DWEBP_DLL LIBWEBPDECODER = $(DIRLIB)\$(LIBWEBPDECODER_BASENAME)_dll.lib LIBWEBP = $(DIRLIB)\$(LIBWEBP_BASENAME)_dll.lib LIBWEBPMUX = $(DIRLIB)\$(LIBWEBPMUX_BASENAME)_dll.lib -@@ -421,7 +421,7 @@ - $(DIROBJ)\$(DLLINC) +@@ -434,7 +434,7 @@ + !IF "$(DLLBUILD)" == "TRUE" {$(DIROBJ)}.c{$(DIROBJ)}.obj: - $(CC) $(CFLAGS) /Fd$(LIBWEBP_PDBNAME) /Fo$@ $< + $(CC_) $(CFLAGS) /Fd$(LIBWEBP_PDBNAME) /Fo$@ $< {src}.rc{$(DIROBJ)}.res: $(RC) /fo$@ $< -@@ -469,41 +469,41 @@ +@@ -467,41 +467,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 |