pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

golly: update to 3.2

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Fri Jul 13 21:18:10 2018 +0200
Changeset:	cb270b7669762b1c6dd781f9f57082e0ed615250

Modified Files:
	golly/Makefile
	golly/PLIST
	golly/distinfo
	golly/patches/patch-cmdline_bgolly.cpp

Log Message:
golly: update to 3.2

Also depend on wxGTK28, now that wxGTK30 seems to use gtk3+.

Changes in version 3.2 (released July 2018)

- Three-dimensional cellular automata can be explored using a new
  script: 3D.lua.
- HashLife and the other hash-based algorithms are faster and more
  responsive.
- Larger than Life now supports circular neighborhoods.
- Added a Show Population option to the Control menu.
- Added a Show Scroll Bars option to the View menu.
- MAP rules can optionally end with base64 padding characters "==".
- The overlay's paste command now supports multiple locations for batch
  draw.
- Added new overlay command lines which can draw multiple unconnected
  lines.
- Added a new ovtable command which provides a high performance table
  API for a subset of the overlay commands.
- Added draw_line and fill_rect functions to the overlay's oplus
  package.
- The oplus package also has new functions for creating a menu bar,
  pop-up menus and radio buttons. Menu buttons now support custom colors
  and shadows.
- Added a round function to Lua's gplus package.
- Added timing functions to the gplus package which can be used to
  profile Lua scripts.
- Added savechanges, settitle and sleep commands for use in Lua
  scripts.
- The getevent command now returns a "file" event when a user tries to
  open a file while a script is running. 3D.lua uses this event to open a
  .rle3 pattern or to run a .lua script.
- The note and warn commands have an optional parameter to specify
  whether the dialog has a Cancel button.
- The setoption command recognizes two new options: "showscrollbars"
  for showing or hiding the scroll bars, and "showtimeline" for showing
  or hiding the timeline.
- Mouse wheel sensitivity can be adjusted in Preferences > View to make
  zooming in/out easier to control.
- Fixed a bug when setting/getting cell values in very big hash-based
  universes.
- Fixed a bug where patterns larger than bounded grids were not
  correctly clipped.
- Fixed various problems with UTF8-encoded text in the clipboard and in
  Lua/Python scripts.
- Fixed a bug that could crash Golly if a .rule file contained invalid
  XPM data.
- The new credits.lua script displays animated credits and can be
  launched from a link in Help > Credits.  - New patterns:
  CY_Lee_computer.zip, switch-engine-ping-pong.rle,
  honey-farm-hasslers.rle, weekender-distaff.rle.gz,
  slow-salvo-MWSS-oscillator.rle.gz, syntheses-of-c2-spaceships.rle.gz.
- Updated patterns: phase-shift.rle, traffic-light-hasslers.rle,
  2c5-orthogonal.rle, c3-orthogonal.rle, c4-diagonal.rle,
  c4-orthogonal.rle, short-thin.rle, smallest-low-period.rle,
  spaceship-types.rle.
- Removed pattern: Patterns/Life/Syntheses/make-lightbulb.rle.
- Updated the Life Lexicon to release 29.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cb270b7669762b1c6dd781f9f57082e0ed615250

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

diffstat:
 golly/Makefile                         |  4 ++--
 golly/PLIST                            | 13 +++++++++++--
 golly/distinfo                         | 10 +++++-----
 golly/patches/patch-cmdline_bgolly.cpp | 18 +++++++++---------
 4 files changed, 27 insertions(+), 18 deletions(-)

diffs:
diff --git a/golly/Makefile b/golly/Makefile
index a151c294fa..2d9885d71b 100644
--- a/golly/Makefile
+++ b/golly/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-VERSION=	3.1
+VERSION=	3.2
 PKGNAME=	golly-${VERSION}
 DISTNAME=	${PKGNAME_NOREV}-src
 PKGREVISION=	1
@@ -25,5 +25,5 @@ CONFIGURE_ARGS+=	"--with-python-shlib=libpython2.7.so"
 .include "../../graphics/MesaLib/buildlink3.mk"
 #.include "../../lang/lua/buildlink3.mk" # uses its own built-in version 5.2
 .include "../../lang/python27/buildlink3.mk"
-.include "../../x11/wxGTK30/buildlink3.mk"
+.include "../../x11/wxGTK28/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/golly/PLIST b/golly/PLIST
index be1a79b983..db780c4197 100644
--- a/golly/PLIST
+++ b/golly/PLIST
@@ -7,9 +7,11 @@ share/golly/Help/Algorithms/Generations.html
 share/golly/Help/Algorithms/HashLife.html
 share/golly/Help/Algorithms/JvN.html
 share/golly/Help/Algorithms/Larger_than_Life.html
+share/golly/Help/Algorithms/NC.png
+share/golly/Help/Algorithms/NM.png
+share/golly/Help/Algorithms/NN.png
 share/golly/Help/Algorithms/QuickLife.html
 share/golly/Help/Algorithms/RuleLoader.html
-share/golly/Help/Algorithms/extended.png
 share/golly/Help/Algorithms/hensel.png
 share/golly/Help/Lexicon/lex.htm
 share/golly/Help/Lexicon/lex_1.htm
@@ -169,6 +171,7 @@ share/golly/Patterns/Life/Breeders/slide-breeder.rle
 share/golly/Patterns/Life/Breeders/spacefiller.rle
 share/golly/Patterns/Life/Breeders/switch-engine-breeder-MR.rle
 share/golly/Patterns/Life/Breeders/switch-engine-breeder.rle
+share/golly/Patterns/Life/Breeders/switch-engine-ping-pong.rle
 share/golly/Patterns/Life/Guns/2c5-spaceship-gun-p416.rle
 share/golly/Patterns/Life/Guns/2c5-spaceship-gun-p690.rle
 share/golly/Patterns/Life/Guns/7-in-a-row-Cordership-V-gun.rle
@@ -214,6 +217,7 @@ share/golly/Patterns/Life/Oscillators/DRH-oscillators.rle
 share/golly/Patterns/Life/Oscillators/billiard-table.rle
 share/golly/Patterns/Life/Oscillators/extensible-low-period.rle
 share/golly/Patterns/Life/Oscillators/glider-stream-crystal.rle
+share/golly/Patterns/Life/Oscillators/honey-farm-hasslers.rle
 share/golly/Patterns/Life/Oscillators/low-period.rle
 share/golly/Patterns/Life/Oscillators/p103079214841.rle
 share/golly/Patterns/Life/Oscillators/p138.rle
@@ -240,6 +244,7 @@ share/golly/Patterns/Life/Rakes/c5-adjustable-rake.rle
 share/golly/Patterns/Life/Rakes/forward-LWSS-rake-p90.rle
 share/golly/Patterns/Life/Rakes/p270-frothing-puffer-rake.rle
 share/golly/Patterns/Life/Rakes/spider-rake.rle
+share/golly/Patterns/Life/Rakes/weekender-distaff.rle.gz
 share/golly/Patterns/Life/Signal-Circuitry/Turing-Machine-3-state.rle
 share/golly/Patterns/Life/Signal-Circuitry/Unit-Life-Cell-512x512.rle
 share/golly/Patterns/Life/Signal-Circuitry/Unit-Life-Deep-Cell.rle
@@ -286,7 +291,6 @@ share/golly/Patterns/Life/Syntheses/29-still-lifes.rle
 share/golly/Patterns/Life/Syntheses/blockish-and-blockic-seeds.rle
 share/golly/Patterns/Life/Syntheses/life-integer-constructions.rle
 share/golly/Patterns/Life/Syntheses/make-harbor.rle
-share/golly/Patterns/Life/Syntheses/make-lightbulb.rle
 share/golly/Patterns/Life/Syntheses/make-osc-p3.rle
 share/golly/Patterns/Life/Syntheses/make-osc-p4.rle
 share/golly/Patterns/Life/Syntheses/make-osc-p5-plus.rle
@@ -294,7 +298,9 @@ share/golly/Patterns/Life/Syntheses/make-p11.rle
 share/golly/Patterns/Life/Syntheses/make-p18.rle
 share/golly/Patterns/Life/Syntheses/make-p33.rle
 share/golly/Patterns/Life/Syntheses/oscillator-syntheses.rle
+share/golly/Patterns/Life/Syntheses/slow-salvo-MWSS-oscillator.rle.gz
 share/golly/Patterns/Life/Syntheses/slow-salvo-eater-recipes.rle
+share/golly/Patterns/Life/Syntheses/syntheses-of-c2-spaceships.rle.gz
 share/golly/Patterns/Life/Syntheses/two-glider-collisions.rle
 share/golly/Patterns/Loops/Byl-Loop.rle
 share/golly/Patterns/Loops/Chou-Reggia-Loop-1.rle
@@ -373,6 +379,7 @@ share/golly/Patterns/Self-Rep/Devore/Devore-rep.rle
 share/golly/Patterns/Self-Rep/Devore/crossover.rle
 share/golly/Patterns/Self-Rep/Devore/discriminator.rle
 share/golly/Patterns/Self-Rep/JvN/Boustrophedon-replicator.rle
+share/golly/Patterns/Self-Rep/JvN/CY_Lee_computer.zip
 share/golly/Patterns/Self-Rep/JvN/Hutton-replicator.rle
 share/golly/Patterns/Self-Rep/JvN/JvN-loop-replicator.rle.gz
 share/golly/Patterns/Self-Rep/JvN/N-compressed-replicator.rle
@@ -471,9 +478,11 @@ share/golly/Rules/Worm-1252121.rule
 share/golly/Rules/Worm-1525115.rule
 share/golly/Rules/Worm-complement.rule
 share/golly/Rules/Worm-shared.rule
+share/golly/Scripts/Lua/3D.lua
 share/golly/Scripts/Lua/breakout.lua
 share/golly/Scripts/Lua/bricklayer.lua
 share/golly/Scripts/Lua/browse-patterns.lua
+share/golly/Scripts/Lua/credits.lua
 share/golly/Scripts/Lua/density.lua
 share/golly/Scripts/Lua/draw-lines.lua
 share/golly/Scripts/Lua/envelope.lua
diff --git a/golly/distinfo b/golly/distinfo
index e76ad19909..3ffb91967d 100644
--- a/golly/distinfo
+++ b/golly/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (golly-3.1-src.tar.gz) = 7347b6e89ae98288f43a0576fff6427976156943
-RMD160 (golly-3.1-src.tar.gz) = 9d7e1673804b63a77ffda34bba2df27f8dc04a6a
-SHA512 (golly-3.1-src.tar.gz) = 123248bc6dadd9df779556b6dca4a8b07683be0c50869077df85fe6e3fdfc6d032e1649e1c68ba23981fa27e3e15c774678e4a67bf3a01cdc5cd9cdc3c1ae4cd
-Size (golly-3.1-src.tar.gz) = 4958094 bytes
-SHA1 (patch-cmdline_bgolly.cpp) = 15dda14dabffe6e79c125f439c01022257b532ab
+SHA1 (golly-3.2-src.tar.gz) = 1851bcbe4be0ea908c7077ed1362fb700ab4b8ba
+RMD160 (golly-3.2-src.tar.gz) = 81e184cf781b79f7f65fe3795d1fecb21aaa8305
+SHA512 (golly-3.2-src.tar.gz) = bff5bbe75c0914bfcd416101894f8be1fd644c147fb90e0ad2cf87b4472c132c5d50be1829345fae59038e3d2e106ac417c5bc3cbc5c7d3a32a03c241b7a8eca
+Size (golly-3.2-src.tar.gz) = 5261483 bytes
+SHA1 (patch-cmdline_bgolly.cpp) = 3b1fa67e7fedfcab1e4a4dab8ee1335c2c18458f
 SHA1 (patch-configure) = b57f3815708a8456367ad9fd2c93f64d507ad37f
diff --git a/golly/patches/patch-cmdline_bgolly.cpp b/golly/patches/patch-cmdline_bgolly.cpp
index 75f8c80baf..82206fff21 100644
--- a/golly/patches/patch-cmdline_bgolly.cpp
+++ b/golly/patches/patch-cmdline_bgolly.cpp
@@ -2,28 +2,28 @@ $NetBSD$
 
 popcount() is declared in <strings.h> included from <string.h>.
 
---- cmdline/bgolly.cpp.orig	2017-08-19 04:39:59.000000000 +0000
+--- cmdline/bgolly.cpp.orig	2018-01-21 02:19:18.000000000 +0000
 +++ cmdline/bgolly.cpp
-@@ -115,7 +115,7 @@ struct options {
- } ;
+@@ -122,7 +122,7 @@ struct options {
  bigint maxgen = -1, inc = 0 ;
  int maxmem = 256 ;
--int hyper, render, autofit, quiet, popcount, progress ;
-+int hyper, render, autofit, quiet, xpopcount, progress ;
+ int hyperxxx ;   // renamed hyper to avoid conflict with windows.h
+-int render, autofit, quiet, popcount, progress ;
++int render, autofit, quiet, xpopcount, progress ;
  int hashlife ;
  char *algoName = 0 ;
  int verbose ;
-@@ -143,7 +143,7 @@ options options[] = {
+@@ -152,7 +152,7 @@ options options[] = {
    { "-t", "--timeline", "Use timeline", 'b', &timeline },
    { "",   "--render", "Render (benchmarking)", 'b', &render },
    { "",   "--progress", "Render during progress dialog (debugging)", 'b', &progress },
 -  { "",   "--popcount", "Popcount (benchmarking)", 'b', &popcount },
-+  { "",   "--popcount", "Popcount (benchmarking)", 'b', &xpopcount },
++  { "",   "--xpopcount", "Popcount (benchmarking)", 'b', &xpopcount },
    { "",   "--scale", "Rendering scale", 's', &renderscale },
  //{ "",   "--stepthreshold", "Stepsize >= gencount/this (default 1)",
  //                                                          'i', &stepthresh },
-@@ -627,7 +627,7 @@ case 's':
-          else
+@@ -648,7 +648,7 @@ case 's':
+          } else
              cout << endl ;
        }
 -      if (popcount)
Home | Main Index | Thread Index | Old Index