[pkgsrc/trunk]: pkgsrc/graphics/grafx2 grafx2: Update to 2.6

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/grafx2 grafx2: Update to 2.6
From: nia <nia%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 11:33:23 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/10285ea9c496
branches:  trunk
changeset: 398413:10285ea9c496
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Jul 18 12:15:04 2019 +0000

description:
grafx2: Update to 2.6

Changes:

- SDL2/X11/win32 GDI support in addition to SDL1.2.x
- Many more "8bits" computer constraints modes
- Support for more C64 pictures formats
- Support for Thomson file formats
- Open URL when clicking them in oneline help
- Brush and picture copy/paste support

diffstat:

 graphics/grafx2/Makefile               |   15 ++-
 graphics/grafx2/PLIST                  |  130 +++++++++++++++++---------------
 graphics/grafx2/distinfo               |   14 +-
 graphics/grafx2/patches/patch-Makefile |   15 ---
 graphics/grafx2/patches/patch-help.c   |   39 +++++++++
 graphics/grafx2/patches/patch-misc.c   |    8 +-
 6 files changed, 127 insertions(+), 94 deletions(-)

diffs (300 lines):

diff -r 8130b0a0db3a -r 10285ea9c496 graphics/grafx2/Makefile
--- a/graphics/grafx2/Makefile  Thu Jul 18 11:54:42 2019 +0000
+++ b/graphics/grafx2/Makefile  Thu Jul 18 12:15:04 2019 +0000
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.3 2019/07/09 15:38:23 nia Exp $
+# $NetBSD: Makefile,v 1.4 2019/07/18 12:15:04 nia Exp $
 
-DISTNAME=      grafx2-2.5.1960-src
-PKGNAME=       ${DISTNAME:S/-src//}
+DISTNAME=      grafX2-v2.6
+PKGNAME=       ${DISTNAME:S/X2-v/x2-/}
 CATEGORIES=    graphics
-MASTER_SITES=  -http://pulkomandy.tk/projects/GrafX2/downloads/30
+MASTER_SITES=  https://gitlab.com/GrafX2/grafX2/-/archive/v${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
-HOMEPAGE=      http://pulkomandy.tk/projects/GrafX2/
+HOMEPAGE=      http://grafx2.chez.com/
 COMMENT=       Ultimate 256-color bitmap paint program
 LICENSE=       gnu-gpl-v2
 
-WRKSRC=                ${WRKDIR}/grafx2/src
 USE_TOOLS+=    gmake pkg-config
 USE_LANGUAGES= c c++
 
+WRKSRC=                ${WRKDIR}/${DISTNAME}/src
+
 SUBST_CLASSES+=                        fix-paths
 SUBST_STAGE.fix-paths=         pre-configure
 SUBST_MESSAGE.fix-paths=       Set PREFIX
@@ -26,7 +27,9 @@
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/SDL_ttf/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8130b0a0db3a -r 10285ea9c496 graphics/grafx2/PLIST
--- a/graphics/grafx2/PLIST     Thu Jul 18 11:54:42 2019 +0000
+++ b/graphics/grafx2/PLIST     Thu Jul 18 12:15:04 2019 +0000
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2018/07/17 13:07:50 ryoon Exp $
-bin/grafx2
+@comment $NetBSD: PLIST,v 1.2 2019/07/18 12:15:04 nia Exp $
+bin/grafx2-sdl
 share/applications/grafx2.desktop
+share/grafx2/fonts/5pxtinyfont.png
 share/grafx2/fonts/8pxfont.png
+share/grafx2/fonts/GrafX2_Black.gif
+share/grafx2/fonts/GrafX2_Dark.gif
 share/grafx2/fonts/PF_Arma_5__.png
 share/grafx2/fonts/PF_Easta_7_.png
 share/grafx2/fonts/PF_Easta_7__.png
@@ -17,66 +20,68 @@
 share/grafx2/fonts/PF_Westa_7_.png
 share/grafx2/fonts/PF_Westa_7__.png
 share/grafx2/fonts/Tuffy.ttf
+share/grafx2/fonts/colorfont.pcx
 share/grafx2/gfx2.gif
 share/grafx2/gfx2def.ini
-share/grafx2/scripts/samples_2.4/brush/ApplyColor.lua
-share/grafx2/scripts/samples_2.4/brush/Fisheye.lua
-share/grafx2/scripts/samples_2.4/brush/GrayscaleAvg.lua
-share/grafx2/scripts/samples_2.4/brush/GrayscaleDesat.lua
-share/grafx2/scripts/samples_2.4/brush/Halfsmooth.lua
-share/grafx2/scripts/samples_2.4/brush/Waves.lua
-share/grafx2/scripts/samples_2.4/demo/3DPalette.lua
-share/grafx2/scripts/samples_2.4/demo/Ellipse.lua
-share/grafx2/scripts/samples_2.4/demo/FlipPicture.lua
-share/grafx2/scripts/samples_2.4/demo/SierpinskyCarpet.lua
-share/grafx2/scripts/samples_2.4/demo/SierpinskyTriangle.lua
-share/grafx2/scripts/samples_2.4/demo/Spritesheet.lua
-share/grafx2/scripts/samples_2.4/demo/brush/Amigaball.lua
-share/grafx2/scripts/samples_2.4/demo/brush/ColorSphere.lua
-share/grafx2/scripts/samples_2.4/demo/brush/FindAA.lua
-share/grafx2/scripts/samples_2.4/demo/brush/Mandelbrot.lua
-share/grafx2/scripts/samples_2.4/libs/dawnbringer_lib.lua
-share/grafx2/scripts/samples_2.4/libs/memory.lua
-share/grafx2/scripts/samples_2.4/palette/Desaturate.lua
-share/grafx2/scripts/samples_2.4/palette/ExpandColors.lua
-share/grafx2/scripts/samples_2.4/palette/FillColorCube.lua
-share/grafx2/scripts/samples_2.4/palette/InvertedRGB.lua
-share/grafx2/scripts/samples_2.4/palette/Set3bit.lua
-share/grafx2/scripts/samples_2.4/palette/Set6bit.lua
-share/grafx2/scripts/samples_2.4/palette/SetC64Palette.lua
-share/grafx2/scripts/samples_2.4/palette/ShiftHue.lua
-share/grafx2/scripts/samples_2.4/picture/CellColourReducer.lua
-share/grafx2/scripts/samples_2.4/picture/DrawGridIsometric.lua
-share/grafx2/scripts/samples_2.4/picture/DrawGridOrthogonal_RGB.lua
-share/grafx2/scripts/samples_2.4/picture/DrawgridOrthogonal_Index.lua
-share/grafx2/scripts/samples_2.4/picture/FontConvert.lua
-share/grafx2/scripts/samples_2.4/picture/GlassGridFilter.lua
-share/grafx2/scripts/samples_2.4/picture/PaletteToPicture.lua
-share/grafx2/scripts/samples_2.4/picture/Pic2isometric.lua
-share/grafx2/scripts/samples_2.4/picture/Rainbow-Dark2Bright.lua
-share/grafx2/scripts/samples_2.4/picture/RemapImage2RGB.lua
-share/grafx2/scripts/samples_2.4/picture/RemapImage2RGB_ed.lua
-share/grafx2/scripts/samples_2.4/picture/RemapImageTo3bitPal.lua
-share/grafx2/scripts/samples_2.4/picture/Tiler.lua
-share/grafx2/scripts/samples_2.4/picture/XBitColourXpaceFromPalette.lua
-share/grafx2/scripts/samples_2.4/picture/others-8bit/lib/ostro_other.lua
-share/grafx2/scripts/samples_2.4/picture/others-8bit/ostro_oric.lua
-share/grafx2/scripts/samples_2.4/picture/others-8bit/ostro_zx.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/bayer4_mo5.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/bayer4_to8.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/lib/bayer.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/lib/color.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/lib/color_reduction.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/lib/convex_hull.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/lib/ostromoukhov.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/lib/thomson.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/none_mo5.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/none_to8.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/none_to9.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/ostro_mo5.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/ostro_to7.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/ostro_to8.lua
-share/grafx2/scripts/samples_2.4/picture/thomson/ostro_to9.lua
+share/grafx2/scripts/samples/brush/ApplyColor.lua
+share/grafx2/scripts/samples/brush/Fisheye.lua
+share/grafx2/scripts/samples/brush/GrayscaleAvg.lua
+share/grafx2/scripts/samples/brush/GrayscaleDesat.lua
+share/grafx2/scripts/samples/brush/Halfsmooth.lua
+share/grafx2/scripts/samples/brush/Waves.lua
+share/grafx2/scripts/samples/codenetsend.lua
+share/grafx2/scripts/samples/demo/3DPalette.lua
+share/grafx2/scripts/samples/demo/Ellipse.lua
+share/grafx2/scripts/samples/demo/FlipPicture.lua
+share/grafx2/scripts/samples/demo/SierpinskyCarpet.lua
+share/grafx2/scripts/samples/demo/SierpinskyTriangle.lua
+share/grafx2/scripts/samples/demo/Spritesheet.lua
+share/grafx2/scripts/samples/demo/brush/Amigaball.lua
+share/grafx2/scripts/samples/demo/brush/ColorSphere.lua
+share/grafx2/scripts/samples/demo/brush/FindAA.lua
+share/grafx2/scripts/samples/demo/brush/Mandelbrot.lua
+share/grafx2/scripts/samples/libs/dawnbringer_lib.lua
+share/grafx2/scripts/samples/libs/memory.lua
+share/grafx2/scripts/samples/palette/Desaturate.lua
+share/grafx2/scripts/samples/palette/ExpandColors.lua
+share/grafx2/scripts/samples/palette/FillColorCube.lua
+share/grafx2/scripts/samples/palette/InvertedRGB.lua
+share/grafx2/scripts/samples/palette/Set3bit.lua
+share/grafx2/scripts/samples/palette/Set6bit.lua
+share/grafx2/scripts/samples/palette/SetC64Palette.lua
+share/grafx2/scripts/samples/palette/ShiftHue.lua
+share/grafx2/scripts/samples/picture/CellColourReducer.lua
+share/grafx2/scripts/samples/picture/DrawGridIsometric.lua
+share/grafx2/scripts/samples/picture/DrawGridOrthogonal_RGB.lua
+share/grafx2/scripts/samples/picture/DrawgridOrthogonal_Index.lua
+share/grafx2/scripts/samples/picture/FontConvert.lua
+share/grafx2/scripts/samples/picture/GlassGridFilter.lua
+share/grafx2/scripts/samples/picture/PaletteToPicture.lua
+share/grafx2/scripts/samples/picture/Pic2isometric.lua
+share/grafx2/scripts/samples/picture/Rainbow-Dark2Bright.lua
+share/grafx2/scripts/samples/picture/RemapImage2RGB.lua
+share/grafx2/scripts/samples/picture/RemapImage2RGB_ed.lua
+share/grafx2/scripts/samples/picture/RemapImageTo3bitPal.lua
+share/grafx2/scripts/samples/picture/Tiler.lua
+share/grafx2/scripts/samples/picture/XBitColourXpaceFromPalette.lua
+share/grafx2/scripts/samples/picture/others-8bit/lib/ostro_other.lua
+share/grafx2/scripts/samples/picture/others-8bit/ostro_oric.lua
+share/grafx2/scripts/samples/picture/others-8bit/ostro_zx.lua
+share/grafx2/scripts/samples/picture/thomson/bayer4_mo5.lua
+share/grafx2/scripts/samples/picture/thomson/bayer4_to8.lua
+share/grafx2/scripts/samples/picture/thomson/lib/bayer.lua
+share/grafx2/scripts/samples/picture/thomson/lib/color.lua
+share/grafx2/scripts/samples/picture/thomson/lib/color_reduction.lua
+share/grafx2/scripts/samples/picture/thomson/lib/convex_hull.lua
+share/grafx2/scripts/samples/picture/thomson/lib/ostromoukhov.lua
+share/grafx2/scripts/samples/picture/thomson/lib/thomson.lua
+share/grafx2/scripts/samples/picture/thomson/none_mo5.lua
+share/grafx2/scripts/samples/picture/thomson/none_to8.lua
+share/grafx2/scripts/samples/picture/thomson/none_to9.lua
+share/grafx2/scripts/samples/picture/thomson/ostro_mo5.lua
+share/grafx2/scripts/samples/picture/thomson/ostro_to7.lua
+share/grafx2/scripts/samples/picture/thomson/ostro_to8.lua
+share/grafx2/scripts/samples/picture/thomson/ostro_to9.lua
 share/grafx2/skins/font_Classic.png
 share/grafx2/skins/font_DPaint.png
 share/grafx2/skins/font_Fairlight.png
@@ -89,6 +94,7 @@
 share/grafx2/skins/skin_modern.png
 share/grafx2/skins/skin_scenish.png
 share/grafx2/skins/unicode_0410-044F.png
-share/icons/grafx2.svg
-share/icons/grafx2.xpm
+share/icons/hicolor/scalable/apps/grafx2.svg
+share/icons/hicolor/scalable/apps/grafx2.xpm
+share/metainfo/grafx2.appdata.xml
 @pkgdir share/grafx2/scripts/libs
diff -r 8130b0a0db3a -r 10285ea9c496 graphics/grafx2/distinfo
--- a/graphics/grafx2/distinfo  Thu Jul 18 11:54:42 2019 +0000
+++ b/graphics/grafx2/distinfo  Thu Jul 18 12:15:04 2019 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2018/07/17 13:07:50 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2019/07/18 12:15:04 nia Exp $
 
-SHA1 (grafx2-2.5.1960-src.tgz) = eb9b59eae66fce644de36b4819b27ca02501b929
-RMD160 (grafx2-2.5.1960-src.tgz) = 2e7eccdfbe2d5f53c16b5588422c189f689d1d43
-SHA512 (grafx2-2.5.1960-src.tgz) = 42aeebd52c6a643d422fb906b396c0325d0d4adbc1b6eda1264c1c35e50d57ae242d82fee267e46331d1c6ecf520ac7a9834d30454bfcbdfb322c37f131e4fb2
-Size (grafx2-2.5.1960-src.tgz) = 888914 bytes
-SHA1 (patch-Makefile) = dde5929e5c4979fd427a0029015faaf403839852
+SHA1 (grafX2-v2.6.tgz) = 0aa6501a6ab6815917826603f7d4ef4e2cf01b4e
+RMD160 (grafX2-v2.6.tgz) = ae0eb91a69be72e343241221a1c28261416aea51
+SHA512 (grafX2-v2.6.tgz) = 45daf4c32d7523f6b5c54b4b8d1fe9e35aff663a650ee86bd9898d91510340ae8e1fb61ea35d83efc944af28568258f827cdebb79362648361688c306781d8c6
+Size (grafX2-v2.6.tgz) = 1228632 bytes
+SHA1 (patch-help.c) = b4df9282f64760f00f380f19e52a48839f3d9025
 SHA1 (patch-main.c) = 32ab12bd3a3b39cc89004afde815dbd4fddc0802
-SHA1 (patch-misc.c) = 28373720742bf6a0327f4f1b3410350c014a5c33
+SHA1 (patch-misc.c) = e4913bbf2b309ff0c2858158b6b53d6768ebff85
diff -r 8130b0a0db3a -r 10285ea9c496 graphics/grafx2/patches/patch-Makefile
--- a/graphics/grafx2/patches/patch-Makefile    Thu Jul 18 11:54:42 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2018/07/17 13:07:50 ryoon Exp $
-
-* Install to pkgsrc location
-
---- Makefile.orig      2018-05-15 16:51:04.000000000 +0000
-+++ Makefile
-@@ -23,7 +23,7 @@
- #  along with Grafx2; if not, see <http://www.gnu.org/licenses/>
- 
- # Overridable defaults
--  prefix = /usr/local
-+  prefix = ${PREFIX}
-   exec_prefix = $(prefix)
-   bindir = $(exec_prefix)/bin
-   datarootdir = $(prefix)/share
diff -r 8130b0a0db3a -r 10285ea9c496 graphics/grafx2/patches/patch-help.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/grafx2/patches/patch-help.c      Thu Jul 18 12:15:04 2019 +0000
@@ -0,0 +1,39 @@
+$NetBSD: patch-help.c,v 1.1 2019/07/18 12:15:04 nia Exp $
+
+Use statvfs on NetBSD.
+
+--- help.c.orig        2019-01-10 08:40:57.000000000 +0000
++++ help.c
+@@ -30,9 +30,11 @@
+ #if defined(_MSC_VER) && _MSC_VER < 1900
+       #define snprintf _snprintf
+ #endif
+-#elif defined(__macosx__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__macosx__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+     #include <sys/param.h>
+     #include <sys/mount.h>
++#elif defined(__NetBSD__)
++    #include <sys/statvfs.h>
+ #elif defined (__linux__) || defined(__SYLLABLE__)
+     #include <sys/vfs.h>
+ #elif defined (__HAIKU__)
+@@ -966,12 +968,18 @@ void Button_Stats(int btn)
+       GetDiskFreeSpaceExA(Main.selector.Directory,&tailleU,NULL,NULL);
+       mem_size = tailleU.QuadPart;
+     }
+-#elif defined(__linux__) || defined(__macosx__) || defined(__FreeBSD__) || defined(__SYLLABLE__) || defined(__AROS__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__linux__) || defined(__macosx__) || defined(__FreeBSD__) || defined(__SYLLABLE__) || defined(__AROS__) || defined(__OpenBSD__)
+     {
+       struct statfs disk_info;
+       statfs(Main.selector.Directory,&disk_info);
+       mem_size=(qword) disk_info.f_bfree * (qword) disk_info.f_bsize;
+     }
++#elif defined(__NetBSD__)
++    {
++      struct statvfs disk_info;
++      statvfs(Main.selector.Directory,&disk_info);
++      mem_size=(qword) disk_info.f_bfree * (qword) disk_info.f_bsize;
++    }
+ #elif defined(__HAIKU__)
+    mem_size = haiku_get_free_space(Main.selector.Directory);
+ #elif defined (__MINT__)
diff -r 8130b0a0db3a -r 10285ea9c496 graphics/grafx2/patches/patch-misc.c
--- a/graphics/grafx2/patches/patch-misc.c      Thu Jul 18 11:54:42 2019 +0000
+++ b/graphics/grafx2/patches/patch-misc.c      Thu Jul 18 12:15:04 2019 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-misc.c,v 1.1 2018/07/17 13:07:50 ryoon Exp $
+$NetBSD: patch-misc.c,v 1.2 2019/07/18 12:15:04 nia Exp $
 
 * Fix sysctl build failure
 
---- misc.c.orig        2018-05-15 16:51:04.000000000 +0000
+--- misc.c.orig        2019-01-10 08:40:57.000000000 +0000
 +++ misc.c
-@@ -24,6 +24,9 @@
+@@ -25,6 +25,9 @@
  #if defined(WIN32)
  #define _WIN32_WINNT 0x0500
  #endif
 +#if defined(__NetBSD__)
 +#define _NETBSD_SOURCE
 +#endif
- #include <SDL.h>
  #include <string.h>
  #ifndef _MSC_VER
+ #include <strings.h>
Prev by Date: [pkgsrc/trunk]: pkgsrc/games/frotz frotz: Update to 2.44
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/dovecot2 mail/dovecot2:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/games/frotz frotz: Update to 2.44
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/dovecot2 mail/dovecot2:
Indexes:
Home | Main Index | Thread Index | Old Index