git: 7e73d97218c3 - 2023Q2 - multimedia/baka-mplayer: unbreak under Wayland (with qt5-wayland)

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Thu, 04 May 2023 05:48:00 UTC
The branch 2023Q2 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7e73d97218c32d875495064187e1e489612ca50c

commit 7e73d97218c32d875495064187e1e489612ca50c
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-05-04 05:38:09 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-05-04 05:47:48 +0000

    multimedia/baka-mplayer: unbreak under Wayland (with qt5-wayland)
    
    $ baka-mplayer
    Segmentation fault
    
    * thread #1, name = 'baka-mplayer', stop reason = signal SIGBUS: hardware error
        frame #0: 0x0000000820df9a52 libX11.so.6`_XInternAtom(dpy=0x000000088683af00, name="_NET_WM_CM_S0", onlyIfExists=0, psig=0x000000082092bd70, pidx=0x000000082092bd6c, pn=0x000000082092bd68) at IntAtom.c:86:30
       83       if (atoms) {
       84           firstidx = idx = HASH(sig);
       85           while ((e = atoms->table[idx])) {
    -> 86               if (e != RESERVED && e->sig == sig) {
       87                   for (i = n, s1 = (char *)name, s2 = EntryName(e); --i >= 0; ) {
       88                       if (*s1++ != *s2++)
       89                           goto nomatch;
    (lldb) bt
    * thread #1, name = 'baka-mplayer', stop reason = signal SIGBUS: hardware error
      * frame #0: 0x0000000820df9a52 libX11.so.6`_XInternAtom(dpy=0x000000088683af00, name="_NET_WM_CM_S0", onlyIfExists=0, psig=0x000000082092bd70, pidx=0x000000082092bd6c, pn=0x000000082092bd68) at IntAtom.c:86:30
        frame #1: 0x0000000820df97d9 libX11.so.6`XInternAtom(dpy=0x000000088683af00, name="_NET_WM_CM_S0", onlyIfExists=0) at IntAtom.c:176:17
        frame #2: 0x0000000000263695 baka-mplayer`Util::DimLightsSupported() at linux.cpp:28:14
        frame #3: 0x000000000026c71a baka-mplayer`BakaEngine::BakaEngine(this=0x00000008a964bd00, parent=0x000000082092fe10) at bakaengine.cpp:31:8
        frame #4: 0x00000000002b1739 baka-mplayer`MainWindow::MainWindow(this=0x000000082092fe10, parent=0x0000000000000000) at mainwindow.cpp:31:16
        frame #5: 0x00000000002648ec baka-mplayer`main(argc=1, argv=0x000000082092ff48) at main.cpp:21:16
        frame #6: 0x00000000002633a0 baka-mplayer`_start(ap=<unavailable>, cleanup=<unavailable>) at crt1.c:76:7
    
    (cherry picked from commit 7a77117df66791a067ccdc7cc3fa44aa92279540)
---
 multimedia/baka-mplayer/Makefile | 3 ++-
 multimedia/baka-mplayer/distinfo | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/multimedia/baka-mplayer/Makefile b/multimedia/baka-mplayer/Makefile
index c10b3156ac64..04edebad9a96 100644
--- a/multimedia/baka-mplayer/Makefile
+++ b/multimedia/baka-mplayer/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	baka-mplayer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.4
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	multimedia audio
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	6c83d34c3158.patch:-p1 # https://github.com/u8sand/Baka-MPlayer/pull/296
 PATCHFILES+=	7864f248c3fc.patch:-p1 # https://github.com/u8sand/Baka-MPlayer/pull/317
 PATCHFILES+=	fb0cd8133d45.patch:-p1 # https://github.com/u8sand/Baka-MPlayer/pull/317
 
diff --git a/multimedia/baka-mplayer/distinfo b/multimedia/baka-mplayer/distinfo
index 238bf5f9f666..980cadab0433 100644
--- a/multimedia/baka-mplayer/distinfo
+++ b/multimedia/baka-mplayer/distinfo
@@ -1,6 +1,8 @@
 TIMESTAMP = 1448985828
 SHA256 (u8sand-Baka-MPlayer-v2.0.4_GH0.tar.gz) = 43647217695bdfc85771ce2fc8fcecebd49bdf6282c3a439816cfb4e08754002
 SIZE (u8sand-Baka-MPlayer-v2.0.4_GH0.tar.gz) = 988060
+SHA256 (6c83d34c3158.patch) = da27f0abbb6f4cc5d829193086c35b13a0b11efe52d11b85006f84f7f8ff3f75
+SIZE (6c83d34c3158.patch) = 1265
 SHA256 (7864f248c3fc.patch) = 234b4b15c6706aa38c38392ca2cfacc6bc5722c115f49a0335eb4d4984e8a14f
 SIZE (7864f248c3fc.patch) = 3511
 SHA256 (fb0cd8133d45.patch) = 3ffd9481f9abeb9ca21ec6726b0563cb0b6fe4f4098f45813b42e63569411ec9