Revert partially the previous:

"- Add better handling for 24-bpp display"

NetBSD does not set fbi_subtype.fbi_rgbmasks.alpha_size correctly.

This also has been reported upstream.

Rebump PKGREVISION.

3 files changed, 13 insertions, 23 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index af2f4dbc003..48e280ff7cb 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.150 2019/07/24 02:39:57 rin Exp $
+# $NetBSD: Makefile,v 1.151 2019/07/26 23:28:43 rin Exp $
 
 DISTNAME=	mlterm-3.8.8
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 55c6da06f72..ac1b01f4887 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.78 2019/07/24 02:39:57 rin Exp $
+$NetBSD: distinfo,v 1.79 2019/07/26 23:28:43 rin Exp $
 
 SHA1 (mlterm-3.8.8.tar.gz) = 54f40fa50214656ab70f592d5d58805b1dfdc1c6
 RMD160 (mlterm-3.8.8.tar.gz) = 9a7675a86999541b57742099a5e9eac8a539b580
@@ -10,6 +10,6 @@ SHA1 (patch-uitoolkit_fb_ui.h) = 1178048c2c2354546c470b8c2199973507048447
 SHA1 (patch-uitoolkit_fb_ui__display.c) = 673a6621c3fe159b9beb4aa62286db02446415a9
 SHA1 (patch-uitoolkit_fb_ui__display__freebsd.c) = ea2a4bfb869c2eec510235a6f09d6356dff4c6d8
 SHA1 (patch-uitoolkit_fb_ui__display__linux.c) = 379572a5e66ffffb295ba34b00dfbb4dd237c818
-SHA1 (patch-uitoolkit_fb_ui__display__wscons.c) = 703958ee742834beddbb55927f2222d8eb01ed2e
+SHA1 (patch-uitoolkit_fb_ui__display__wscons.c) = f569f04665380d9696fc955601bef94333dd80a1
 SHA1 (patch-uitoolkit_fb_ui__display__x68kgrf.c) = 3fadc190ecf3defc2527b77fa0b668cfb4cf2ab4
 SHA1 (patch-uitoolkit_ui__event__source.c) = 4cf872768491bc8da5fc080cfd3a50969324a162
diff --git a/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c b/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c
index a014cf8ac70..3dc034de78f 100644
--- a/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c
+++ b/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c
@@ -2,13 +2,12 @@ $ NetBSD $
 
 - Fix support for fbi_fboffset != 0
 - Fix SEGV when using 8-bpp display on LP64 machine
-- Add better handling for 24-bpp display
 
 Reported upstream:
 https://bitbucket.org/arakiken/mlterm/pull-requests/5/fix-for-wscons-framebuffer/diff
 
---- uitoolkit/fb/ui_display_wscons.c	2019-07-24 10:51:04.210666890 +0900
-+++ ../mlterm.patched/uitoolkit/fb/ui_display_wscons.c	2019-07-24 10:31:06.733563761 +0900
+--- uitoolkit/fb/ui_display_wscons.c.orig	2019-03-31 22:10:47.000000000 +0900
++++ uitoolkit/fb/ui_display_wscons.c	2019-07-26 21:54:53.421920873 +0900
 @@ -260,6 +260,7 @@ static int open_display(u_int depth /* u
  #ifdef WSDISPLAYIO_GET_FBINFO
    struct wsdisplayio_fbinfo vinfo2;
@@ -17,17 +16,8 @@ https://bitbucket.org/arakiken/mlterm/pull-requests/5/fix-for-wscons-framebuffer
    int mode;
    int wstype;
    struct rgb_info rgbinfos[] = {
-@@ -323,15 +324,26 @@ static int open_display(u_int depth /* u
-   if (ioctl(_display.fb_fd, WSDISPLAYIO_GET_FBINFO, &vinfo2) == 0) {
-     vinfo.width = vinfo2.fbi_width;
-     vinfo.height = vinfo2.fbi_height;
--    vinfo.depth = vinfo2.fbi_bitsperpixel;
-+    if (vinfo2.fbi_bitsperpixel == 32 &&
-+        vinfo2.fbi_subtype.fbi_rgbmasks.alpha_size == 0) {
-+      vinfo.depth = 24;
-+    } else {
-+      vinfo.depth = vinfo2.fbi_bitsperpixel;
-+    }
+@@ -326,12 +327,18 @@ static int open_display(u_int depth /* u
+     vinfo.depth = vinfo2.fbi_bitsperpixel;
      vinfo.cmsize = vinfo2.fbi_subtype.fbi_cmapinfo.cmap_entries;
  
 -    /* XXX fbi_fboffset is regarded as multiple of fbi_stride */
@@ -49,7 +39,7 @@ https://bitbucket.org/arakiken/mlterm/pull-requests/5/fix-for-wscons-framebuffer
    } else {
  #ifdef DEBUG
      bl_debug_printf(BL_DEBUG_TAG " WSDISPLAYIO_GTYPE and WSDISPLAYIO_GET_FBINFO failed.\n");
-@@ -341,6 +353,7 @@ static int open_display(u_int depth /* u
+@@ -341,6 +348,7 @@ static int open_display(u_int depth /* u
    }
  
    _display.xoffset = 0;
@@ -57,7 +47,7 @@ https://bitbucket.org/arakiken/mlterm/pull-requests/5/fix-for-wscons-framebuffer
  
    _display.width = _disp.width = vinfo.width;
    _display.height = _disp.height = vinfo.height;
-@@ -403,7 +416,7 @@ static int open_display(u_int depth /* u
+@@ -403,7 +411,7 @@ static int open_display(u_int depth /* u
    if (wstype == WSDISPLAY_TYPE_LUNA && (_disp.depth == 4 || _disp.depth == 8)) {
      u_int plane;
  
@@ -66,7 +56,7 @@ https://bitbucket.org/arakiken/mlterm/pull-requests/5/fix-for-wscons-framebuffer
  
      for (plane = 0; plane < _disp.depth; plane++) {
        _display.plane_offset[plane] = 0x40000 * plane;
-@@ -411,7 +424,7 @@ static int open_display(u_int depth /* u
+@@ -411,7 +419,7 @@ static int open_display(u_int depth /* u
    } else
  #endif
    {
@@ -75,7 +65,7 @@ https://bitbucket.org/arakiken/mlterm/pull-requests/5/fix-for-wscons-framebuffer
    }
  
    if ((_display.fb = mmap(NULL, _display.smem_len, PROT_WRITE | PROT_READ, MAP_SHARED,
-@@ -421,11 +434,7 @@ static int open_display(u_int depth /* u
+@@ -421,11 +429,7 @@ static int open_display(u_int depth /* u
      goto error;
    }
  
@@ -88,7 +78,7 @@ https://bitbucket.org/arakiken/mlterm/pull-requests/5/fix-for-wscons-framebuffer
  
    if (_disp.depth < 15) {
      if (vinfo.depth >= 2 && _disp.depth == 1) {
-@@ -630,7 +639,7 @@ static int open_display(u_int depth /* u
+@@ -630,7 +634,7 @@ static int open_display(u_int depth /* u
  error:
    if (_display.fb) {
      munmap(_display.fb, _display.smem_len);