pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
slade: Update to 3.2.1
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Fri Jul 15 17:14:03 2022 +0200
Changeset: bd8af2c95ce1fa0a783368ca3c9493756e0985e3
Modified Files:
slade/COMMIT_MSG
slade/Makefile
slade/distinfo
Removed Files:
slade/patches/patch-src_External_zreaders_m__alloc.cpp
slade/patches/patch-src_External_zreaders_portable__endian.h
Log Message:
slade: Update to 3.2.1
3.2.1
=====
General
Fixed a possible crash when saving a zip archive
Fixed start page load errors on linux
Game Formats & Features Support
Added SRB2 game configuration and slopes support to map editor 3d mode (thanks @FlykeSpice)
Resource Editor
Added the ability to drag+drop a directory into the entry list for archives that support directories
(Re)implemented quick search via typing in the entry list (Windows only currently)
Fixed drag+drop of files into the entry list always importing to the root directory when in list view
Fixed an issue where collapsed parent directories would sometimes expand after switching tabs
Fixed a possible crash when creating a new directory
Fixed 'Tweak Palette' preview showing modified colours as black
Fixed sorting of entry list when changing directory in list view
Fixed crash when attempting to move a directory up/down
Map Editor
Fixed non-vertex slopes not displaying for triangular sectors in 3d mode
Fixed boolean UDMF properties always being written to TEXTMAP even when set to false
Fixed parsing of Sector_SetColor/Fade in open acs scripts
Fixed exception in map editor texture browser when textures from TX_START/END exist
3.2.0
=====
UI Refresh
3.2.0 includes a 'refresh' of various parts of the UI:
A new default icon set, as SVGs to allow it to scale to any size without being blurred
The entry list has received many updates and improvements:
Entries and directories are now shown in a tree structure for archives that support directories.
This can be reverted back to a flat list with navigation controls like in 3.1.x via Preferences
Filter controls can now be toggled on/off
Icon size and padding is now configurable
Bookmarked entries are shown with bold text
Toolbars have received a bunch of updates:
Can now be laid out vertically
Groups can now be shown on the opposite end of the toolbar
No longer expand to multiple rows (was causing too many weird layout issues)
When groups don't fit, they are instead added to a menu under an extra 'overflow' button at the end of the toolbar
Buttons now correctly darken when clicked
Various other minor things
Moved a bunch of toolbar buttons from the main toolbar to down next to the entry list.
This should hopefully make it more clear that they affect the selected entries in some way
Entry action tool buttons are now disabled if no entry is selected
Improved 'New Entry' dialog, with the ability to select the entry type and location
Creating a new archive is now done via a single 'New Archive' action, which pops up a dialog to select the archive type.
Now also allows Quake PAK archives to be created
Added an option to condense the translation dialog a bit vertically at the cost of a smaller image preview frame
Rearranged toolbars for palette, gfx and texturex/pnames editors
The zoom slider in the gfx and texture editors has been replaced with a more compact control, with +/- zoom buttons and a
combobox to set the zoom %
General
Major under-the-hood improvements to modernise and clean up the codebase, with increased stability and performance in mind
Added an 'All Files' option to the open dialog
Added ability to manually enter the executable path in the 'Run' dialog
Added the option to ignore 'hidden' files and directories (name starting with '.') when opening a directory
Improved high-DPI scaling and fixed some related issues (thanks @MP2E)
A warning is now shown when trying to save an archive if its file has been modified externally
Game Formats & Features Support
Support for Ion Fury (thanks @mykola-ambar)
Added palette
Support Ion Fury .art files
Added support for UMAPINFO (entry type and text language)
Added Exhumed (Powerslave) palette (thanks @mykola-ambar)
Added .VOX -> .KVX voxel model conversion (thanks @mykola-ambar)
Added the ability to convert to PSX DOOM format textures (thanks @BodbDearg)
Mixin classes are now handled when parsing ZScript
Added new 'Boom + MBF' map editor port configuration
Updated ZDoom language definitions (thanks @Blue-Shadow)
Updated Eternity EDF definitions (thanks @Altazimuth)
Fixed handling of ZMapInfo includes without enclosing double quotes
Resource Editor
Entries with duplicate names in zip archives are now disallowed
Attempting to rename/add an entry that would result in a duplicate will now append a number to the entry name
Entries with duplicate names won't be affected when opening a zip, however it will be unable to be saved until the duplicates are corrected
The 'Close' and 'Save' actions will now affect just the current tab (rather than the 'current' archive)
Added shortcut key to save the current entry (Ctrl+Alt+S)
Changed Ctrl+Shift+S shortcut to be for 'Save All' instead of 'Save As'
Added new ZDoom TEXTUREx cleanup operations for removing duplicate iwad textures, redundant single-patch textures and unused textures (in the maintenance menu) (thanks @ill)
Added 'Import Directory' action to import a directory and all its contents to the current archive
Selecting 'Open in New Tab' for an archive will now open it in a new tab as expected
Multi-image selector for gfx entries replaced with a spinbox (thanks @mykola-ambar)
Improved mp3 support and playback, no longer requires windows media player to be installed (on Windows) or wxMediaCtrl support (on Linux/macOS)
Bookmarks improvements
Bookmark action now toggles the bookmark on the entry/directory
Added a bookmarks toolbar button with a dropdown menu to switch between bookmarks
Added keyboard shortcut for the bookmark action (Ctrl+B)
Fixed MIDI playback via Timidity
Fixed Jaguar textures loading incorrectly (thanks @viciious)
Fixed gfx editing tools not working (on Windows)
Fixed buffer overflow when loading FON2 gfx
Fixed importing text-based palette formats (JASC, GIMP, CSV)
Texture Editor
Added support for advanced placeholders when renaming multiple textures, same as for entries
The 'Texture' menu should now correctly show again when a texture editor tab is open
Text Editor
Added colour scheme selection to Text menu
Fixed wrong comment colouring if a block comment opening is within a quoted string
Fixed calltip not disappearing when typing a function call with no args (ie. Function())
Map Editor
Added toggleable point light previews in 2d things mode
Vertex info overlay improvements
Display position as float if fractional
Show floor/ceiling height if set (UDMF)
Various improvements and fixes to texture handling and precedence (thanks @Talon1024)
Fixed an error when loading a custom port config from the user dir
Fixed issues with 2d -> 3d mode line selection conversion (thanks @kevans91)
Scripting
Updated/'finalised' API
Scripts written for 3.1.X will need to be updated to work with the new API, but from now there should be no further breaking changes to it, just additions
Updated documentation, has moved to https://slade.readthedocs.io/en/latest/
By moving it here it's much easier for me to update, and also allows for versioned scripting documentation (eg. docs for 3.1.12, 3.2.0, latest git build, etc.)
Expanded scripting capabilities:
Graphics manipulation including palettes and translations
Composite textures (TEXTUREx/PNAMES)
Additional Thanks
Additional thanks to @alexey-lysiuk @danfe @flarn2006 @anotak @jengelh for their additional contributions since the first 3.2.0 beta release
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bd8af2c95ce1fa0a783368ca3c9493756e0985e3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
slade/COMMIT_MSG | 2 +-
slade/Makefile | 7 +++-
slade/distinfo | 8 ++--
.../patch-src_External_zreaders_m__alloc.cpp | 49 ----------------------
.../patch-src_External_zreaders_portable__endian.h | 21 ----------
5 files changed, 9 insertions(+), 78 deletions(-)
diffs:
diff --git a/slade/COMMIT_MSG b/slade/COMMIT_MSG
index 689049f9e0..4ee35ed4a0 100644
--- a/slade/COMMIT_MSG
+++ b/slade/COMMIT_MSG
@@ -1,4 +1,4 @@
-games/slade: Import version 3.1.13
+games/slade: Import version 3.2.1
SLADE3 is a modern editor for Doom-engine based games and source ports.
It has the ability to view, modify, and write many different game-specific
diff --git a/slade/Makefile b/slade/Makefile
index fc3705fd4f..ff9f22721e 100644
--- a/slade/Makefile
+++ b/slade/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= SLADE-3.1.13
+DISTNAME= SLADE-3.2.1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GITHUB:=sirjuddington/}
GITHUB_TAG= ${DISTNAME:S/SLADE-//}
@@ -12,11 +12,14 @@ LICENSE= gnu-gpl-v2
.include "../../mk/bsd.prefs.mk"
-USE_LANGUAGES= c c++14
+# Needs C++17 std::filesystem (>=GCC 8 according to documentation)
+GCC_REQD+= 8
+USE_LANGUAGES= c c++17
USE_TOOLS+= pkg-config zip
USE_CMAKE= yes
CMAKE_ARGS+= -Wno-dev
CMAKE_ARGS+= -DNO_COTIRE=ON # CMake has similar functionality since 3.16
+CMAKE_ARGS+= -DNO_LUA=ON
CMAKE_ARGS+= -DNO_WEBVIEW=ON
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release # Use "Debug" for development
diff --git a/slade/distinfo b/slade/distinfo
index eb9d5b8fcb..20e963f54b 100644
--- a/slade/distinfo
+++ b/slade/distinfo
@@ -1,7 +1,5 @@
$NetBSD$
-RMD160 (SLADE-3.1.13.tar.gz) = 921ed1ebd0465e9a7bd61c947c8bd748d6034b0b
-SHA512 (SLADE-3.1.13.tar.gz) = 4f1f8ca86df7eb2a2ec8d0e9ba8a8a80c69a87910f9c4ab9fb705fc128324a131a26c4b1ed122dbd0b685652328097dd9dffd49e4fc356bf44ba2254505c8ea9
-Size (SLADE-3.1.13.tar.gz) = 5890835 bytes
-SHA1 (patch-src_External_zreaders_m__alloc.cpp) = 0e4afab8ca06013e4ff81560b91fcd0af5f7ca70
-SHA1 (patch-src_External_zreaders_portable__endian.h) = f2ed7cb8ffeca8d86047c84766a75c1b6ba088e2
+BLAKE2s (SLADE-3.2.1.tar.gz) = d611a60ea98fa62e06c039ce38490884e5fbebda87b68bdaf2073f56d66ef75e
+SHA512 (SLADE-3.2.1.tar.gz) = b7d5a91c759c5a68af63aa9a8412452a5b2986e70f7189ca92ee99ce4953ef47381be907c8ce1166e479f24679904bf5f0e0b1a5da846fe7873c5b97f4315449
+Size (SLADE-3.2.1.tar.gz) = 6471666 bytes
diff --git a/slade/patches/patch-src_External_zreaders_m__alloc.cpp b/slade/patches/patch-src_External_zreaders_m__alloc.cpp
deleted file mode 100644
index 95f2cece78..0000000000
--- a/slade/patches/patch-src_External_zreaders_m__alloc.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
-Explicitly check for FreeBSD, Linux, macOS and Windows.
-Use the generic algorithm for all other OS (formerly only for "__sun").
-https://github.com/sirjuddington/SLADE/issues/1274
-
---- src/External/zreaders/m_alloc.cpp.orig 2020-05-27 23:08:34.000000000 +0000
-+++ src/External/zreaders/m_alloc.cpp
-@@ -57,14 +57,18 @@ namespace GC
- #endif
- #if defined(__APPLE__)
- #define _msize(p) malloc_size(p)
--#elif defined(__sun)
--#define _msize(p) (*((size_t*)(p)-1))
--#elif !defined(_WIN32)
-+#elif defined(__FreeBSD__) || defined(__linux__)
- #define _msize(p) malloc_usable_size(p) // from glibc/FreeBSD
-+#elif !defined(_WIN32)
-+// For all other OS not handled above
-+#define M_ALLOC_GENERIC 1
-+#define _msize(p) (*((size_t*)(p)-1))
- #endif
-
-+
-+
- #ifndef _DEBUG
--#if !defined(__sun)
-+#if !M_ALLOC_GENERIC
- void *M_Malloc(size_t size)
- {
- void *block = malloc(size);
-@@ -134,7 +138,7 @@ void *M_Realloc(void *memblock, size_t s
- #include <crtdbg.h>
- #endif
-
--#if !defined(__sun)
-+#if !M_ALLOC_GENERIC
- void *M_Malloc_Dbg(size_t size, const char *file, int lineno)
- {
- void *block = _malloc_dbg(size, _NORMAL_BLOCK, file, lineno);
-@@ -202,7 +206,7 @@ void *M_Realloc_Dbg(void *memblock, size
- #endif
- #endif
-
--#if !defined(__sun)
-+#if !M_ALLOC_GENERIC
- void M_Free (void *block)
- {
- if (block != NULL)
diff --git a/slade/patches/patch-src_External_zreaders_portable__endian.h b/slade/patches/patch-src_External_zreaders_portable__endian.h
deleted file mode 100644
index 132c829dc2..0000000000
--- a/slade/patches/patch-src_External_zreaders_portable__endian.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-NetBSD already has defined beXXtoh() and leXXtoh(x) in "sys/endian.h".
-https://github.com/sirjuddington/SLADE/issues/988
-
---- src/External/zreaders/portable_endian.h.orig 2020-05-27 23:08:34.000000000 +0000
-+++ src/External/zreaders/portable_endian.h
-@@ -48,11 +48,11 @@
- # define __LITTLE_ENDIAN LITTLE_ENDIAN
- # define __PDP_ENDIAN PDP_ENDIAN
-
--#elif defined(__OpenBSD__)
-+#elif defined(__NetBSD__) || defined(__OpenBSD__)
-
- # include <sys/endian.h>
-
--#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-
- # include <sys/endian.h>
-
Home |
Main Index |
Thread Index |
Old Index