pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/eureka
Module Name: pkgsrc
Committed By: micha
Date: Mon Jul 8 14:04:43 UTC 2024
Modified Files:
pkgsrc/games/eureka: Makefile PLIST distinfo options.mk
pkgsrc/games/eureka/patches: patch-src_m__files.cc patch-src_main.cc
Added Files:
pkgsrc/games/eureka/patches: patch-CMakeLists.txt
patch-src_CMakeLists.txt patch-src_m__strings.h
Removed Files:
pkgsrc/games/eureka/patches: patch-src_e__basis.cc
patch-src_e__objects.cc patch-src_ui__replace.cc
Log Message:
games/eureka: Update to 2.0.1
Removed some pkgsrc patches (merged upstream).
Switch to CMake build system.
# CHANGES IN Eureka 2.0.1
(Since version 2.0.0)
## View
* Corrected the copyright year for my contributions.
## Bug fixes
* Fixed a crash happening when selecting neighbor sectors while no-sided
linedefs are in the map.
* Fixed a regression from 1.27b where selected 1-sided lines in 3D view
wouldn't change texture unless the side panel texture thumbnail also
gets selected.
## Development
* Fixed some compilation errors on Linux.
# CHANGES IN Eureka 2.0.0
(Since version 1.27b)
## Resource and project setup
* Wads are now loaded fully in memory. **Note**: currently it still
doesn't autodetect file changes, so take care not to open the level
in other editors at the same time.
* Resources can be loaded as folders, having the standard PK3/PKE
layout.
* Added Dehacked resource support, by contribution of Isaac Colón
([https://github.com/iccolon818](https://github.com/iccolon818)).
* Fixed the EUREKA lump to store relative paths so that the user
settings are portable between computers.
* Removed the Hexen format support from Eternity. This format is only
meant for vanilla Hexen wads and should not be used for new Eternity
maps.
* Do not throw a fatal error when loading invalid project resource
files.
## Editing and interface
* Dragging lines or sectors can also split other lines. Currently still
no support for the dragged lines getting split by existing vertices.
* Fixed a bug where dragging a vertex into a neighbouring linedef to
split it resulted in two overlapping lines.
* Testing map now opens the game without blocking Eureka, just like user
would start another app.
Also, for macOS you can now use app bundles.
* Added tutti-frutti texture check
* Now the tagged items (regardless of type) get highlighted properly,
depending on the triggering special.
* The tags check is now aware of the linedef special so it doesn't look
for tagged sector if the special doesn't deal with sectors.
* Now the Jump to Objects dialog allows you to choose multiple items.
* Fixed so clicking a button while editing a panel field won't reset the
field.
* Fixed wrong labelling of sidedef texture boxes.
* Now the menu commands show their actual shortcuts as set in user
preferences.
## View
* Sprites are displayed with rotations both in 2D and 3D views.
* Spectral sprite view also shows up as such in the editor views, not
just the sprite browser.
* Fixed Heretic torches looking wrong in the 3D mode
* Fixed the Strife klaxon things to hang from ceiling.
* Fixed the Strife Sigil sprite not displaying correctly.
* Fixed Heretic multiplayer sprite color translation
* Fixed missing 'm' texture category from heretic.ugh. Added it and
named it "magic".
* Fixed failure to locate a patch if an equally named flat exists.
## Bug fixes
* Fixed an access violation happening when starting a new ZDoom project.
* Fixed a crash happening when starting a new project while a linedef is
selected.
* Fixed a crash happening when using R to change sidedef offset in 3D
mode on a selected (but not highlighted) linedef.
* Fixed a fatal error happening when deleting the last vertex.
* Fixed the initial grid being set one step higher than intended in
preferences.
* Fixed an illegal operation being run when rendering 3D mode.
## Development
* Project uses CMake
* Deleted Makefile.xming.
* Fixed failure to compile on SmartOS.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/eureka/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/eureka/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/eureka/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/eureka/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/games/eureka/patches/patch-CMakeLists.txt \
pkgsrc/games/eureka/patches/patch-src_CMakeLists.txt \
pkgsrc/games/eureka/patches/patch-src_m__strings.h
cvs rdiff -u -r1.2 -r0 pkgsrc/games/eureka/patches/patch-src_e__basis.cc \
pkgsrc/games/eureka/patches/patch-src_e__objects.cc \
pkgsrc/games/eureka/patches/patch-src_ui__replace.cc
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/eureka/patches/patch-src_m__files.cc \
pkgsrc/games/eureka/patches/patch-src_main.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/games/eureka/Makefile
diff -u pkgsrc/games/eureka/Makefile:1.8 pkgsrc/games/eureka/Makefile:1.9
--- pkgsrc/games/eureka/Makefile:1.8 Sun Nov 12 13:21:31 2023
+++ pkgsrc/games/eureka/Makefile Mon Jul 8 14:04:42 2024
@@ -1,25 +1,21 @@
-# $NetBSD: Makefile,v 1.8 2023/11/12 13:21:31 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2024/07/08 14:04:42 micha Exp $
-DISTNAME= eureka-1.27b-source
-# Some macOS patches were added after the release of 1.27 but unfortunately
-# the archive name was not changed (pkgsrc used 1.27.1 for this version).
-# The second patch release is called 1.27b, we use version 1.27.2 for it.
-# Switch back to upstream naming scheme for next major/minor release.
-PKGNAME= ${DISTNAME:S/-source//:S/b/.2/}
-PKGREVISION= 3
+DISTNAME= eureka-2.0.1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eureka-editor/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=ioan-chera/}
+GITHUB_PROJECT= eureka-editor
+GITHUB_TAG= ${DISTNAME}
MAINTAINER= micha%NetBSD.org@localhost
-HOMEPAGE= https://sourceforge.net/projects/eureka-editor/
+HOMEPAGE= https://eureka-editor.sourceforge.net/
COMMENT= Doom/Heretic/Hexen map editor
LICENSE= gnu-gpl-v2
-# Makefile declares "-std=c++03"
-USE_LANGUAGES= c++03
-USE_TOOLS+= gmake
+USE_LANGUAGES= c c++
+USE_CC_FEATURES+= c11
+USE_CXX_FEATURES+= c++17
-WRKSRC= ${WRKDIR}/eureka-1.27b-source
+CMAKE_ARGS+= -DENABLE_UNIT_TESTS=off
# DOOMWADDIR is intentionally shared with other Doom packages
DOOMWADDIR= share/doom
@@ -43,5 +39,13 @@ SUBST_SED.dwd= -e 's,PKGSRC_DOOMWADDIR,
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/eureka/PLIST
diff -u pkgsrc/games/eureka/PLIST:1.2 pkgsrc/games/eureka/PLIST:1.3
--- pkgsrc/games/eureka/PLIST:1.2 Wed Feb 26 12:28:02 2020
+++ pkgsrc/games/eureka/PLIST Mon Jul 8 14:04:42 2024
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2020/02/26 12:28:02 micha Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/07/08 14:04:42 micha Exp $
bin/eureka
+share/applications/eureka.desktop
share/eureka/about_logo.png
share/eureka/bindings.cfg
share/eureka/common/doom_colors.ugh
@@ -37,3 +38,4 @@ share/eureka/ports/odamex.ugh
share/eureka/ports/vanilla.ugh
share/eureka/ports/xdoom.ugh
share/eureka/ports/zdoom.ugh
+share/icons/hicolor/32x32/apps/eureka.xpm
Index: pkgsrc/games/eureka/distinfo
diff -u pkgsrc/games/eureka/distinfo:1.7 pkgsrc/games/eureka/distinfo:1.8
--- pkgsrc/games/eureka/distinfo:1.7 Tue Oct 26 10:43:56 2021
+++ pkgsrc/games/eureka/distinfo Mon Jul 8 14:04:42 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:43:56 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/07/08 14:04:42 micha Exp $
-BLAKE2s (eureka-1.27b-source.tar.gz) = aa7e6051f4a930a3d6c9c8a3ff6458662aa30fe61d999bd92aa104465b417b2e
-SHA512 (eureka-1.27b-source.tar.gz) = 4b2ce44a99acbe1b9dd2cf31ee5c3307f5f667422ba18bee8c3f9858e9244ee05c48e96b5afa4cdf65dfd079bca19a5693b6d123b5563549d1f84ca03137eb5e
-Size (eureka-1.27b-source.tar.gz) = 1159366 bytes
-SHA1 (patch-src_e__basis.cc) = db2225e62182102acea9714e8b2c6ccd68aab2c4
-SHA1 (patch-src_e__objects.cc) = 41f9f1b6934b94a5d2291b73ce4e0bf2fda6e304
-SHA1 (patch-src_m__files.cc) = 5bdfaefa324408632a8e649c8994479e7ec00ae1
-SHA1 (patch-src_main.cc) = 7c107f89e64ec2de5588880c71ba0e24b1aaf354
-SHA1 (patch-src_ui__replace.cc) = db02d88f367a60b81b8388b5656c081fb69d2f10
+BLAKE2s (eureka-2.0.1.tar.gz) = 7c566115453056d3efe853d88269d95dbdeac57248ee48b111d02b3ae9bd309c
+SHA512 (eureka-2.0.1.tar.gz) = 18f6ffd9e28a9679265670f1677564eb5319c2011a038cc9516f1768456028e58e50c4d5c70b15f0d0f25fdafed8762efde4b589a095418ae1ca3103f869d486
+Size (eureka-2.0.1.tar.gz) = 2387560 bytes
+SHA1 (patch-CMakeLists.txt) = 0eda67e8a101d9299bc933f2f403b4e8b940a689
+SHA1 (patch-src_CMakeLists.txt) = 7291065f665f00e6d9eda2cbdf56769360b40691
+SHA1 (patch-src_m__files.cc) = a547b17d578ada79e20d006f786b1a594ef34700
+SHA1 (patch-src_m__strings.h) = e8b793e0a8943f3371792e07ac552e8e22e2c248
+SHA1 (patch-src_main.cc) = fe5d1f35637010de7e56e7384a29045f64e9667a
Index: pkgsrc/games/eureka/options.mk
diff -u pkgsrc/games/eureka/options.mk:1.3 pkgsrc/games/eureka/options.mk:1.4
--- pkgsrc/games/eureka/options.mk:1.3 Mon Apr 27 18:38:44 2020
+++ pkgsrc/games/eureka/options.mk Mon Jul 8 14:04:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2020/04/27 18:38:44 micha Exp $
+# $NetBSD: options.mk,v 1.4 2024/07/08 14:04:42 micha Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.eureka
PKG_SUPPORTED_OPTIONS= opengl xdg-utils
@@ -13,13 +13,7 @@ PKG_SUGGESTED_OPTIONS= opengl xdg-utils
# If FLTK is compiled with opengl option, disabling it here allows to force
# usage of the software renderer (recommended without hardware acceleration).
.if empty(PKG_OPTIONS.fltk13:Mopengl) || empty(PKG_OPTIONS:Mopengl)
-SUBST_CLASSES+= opengl
-SUBST_STAGE.opengl= do-configure
-SUBST_MESSAGE.opengl= Disable OpenGL renderer in Makefile ...
-SUBST_FILES.opengl= Makefile
-SUBST_SED.opengl= -e 's,\# CXXFLAGS += -DNO_OPENGL,CXXFLAGS += -DNO_OPENGL,'
-SUBST_SED.opengl+= -e 's, --use-gl,,'
-SUBST_SED.opengl+= -e 's,LIBS += -lGLU -lGL,\#LIBS += -lGLU -lGL,'
+CMAKE_ARGS+= -DENABLE_OPENGL=off
.endif
# xdg-utils: Create dependency for xdg-utils (Portland project)
Index: pkgsrc/games/eureka/patches/patch-src_m__files.cc
diff -u pkgsrc/games/eureka/patches/patch-src_m__files.cc:1.2 pkgsrc/games/eureka/patches/patch-src_m__files.cc:1.3
--- pkgsrc/games/eureka/patches/patch-src_m__files.cc:1.2 Wed Feb 26 12:28:02 2020
+++ pkgsrc/games/eureka/patches/patch-src_m__files.cc Mon Jul 8 14:04:42 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_m__files.cc,v 1.2 2020/02/26 12:28:02 micha Exp $
+$NetBSD: patch-src_m__files.cc,v 1.3 2024/07/08 14:04:42 micha Exp $
Add placeholder for pkgsrc DOOMWADDIR to beginning of search list.
--- src/m_files.cc.orig 2018-06-23 11:29:07.000000000 +0000
+++ src/m_files.cc
-@@ -723,6 +723,7 @@ static const char * SearchForIWAD(const
+@@ -506,6 +506,7 @@ static const char * SearchForIWAD(const
"c:/doom2",
"c:/doom95",
#else
Index: pkgsrc/games/eureka/patches/patch-src_main.cc
diff -u pkgsrc/games/eureka/patches/patch-src_main.cc:1.2 pkgsrc/games/eureka/patches/patch-src_main.cc:1.3
--- pkgsrc/games/eureka/patches/patch-src_main.cc:1.2 Wed Feb 26 12:28:02 2020
+++ pkgsrc/games/eureka/patches/patch-src_main.cc Mon Jul 8 14:04:42 2024
@@ -1,19 +1,28 @@
-$NetBSD: patch-src_main.cc,v 1.2 2020/02/26 12:28:02 micha Exp $
+$NetBSD: patch-src_main.cc,v 1.3 2024/07/08 14:04:42 micha Exp $
+Include missing header.
Add placeholder for pkgsrc PREFIX to beginning of search list.
Remove date to make builds reproducible (based on Debian patch).
---- src/main.cc.orig 2019-09-27 11:13:24.000000000 +0000
+--- src/main.cc.orig 2024-07-04 06:00:57.000000000 +0000
+++ src/main.cc
-@@ -317,6 +317,7 @@ static void Determine_InstallPath(const
+@@ -30,6 +30,7 @@
+
+ #include <time.h>
+ #include <memory>
++#include <signal.h>
+ #include <stdexcept>
+
+ #include "im_color.h"
+@@ -324,6 +325,7 @@ static void Determine_InstallPath(const
#else
- static const char *prefixes[] =
- {
-+ "PKGSRC_PREFIX",
- "/usr/local",
- "/usr",
- "/opt",
-@@ -968,7 +968,7 @@ static void ShowHelp()
+ static const fs::path prefixes[] =
+ {
++ "PKGSRC_PREFIX",
+ "/usr/local",
+ "/usr",
+ "/opt",
+@@ -1058,7 +1060,7 @@ static void ShowHelp()
static void ShowVersion()
{
Added files:
Index: pkgsrc/games/eureka/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/games/eureka/patches/patch-CMakeLists.txt:1.1
--- /dev/null Mon Jul 8 14:04:43 2024
+++ pkgsrc/games/eureka/patches/patch-CMakeLists.txt Mon Jul 8 14:04:42 2024
@@ -0,0 +1,23 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2024/07/08 14:04:42 micha Exp $
+
+Let pkgsrc handle icon and desktop files.
+
+--- CMakeLists.txt.orig 2024-07-07 19:06:38.000000000 +0000
++++ CMakeLists.txt
+@@ -170,10 +170,12 @@ if(UNIX AND NOT APPLE) # Linux
+ DESTINATION "${eureka_install_dir}"
+ )
+ # The full-install sequence is here
+- install(CODE "execute_process(
+- COMMAND xdg-desktop-menu install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/misc/eureka.desktop
+- COMMAND xdg-icon-resource install --novendor --size 32 ${CMAKE_CURRENT_SOURCE_DIR}/misc/eureka.xpm
+- )")
++ #install(CODE "execute_process(
++ # COMMAND xdg-desktop-menu install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/misc/eureka.desktop
++ # COMMAND xdg-icon-resource install --novendor --size 32 ${CMAKE_CURRENT_SOURCE_DIR}/misc/eureka.xpm
++ #)")
++ install(FILES misc/eureka.xpm DESTINATION share/icons/hicolor/32x32/apps)
++ install(FILES misc/eureka.desktop DESTINATION share/applications)
+
+ # uninstall target
+ if(NOT TARGET uninstall)
Index: pkgsrc/games/eureka/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/games/eureka/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null Mon Jul 8 14:04:43 2024
+++ pkgsrc/games/eureka/patches/patch-src_CMakeLists.txt Mon Jul 8 14:04:42 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2024/07/08 14:04:42 micha Exp $
+
+Remove" -Werror".
+Add "-Wno-cast-function-type".
+Remove duplicated flags (GCC fails because they are inserted with quotes).
+
+--- src/CMakeLists.txt.orig 2024-07-04 06:00:57.000000000 +0000
++++ src/CMakeLists.txt
+@@ -359,7 +359,7 @@ if(MSVC)
+ endif()
+
+ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
+- target_compile_options(eurekasrc PUBLIC "${CMAKE_CXX_FLAGS}" -Wall -Wextra -Werror
++ target_compile_options(eurekasrc PUBLIC -Wall -Wextra -Wno-cast-function-type
+ -Wno-unused-parameter -Wno-missing-field-initializers -Wunused-variable)
+ endif()
+ if ( MSVC )
Index: pkgsrc/games/eureka/patches/patch-src_m__strings.h
diff -u /dev/null pkgsrc/games/eureka/patches/patch-src_m__strings.h:1.1
--- /dev/null Mon Jul 8 14:04:43 2024
+++ pkgsrc/games/eureka/patches/patch-src_m__strings.h Mon Jul 8 14:04:42 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_m__strings.h,v 1.1 2024/07/08 14:04:42 micha Exp $
+
+Fix headers.
+
+--- src/m_strings.h.orig 2024-07-04 06:00:57.000000000 +0000
++++ src/m_strings.h
+@@ -23,7 +23,9 @@
+
+ #include "PrintfMacros.h"
+
+-#include <string.h>
++#include <cstdarg>
++#include <cstdio>
++#include <cstring>
+
+ #include <ostream>
+ #include <string>
Home |
Main Index |
Thread Index |
Old Index