CVS commit: pkgsrc/net/sayaka

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Tue Oct 10 14:20:53 UTC 2023

Modified Files:
        pkgsrc/net/sayaka: Makefile distinfo
Added Files:
        pkgsrc/net/sayaka/patches: patch-src_ImageLoaderWebp.cpp
            patch-src_WSClient.cpp

Log Message:
sayaka: update to 3.7.1.

pkgsrc changes:
- workaround build errors of gcc7 on netbsd-9
- fix a problem that webp images with alpha channel are not shown properly

Upstream changes:

* 3.7.1 (2023/10/09)
 - fix failures on drawing WebP images in some cases
 - fix infinite loop on emoji notification messages

* 3.7.0 (2023/10/09)
 - start support of Misskey
 - drop functions to connect to Twitter
 - drop --filter, --home, --no-rest, --post, and --token options
 - add --twitter, --misskey, and --local options
 - temporarily drop --ngword-* and --show-ng options
 - rename --black/--white options to --dark/--light


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/sayaka/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/sayaka/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/sayaka/patches/patch-src_ImageLoaderWebp.cpp \
    pkgsrc/net/sayaka/patches/patch-src_WSClient.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/sayaka/Makefile
diff -u pkgsrc/net/sayaka/Makefile:1.45 pkgsrc/net/sayaka/Makefile:1.46
--- pkgsrc/net/sayaka/Makefile:1.45     Fri Sep  1 10:07:00 2023
+++ pkgsrc/net/sayaka/Makefile  Tue Oct 10 14:20:53 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2023/09/01 10:07:00 nia Exp $
+# $NetBSD: Makefile,v 1.46 2023/10/10 14:20:53 tsutsui Exp $
 
-DISTNAME=      sayaka-3.6.5
+DISTNAME=      sayaka-3.7.1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=isaki68k/}
 GITHUB_PROJECT=        ${DISTNAME:S/-${PKGVERSION_NOREV}//}
@@ -15,6 +15,7 @@ GNU_CONFIGURE=                yes
 USE_LANGUAGES+=                c c++
 USE_TOOLS+=            pkg-config
 BUILD_TARGET=          sayaka
+MAKE_FLAGS+=           -DRELEASE
 
 USE_CXX_FEATURES+=     c++17
 
@@ -29,5 +30,7 @@ do-install:
 .if ${OPSYS} == "Linux"
 .  include "../../devel/libbsd/buildlink3.mk"
 .endif
+.include "../../graphics/libwebp/buildlink3.mk"
 .include "../../security/mbedtls/buildlink3.mk"
+.include "../../www/wslay/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/sayaka/distinfo
diff -u pkgsrc/net/sayaka/distinfo:1.27 pkgsrc/net/sayaka/distinfo:1.28
--- pkgsrc/net/sayaka/distinfo:1.27     Sun Jul  9 09:29:34 2023
+++ pkgsrc/net/sayaka/distinfo  Tue Oct 10 14:20:53 2023
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.27 2023/07/09 09:29:34 tsutsui Exp $
+$NetBSD: distinfo,v 1.28 2023/10/10 14:20:53 tsutsui Exp $
 
-BLAKE2s (sayaka-3.6.5.tar.gz) = 79024179c16681bea5f1abab6a1903e811e09054dad4c9af7d35a6ad4b778d7d
-SHA512 (sayaka-3.6.5.tar.gz) = 15a00c20df95c5bad8d690c51dc2b499ac14b9b5575aa6086ca5b18d64104f40b424a92abf3ab556096547d3ed93c14a11e06f572d236c0e41d31abdf0e3c8d3
-Size (sayaka-3.6.5.tar.gz) = 433227 bytes
+BLAKE2s (sayaka-3.7.1.tar.gz) = 05ddec341093d224b66d27b4df1438124f5af6d935220d3102e8a34306319821
+SHA512 (sayaka-3.7.1.tar.gz) = 9b3c68fcf48532d0540d8fdadd9e2d07db56aa94925bbcca96a8097fc024b89979efc92b4f255610a6204471cf82b5c8fe35a9a9d84fce0b328fbdad5b8b405e
+Size (sayaka-3.7.1.tar.gz) = 433386 bytes
+SHA1 (patch-src_ImageLoaderWebp.cpp) = 0d44daddbf6fde62a26b4a4dbd1e05cfd137b9e5
+SHA1 (patch-src_WSClient.cpp) = adfc594cb961e11e7631473cf7fb78cf0529ca12

Added files:

Index: pkgsrc/net/sayaka/patches/patch-src_ImageLoaderWebp.cpp
diff -u /dev/null pkgsrc/net/sayaka/patches/patch-src_ImageLoaderWebp.cpp:1.1
--- /dev/null   Tue Oct 10 14:20:53 2023
+++ pkgsrc/net/sayaka/patches/patch-src_ImageLoaderWebp.cpp     Tue Oct 10 14:20:53 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_ImageLoaderWebp.cpp,v 1.1 2023/10/10 14:20:53 tsutsui Exp $
+
+- fix a problem that webp images with alpha channel are not shown properly.
+
+--- src/ImageLoaderWebp.cpp.orig       2023-10-09 11:22:42.000000000 +0000
++++ src/ImageLoaderWebp.cpp
+@@ -239,12 +239,10 @@ ImageLoaderWebp::Load(Image& img)
+               // RGBA 出力バッファを用意。
+               int stride = width * 4;
+               int outbufsize = stride * height;
+-              std::vector<uint8> outbuf(outbufsize);
+ 
+               // RGBA で出力。
+               config.output.colorspace = MODE_RGBA;
+-              config.output.u.RGBA.rgba = outbuf.data();
+-              config.output.u.RGBA.size = outbuf.size();
++              config.output.u.RGBA.size = outbufsize;
+               config.output.u.RGBA.stride = stride;
+               int status = WebPDecode(filebuf.data(), filebuf.size(), &config);
+               if (status != VP8_STATUS_OK) {
+@@ -253,7 +251,7 @@ ImageLoaderWebp::Load(Image& img)
+               }
+ 
+               // RGB に変換。
+-              RGBAtoRGB(img.GetBuf(), outbuf.data(), width, height, stride, TRANSBG);
++              RGBAtoRGB(img.GetBuf(), config.output.u.RGBA.rgba, width, height, stride, TRANSBG);
+               rv = true;
+  abort_alpha:
+               WebPFreeDecBuffer(&config.output);
Index: pkgsrc/net/sayaka/patches/patch-src_WSClient.cpp
diff -u /dev/null pkgsrc/net/sayaka/patches/patch-src_WSClient.cpp:1.1
--- /dev/null   Tue Oct 10 14:20:53 2023
+++ pkgsrc/net/sayaka/patches/patch-src_WSClient.cpp    Tue Oct 10 14:20:53 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_WSClient.cpp,v 1.1 2023/10/10 14:20:53 tsutsui Exp $
+
+- workaround errors of gcc7 on netbsd-9:
+> WSClient.cpp:71:2: sorry, unimplemented: non-trivial designated initializers not supported
+
+--- src/WSClient.cpp.orig      2023-10-09 11:22:42.000000000 +0000
++++ src/WSClient.cpp
+@@ -67,6 +67,9 @@ WSClient::Init()
+               .recv_callback                  = wsclient_recv_callback,
+               .send_callback                  = wsclient_send_callback,
+               .genmask_callback               = wsclient_genmask_callback,
++              .on_frame_recv_start_callback   = NULL,
++              .on_frame_recv_chunk_callback   = NULL,
++              .on_frame_recv_end_callback     = NULL,
+               .on_msg_recv_callback   = wsclient_on_msg_recv_callback,
+       };
+       if (wslay_event_context_client_init(&wsctx, &callbacks, this) != 0) {