On Wed May 21, 2025 at 07:09:03AM +0200, Rafael Sadowski wrote: > Simple update libwebp-1.5.0. Tested on amd64. OK? > > Cheers Rafael >
New diff with patches/patch-examples_cwebp_c diff --git a/graphics/libwebp/Makefile b/graphics/libwebp/Makefile index 57dc17bf963..180225ddaf4 100755 --- a/graphics/libwebp/Makefile +++ b/graphics/libwebp/Makefile @@ -2,7 +2,7 @@ COMMENT= Google WebP image format conversion tool GH_ACCOUNT= webmproject GH_PROJECT= libwebp -GH_TAGNAME= v1.4.0 +GH_TAGNAME= v1.5.0 CATEGORIES= graphics SHARED_LIBS += sharpyuv 0.1 # 0.0 @@ -16,28 +16,17 @@ HOMEPAGE= https://developers.google.com/speed/webp/ # BSD PERMIT_PACKAGE= Yes -WANTLIB= c gif jpeg lzma m png pthread tiff z zstd +WANTLIB += GL GLU Xi Xmu c gif glut jpeg m png pthread tiff z -LIB_DEPENDS= graphics/giflib \ +MODULES = devel/cmake + +LIB_DEPENDS= graphics/freeglut \ + graphics/giflib \ graphics/jpeg \ graphics/png \ graphics/tiff -AUTOCONF_VERSION= 2.69 -AUTOMAKE_VERSION= 1.15 - -CONFIGURE_STYLE=autoreconf - -CONFIGURE_ARGS= --enable-everything - -# this will use libSDL to build stuff under extras otherwise -# (a static webp viewer which is more or less useless, and not -# even installed by default) -CONFIGURE_ARGS +=--disable-gl \ - --disable-sdl - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=ON DEBUG_PACKAGES= ${BUILD_PACKAGES} diff --git a/graphics/libwebp/distinfo b/graphics/libwebp/distinfo index a0967ea75de..ee0166d70df 100644 --- a/graphics/libwebp/distinfo +++ b/graphics/libwebp/distinfo @@ -1,2 +1,2 @@ -SHA256 (libwebp-1.4.0.tar.gz) = Eq9QxFUw8KKS05qI2VJjfkP7LUqxiDxErnKYQPcnM4E= -SIZE (libwebp-1.4.0.tar.gz) = 3800514 +SHA256 (libwebp-1.5.0.tar.gz) = ZoyaukVWXiTCfhf3qvcGCjmffzHbpsl6BE4f6suTDzc= +SIZE (libwebp-1.5.0.tar.gz) = 3821241 diff --git a/graphics/libwebp/patches/patch-examples_cwebp_c b/graphics/libwebp/patches/patch-examples_cwebp_c new file mode 100644 index 00000000000..ee51261ef1c --- /dev/null +++ b/graphics/libwebp/patches/patch-examples_cwebp_c @@ -0,0 +1,18 @@ +cwebp.c:186:47: error: no member named 'cross_color_transform_bits' in 'struct WebPAuxStats' + +Index: examples/cwebp.c +--- examples/cwebp.c.orig ++++ examples/cwebp.c +@@ -182,9 +182,9 @@ static void PrintFullLosslessInfo(const WebPAuxStats* + if (stats->lossless_features & 1) { + fprintf(stderr, " prediction=%d", stats->transform_bits); + } +- if (stats->lossless_features & 2) { +- fprintf(stderr, " cross-color=%d", stats->cross_color_transform_bits); +- } ++ //if (stats->lossless_features & 2) { ++ // fprintf(stderr, " cross-color=%d", stats->cross_color_transform_bits); ++ //} + fprintf(stderr, " cache=%d\n", stats->cache_bits); + if (stats->palette_size > 0) { + fprintf(stderr, " * Palette size: %d\n", stats->palette_size); diff --git a/graphics/libwebp/pkg/PLIST b/graphics/libwebp/pkg/PLIST index 56539d77e54..f40a5e69be3 100644 --- a/graphics/libwebp/pkg/PLIST +++ b/graphics/libwebp/pkg/PLIST @@ -2,6 +2,7 @@ @bin bin/dwebp @bin bin/gif2webp @bin bin/img2webp +@bin bin/vwebp @bin bin/webpinfo @bin bin/webpmux include/webp/ @@ -14,20 +15,10 @@ include/webp/sharpyuv/ include/webp/sharpyuv/sharpyuv.h include/webp/sharpyuv/sharpyuv_csp.h include/webp/types.h -@static-lib lib/libsharpyuv.a -lib/libsharpyuv.la @lib lib/libsharpyuv.so.${LIBsharpyuv_VERSION} -@static-lib lib/libwebp.a -lib/libwebp.la @lib lib/libwebp.so.${LIBwebp_VERSION} -@static-lib lib/libwebpdecoder.a -lib/libwebpdecoder.la @lib lib/libwebpdecoder.so.${LIBwebpdecoder_VERSION} -@static-lib lib/libwebpdemux.a -lib/libwebpdemux.la @lib lib/libwebpdemux.so.${LIBwebpdemux_VERSION} -@static-lib lib/libwebpmux.a -lib/libwebpmux.la @lib lib/libwebpmux.so.${LIBwebpmux_VERSION} lib/pkgconfig/libsharpyuv.pc lib/pkgconfig/libwebp.pc @@ -38,5 +29,12 @@ lib/pkgconfig/libwebpmux.pc @man man/man1/dwebp.1 @man man/man1/gif2webp.1 @man man/man1/img2webp.1 +@man man/man1/vwebp.1 @man man/man1/webpinfo.1 @man man/man1/webpmux.1 +share/WebP/ +share/WebP/cmake/ +share/WebP/cmake/WebPConfig.cmake +share/WebP/cmake/WebPConfigVersion.cmake +share/WebP/cmake/WebPTargets${MODCMAKE_BUILD_SUFFIX} +share/WebP/cmake/WebPTargets.cmake
