CVS commit: pkgsrc/x11/mlterm

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Sun Sep 22 06:17:30 UTC 2019

Modified Files:
        pkgsrc/x11/mlterm: Makefile distinfo
        pkgsrc/x11/mlterm/patches: patch-uitoolkit_fb_ui__display__wscons.c

Log Message:
Correct size of framebuffer for luna68k; page offset appears only once,
not every color depths.

Bump PKGREVISION.

Pointed out by Araki Ken, the author of mlterm. Thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 pkgsrc/x11/mlterm/Makefile
cvs rdiff -u -r1.80 -r1.81 pkgsrc/x11/mlterm/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c

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

Modified files:

Index: pkgsrc/x11/mlterm/Makefile
diff -u pkgsrc/x11/mlterm/Makefile:1.151 pkgsrc/x11/mlterm/Makefile:1.152
--- pkgsrc/x11/mlterm/Makefile:1.151    Fri Jul 26 23:28:43 2019
+++ pkgsrc/x11/mlterm/Makefile  Sun Sep 22 06:17:30 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.151 2019/07/26 23:28:43 rin Exp $
+# $NetBSD: Makefile,v 1.152 2019/09/22 06:17:30 rin Exp $
 
 DISTNAME=      mlterm-3.8.8
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mlterm/}
 

Index: pkgsrc/x11/mlterm/distinfo
diff -u pkgsrc/x11/mlterm/distinfo:1.80 pkgsrc/x11/mlterm/distinfo:1.81
--- pkgsrc/x11/mlterm/distinfo:1.80     Fri Aug  9 12:03:17 2019
+++ pkgsrc/x11/mlterm/distinfo  Sun Sep 22 06:17:30 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.80 2019/08/09 12:03:17 rin Exp $
+$NetBSD: distinfo,v 1.81 2019/09/22 06:17:30 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) = 751d9fa
 SHA1 (patch-uitoolkit_fb_ui__display.c) = 15dbae082a13d5a4c5f22675914631da5494e6a6
 SHA1 (patch-uitoolkit_fb_ui__display__freebsd.c) = 3cb80b0564be184cf992ea54141183395c4cd39b
 SHA1 (patch-uitoolkit_fb_ui__display__linux.c) = 5dd0d30d579f42036066acb8c42db51045ac712f
-SHA1 (patch-uitoolkit_fb_ui__display__wscons.c) = f569f04665380d9696fc955601bef94333dd80a1
+SHA1 (patch-uitoolkit_fb_ui__display__wscons.c) = 6ea6aec8cd72999874c9fb26a099d3b09ba91bb6
 SHA1 (patch-uitoolkit_fb_ui__display__x68kgrf.c) = 51ba1b5124fd6cb654e9c87fa289b06170429f92
 SHA1 (patch-uitoolkit_ui__event__source.c) = 4cf872768491bc8da5fc080cfd3a50969324a162

Index: pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c
diff -u pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c:1.2 pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c:1.3
--- pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c:1.2      Fri Jul 26 23:28:43 2019
+++ pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c  Sun Sep 22 06:17:30 2019
@@ -7,7 +7,7 @@ Reported upstream:
 https://bitbucket.org/arakiken/mlterm/pull-requests/5/fix-for-wscons-framebuffer/diff
 
 --- 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
++++ uitoolkit/fb/ui_display_wscons.c   2019-09-22 15:10:00.573589888 +0900
 @@ -260,6 +260,7 @@ static int open_display(u_int depth /* u
  #ifdef WSDISPLAYIO_GET_FBINFO
    struct wsdisplayio_fbinfo vinfo2;
@@ -52,7 +52,7 @@ https://bitbucket.org/arakiken/mlterm/pu
      u_int plane;
  
 -    _display.smem_len = 0x40000 * _disp.depth;
-+    _display.smem_len = (fboffset + 0x40000) * _disp.depth;
++    _display.smem_len = fboffset + 0x40000 * _disp.depth;
  
      for (plane = 0; plane < _disp.depth; plane++) {
        _display.plane_offset[plane] = 0x40000 * plane;