[pkgsrc/trunk]: pkgsrc/x11/XaoS x11/XaoS: update to version 4.2.1.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/XaoS x11/XaoS: update to version 4.2.1.
From: rhialto <rhialto%pkgsrc.org@localhost>
Date: Sat, 26 Jun 2021 22:16:40 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c832724d5191
branches:  trunk
changeset: 455029:c832724d5191
user:      rhialto <rhialto%pkgsrc.org@localhost>
date:      Sat Jun 26 21:21:32 2021 +0000

description:
x11/XaoS: update to version 4.2.1.

Lots of changes, the biggest of which is that it now uses Qt5 as GUI toolkit.

4.2

New Features

    Palette editor, save/load palettes, storing user palettes in the .xpf file.
    The option 'User formulas' maintains a history of recently used formulas.
    Fractal info in the Help menu.
    Batch rendering.
    Enabled panning in rotate mode.
    Unified Open and Open Image option. Save Image option moved to Save as.

4.1

New Features

    Added option to show Cartesian coordinate grid.
    Custom palette helps visualizing palette before applying changes through slider selectable values now.
    PNGs exported using 'Save Image' option can be imported back and users can continue zooming on it.

4.0

What's new in 4.0

    The user interface is based on Qt, so XaoS has a modern look and feel.
    Works on macOS Catalina, which broke older versions.
    Animation rendering has been fixed.
    Menu entries are now standardized.
    TrueType text rendering so fonts look nicer and non-Latin alphabets are supported.
    Hindi, Icelandic, Russian, Serbian and Swedish translations.
    Several minor updates for the other languages.
    The language can be set in the View menu now.
    Lots of bug fixes.
    Zooming is possible also with the mouse wheel.
    Mouse cursor has been changed to cross.
    Iteration number N can be used in user formulas.
    Lots of source code cleanup and refactoring. It may not be obvious to end users but this will allow us to make better features and more frequent releases in the future.

3.7

There were quite a few bug fixes at this point since 3.6 was released.

diffstat:

 x11/XaoS/Makefile                        |  58 +++++++++++++++++++------------
 x11/XaoS/PLIST                           |  42 +++++++---------------
 x11/XaoS/distinfo                        |  12 ++---
 x11/XaoS/patches/patch-aa                |  36 -------------------
 x11/XaoS/patches/patch-src_engine_zoom.c |  25 -------------
 5 files changed, 54 insertions(+), 119 deletions(-)

diffs (238 lines):

diff -r 743aa6c7b913 -r c832724d5191 x11/XaoS/Makefile
--- a/x11/XaoS/Makefile Sat Jun 26 17:58:17 2021 +0000
+++ b/x11/XaoS/Makefile Sat Jun 26 21:21:32 2021 +0000
@@ -1,37 +1,49 @@
-# $NetBSD: Makefile,v 1.40 2021/06/01 09:12:27 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2021/06/26 21:21:32 rhialto Exp $
 
-DISTNAME=              xaos-3.6
-PKGREVISION=           2
+DISTNAME=              xaos-4.2.1
 CATEGORIES=            x11
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=xaos/}
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=xaos-project/}
+GITHUB_PROJECT=                XaoS
+GITHUB_TAG=            refs/tags/release-${PKGVERSION_NOREV}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://matek.hu/xaos/
 COMMENT=               Zoomable fractal rendering doodad
 LICENSE=               gnu-gpl-v2
 
-USE_TOOLS+=            gmake msgfmt
-USE_PKGLOCALEDIR=      YES
-GNU_CONFIGURE=         YES
-INFO_FILES=            yes
+USE_TOOLS+=            gmake
+USE_LANGUAGES+=                c c++
 
-SUBST_CLASSES+=                paths
-SUBST_MESSAGE.paths=   Fixing hardcoded paths.
-SUBST_STAGE.paths=     pre-configure
-SUBST_FILES.paths=     configure
-SUBST_SED.paths=       -e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,g'
+SUBST_CLASSES+=                strip
+SUBST_MESSAGE.strip=   Filling in missing path to strip
+SUBST_STAGE.strip=     post-configure
+SUBST_FILES.strip=     Makefile
+SUBST_SED.strip=       -e 's,^STRIP .*=.*,STRIP = ${TOOLS_PLATFORM.strip},'
 
-INSTALLATION_DIRS=     ${PKGINFODIR}
+SUBST_CLASSES+=                path
+SUBST_MESSAGE.path=    Fixing path to data files
+SUBST_STAGE.path=      post-configure
+SUBST_FILES.path=      src/include/config.h
+SUBST_SED.path=                -e '/^.define DATAPATH/s,".*","${PREFIX}/share/XaoS",'
+
+WRKSRC=                        ${WRKDIR}/XaoS-release-${PKGVERSION_NOREV}
 
-CHECK_PORTABILITY_SKIP+=       help/applehelpconv
-CHECK_PORTABILITY_SKIP+=       help/.svn/text-base/applehelpconv.svn-base
+INSTALLATION_DIRS+=    ${PREFIX}/bin
+INSTALLATION_DIRS+=    ${PREFIX}/share/XaoS
 
-LDFLAGS.SunOS+=                -liconv
+do-configure:
+       cd ${WRKSRC} && env ${CONFIGURE_ENV} ${QTDIR}/bin/qmake
 
-.include "../../math/gsl/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-BUILDLINK_DEPMETHOD.libXt=     build
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
+# The upstream package has no working install target any more.
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/bin/xaos  ${DESTDIR}${PREFIX}/bin/
+.for dir in catalogs examples tutorial
+       cd ${WRKSRC} && pax -wr ${dir} ${DESTDIR}${PREFIX}/share/XaoS/
+.endfor
+       cd ${DESTDIR}${PREFIX}/share/XaoS/examples && \
+               mv */* . && \
+               rmdir 0rfelyus Hubicka Langston Malczak ZKovacs ZsKovacs
+
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 743aa6c7b913 -r c832724d5191 x11/XaoS/PLIST
--- a/x11/XaoS/PLIST    Sat Jun 26 17:58:17 2021 +0000
+++ b/x11/XaoS/PLIST    Sat Jun 26 21:21:32 2021 +0000
@@ -1,24 +1,17 @@
-@comment $NetBSD: PLIST,v 1.13 2014/07/13 09:17:04 mbalmer Exp $
+@comment $NetBSD: PLIST,v 1.14 2021/06/26 21:21:32 rhialto Exp $
 bin/xaos
-info/xaos.info
-man/man6/xaos.6
 share/XaoS/catalogs/README
-share/XaoS/catalogs/cesky.cat
-share/XaoS/catalogs/deutsch.cat
-share/XaoS/catalogs/english.cat
-share/XaoS/catalogs/espanhol.cat
-share/XaoS/catalogs/francais.cat
-share/XaoS/catalogs/italiano.cat
-share/XaoS/catalogs/magyar.cat
-share/XaoS/catalogs/portuguese.cat
-share/XaoS/catalogs/romanian.cat
-share/XaoS/doc/AUTHORS
-share/XaoS/doc/COPYING
-share/XaoS/doc/ChangeLog
-share/XaoS/doc/ChangeLog.old
-share/XaoS/doc/INSTALL
-share/XaoS/doc/NEWS
-share/XaoS/doc/TODO
+share/XaoS/catalogs/README.i18n
+share/XaoS/catalogs/cs.cat
+share/XaoS/catalogs/de.cat
+share/XaoS/catalogs/en.cat
+share/XaoS/catalogs/es.cat
+share/XaoS/catalogs/fr.cat
+share/XaoS/catalogs/hu.cat
+share/XaoS/catalogs/it.cat
+share/XaoS/catalogs/pt.cat
+share/XaoS/catalogs/ro.cat
+share/XaoS/catalogs/ru.cat
 share/XaoS/examples/0rfel1.xpf
 share/XaoS/examples/0rfel2.xpf
 share/XaoS/examples/2spirals.xpf
@@ -190,7 +183,6 @@
 share/XaoS/examples/warriormask.xpf
 share/XaoS/examples/whisp.xpf
 share/XaoS/examples/zsigapro.xpf
-share/XaoS/help/xaos.hlp
 share/XaoS/tutorial/3dtutor.xaf
 share/XaoS/tutorial/Bclosing.xaf
 share/XaoS/tutorial/Bintro.xaf
@@ -218,6 +210,7 @@
 share/XaoS/tutorial/incolor.xaf
 share/XaoS/tutorial/innew.xhf
 share/XaoS/tutorial/intro.xaf
+share/XaoS/tutorial/iter.xaf
 share/XaoS/tutorial/julia.xaf
 share/XaoS/tutorial/keys.xhf
 share/XaoS/tutorial/line1.xhf
@@ -225,6 +218,7 @@
 share/XaoS/tutorial/mset.xaf
 share/XaoS/tutorial/msetren.xaf
 share/XaoS/tutorial/new30.xaf
+share/XaoS/tutorial/new40.xaf
 share/XaoS/tutorial/newton.xaf
 share/XaoS/tutorial/octo.xaf
 share/XaoS/tutorial/other.xaf
@@ -245,11 +239,3 @@
 share/XaoS/tutorial/trice.xaf
 share/XaoS/tutorial/truecol.xaf
 share/XaoS/tutorial/truecol.xhf
-share/locale/cs/LC_MESSAGES/xaos.mo
-share/locale/de/LC_MESSAGES/xaos.mo
-share/locale/es/LC_MESSAGES/xaos.mo
-share/locale/fr/LC_MESSAGES/xaos.mo
-share/locale/hu/LC_MESSAGES/xaos.mo
-share/locale/it/LC_MESSAGES/xaos.mo
-share/locale/pt/LC_MESSAGES/xaos.mo
-share/locale/ro/LC_MESSAGES/xaos.mo
diff -r 743aa6c7b913 -r c832724d5191 x11/XaoS/distinfo
--- a/x11/XaoS/distinfo Sat Jun 26 17:58:17 2021 +0000
+++ b/x11/XaoS/distinfo Sat Jun 26 21:21:32 2021 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.19 2015/12/29 23:50:14 dholland Exp $
+$NetBSD: distinfo,v 1.20 2021/06/26 21:21:32 rhialto Exp $
 
-SHA1 (xaos-3.6.tar.gz) = 0c68d25c4f9c8eaf557e37d9e4586a04ab56d7a0
-RMD160 (xaos-3.6.tar.gz) = 4cfe8e7f5b98d28cd320f9ab21a9c2d76d122133
-SHA512 (xaos-3.6.tar.gz) = 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1
-Size (xaos-3.6.tar.gz) = 2040707 bytes
-SHA1 (patch-aa) = b7f9bf3bf002cf43808e5cadf95c3418de0aec12
-SHA1 (patch-src_engine_zoom.c) = 50cc7d2ee805fcd5248f8696e53d9c97ddc689db
+SHA1 (xaos-4.2.1.tar.gz) = eab7e4e6786ec0d8622c7b328223a8d1b786c8dc
+RMD160 (xaos-4.2.1.tar.gz) = 8ddff5c13e22db46acba0ff04a0b0a8a7cb7edca
+SHA512 (xaos-4.2.1.tar.gz) = 58aa2c41d1171d4c8fa684707f4fc7619ab5f23cc902358d8bc3303fdd48b26cefe7d54dbf68a4aba9345a0ca97b752b185db19b67caa8b5e9dba50a8b6ad918
+Size (xaos-4.2.1.tar.gz) = 10916985 bytes
diff -r 743aa6c7b913 -r c832724d5191 x11/XaoS/patches/patch-aa
--- a/x11/XaoS/patches/patch-aa Sat Jun 26 17:58:17 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2014/07/13 09:17:04 mbalmer Exp $
-
-Rip out the 16 bit i387 specific code.
-
---- src/engine/fractal.c.orig  2013-11-01 07:54:21.000000000 +0000
-+++ src/engine/fractal.c
-@@ -47,13 +47,6 @@
- #include <complex.h>
- #include <plane.h>
- #include "../include/timers.h"
--#ifdef __GNUC__
--#ifdef __i386__
--#ifndef PC_64
--#include <i386/ctrl87.h>
--#endif
--#endif
--#endif
- #ifdef __alpha__
- #ifdef __linux__
- #include <asm/fpu.h>
-@@ -355,15 +348,6 @@ fractal_context *make_fractalc(const int
- {
-     fractal_context *new_ctxt;
- 
--#ifndef __BEOS__
--#ifdef __GNUC__
--#ifdef __i386__
--#ifndef NOASSEMBLY
--    _control87(PC_64 | MCW_EM | MCW_RC, MCW_PC | MCW_EM | MCW_RC);
--#endif
--#endif
--#endif
--#endif
- #ifdef __alpha__
- #ifdef __linux__
-     extern void ieee_set_fp_control(unsigned long);
diff -r 743aa6c7b913 -r c832724d5191 x11/XaoS/patches/patch-src_engine_zoom.c
--- a/x11/XaoS/patches/patch-src_engine_zoom.c  Sat Jun 26 17:58:17 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_engine_zoom.c,v 1.2 2015/12/29 23:50:14 dholland Exp $
-
-Fix compilation on NetBSD 7 on i386.
-
---- src/engine/zoom.c.orig     2015-11-01 20:40:43.000000000 -0800
-+++ src/engine/zoom.c  2015-11-01 20:41:31.000000000 -0800
-@@ -138,13 +138,11 @@
- #endif
- 
- #ifndef USE_i386ASM
--static void
--moveoldpoints(void *data1, struct taskinfo *task, int r1, int r2)
--REGISTERS(0);
--static void fillline_8(int line) REGISTERS(0);
--static void fillline_16(int line) REGISTERS(0);
--static void fillline_24(int line) REGISTERS(0);
--static void fillline_32(int line) REGISTERS(0);
-+static void moveoldpoints(void *data1, struct taskinfo *task, int r1, int r2);
-+static INLINE void fillline_8(int line);
-+static INLINE void fillline_16(int line);
-+static INLINE void fillline_24(int line);
-+static INLINE void fillline_32(int line);
- #endif
- 
- /*first of all inline driver section */
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated x11/XaoS to 4.2.1
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/kaffe lang/kaffe: Fix broken build on current by ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated x11/XaoS to 4.2.1
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/kaffe lang/kaffe: Fix broken build on current by ...
Indexes:
Home | Main Index | Thread Index | Old Index