denise: update to 2.0, adding 68000 Amiga emulation

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: denise: update to 2.0, adding 68000 Amiga emulation
From: Olaf Seibert <rhialto%falu.nl@localhost>
Date: Wed, 28 Jun 2023 16:21:48 +0000
Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Wed Jun 28 18:21:48 2023 +0200
Changeset:	2f2d609920744ad1cd8fdbf68804a772f27a3e17

Modified Files:
	denise/Makefile
	denise/PLIST
	denise/distinfo
	denise/patches/patch-Makefile
	denise/patches/patch-driver_Makefile
Removed Files:
	denise/patches/patch-data_Makefile
	denise/patches/patch-emulation_tools_socket.cpp
	denise/patches/patch-guikit_gtk_main.cpp

Log Message:
denise: update to 2.0, adding 68000 Amiga emulation

Changelog:

2.0
    add Amiga emulation
        A1000 (OSC/ICS), A500 (Full OCS), A500 (ECS Agnus, OCS Denise)
        RGB or S-Video with PAL/NTSC color encoding, border cropping
        support all global features like: runAhead, savestates, G-Sync, configs, Warp, JIT polling, shader
        up to 4 disk drives with acceleration option
        Chipram, Slowram, Fastram
        list disk content in UI
        AROS firmware is preinstalled
        motor controlled auto warp
        drive sounds
        support custom frequencies like B.C. Kid (56.4 Hz)
        if you only want to use one of the two emulators, Amiga or C64 core can be hidden
    emulator now boots automatically after power on
        Splash screen can be disabled
        emulator remembers which core was used last
    disk swapper can be filled faster due to multiple selection of files
        files from archives can also be added quickly
        if requested disk swap position is not prepared, emulator guesses the disk based on requested position and the currently inserted disk
    windows: prevent App minification when focus loss in fullscreen
    C64: add option to combine Virtual Device Traps (instant load first file) with floppy speeder
    C64: improve drive motor controlled auto warp
        add option to stop auto warp when software requests input, because
        some games stop drive motor too late and warp runs too long, what could lead to the loss of a life
    C64: support magicdesk CRT's with broken header
    C64: fix runahead slowdown with REU/GeoRAM when using a lot of memory, e.g. REU 16 MB
    Mice and other mouse-controlled devices, such as Lightguns, can now be configured with one click

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

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

diffstat:
 denise/Makefile                                 |  4 ++--
 denise/PLIST                                    | 13 ++++++++++++-
 denise/distinfo                                 | 13 +++++--------
 denise/patches/patch-Makefile                   | 25 ++++++++++---------------
 denise/patches/patch-data_Makefile              | 16 ----------------
 denise/patches/patch-driver_Makefile            | 25 ++-----------------------
 denise/patches/patch-emulation_tools_socket.cpp | 14 --------------
 denise/patches/patch-guikit_gtk_main.cpp        | 16 ----------------
 8 files changed, 31 insertions(+), 95 deletions(-)

diffs:
diff --git a/denise/Makefile b/denise/Makefile
index fb28b4d4b0..9e202917ed 100644
--- a/denise/Makefile
+++ b/denise/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	v1.1.3.1
+DISTNAME=	v2.0
 PKGNAME=	denise-${DISTNAME:S,^v,,}
 CATEGORIES=	emulators
 MASTER_SITES=	https://bitbucket.org/piciji/denise/get/
@@ -12,7 +12,7 @@ HOMEPAGE=	https://bitbucket.org/piciji/denise/
 COMMENT=	Commodore-64 emulator
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=		${WRKDIR}/piciji-denise-c592258703c8
+WRKSRC=		${WRKDIR}/piciji-denise-216a07cbd83c
 USE_LANGUAGES=	c c++17
 USE_TOOLS+=	gmake pkg-config
 
diff --git a/denise/PLIST b/denise/PLIST
index 5de330b1e4..1ed9486969 100644
--- a/denise/PLIST
+++ b/denise/PLIST
@@ -3,7 +3,9 @@ bin/denise
 share/applications/denise.desktop
 share/denise/data/Basic
 share/denise/data/Char
+share/denise/data/Extrom
 share/denise/data/Kernal
+share/denise/data/Kickrom
 share/denise/data/VC1541
 share/denise/data/VC1541-C
 share/denise/data/VC1541-II
@@ -12,6 +14,8 @@ share/denise/data/VC1571
 share/denise/fonts/C64_Pro-STYLE121.ttf
 share/denise/fonts/C64_Pro_Mono-STYLE.ttf
 share/denise/fonts/C64_Pro_Mono-STYLE121.ttf
+share/denise/fonts/TopazPlus_a500_v1.0.ttf
+share/denise/fonts/Topaz_a500_v1.0.ttf
 share/denise/img/startscreen.png
 share/denise/shader/CRT-Lottes.shader/manifest
 share/denise/shader/CRT-Lottes.shader/shadertoy.fs
@@ -19,6 +23,13 @@ share/denise/shader/CRT-Trinitron.shader/crt-trinitron.fs
 share/denise/shader/CRT-Trinitron.shader/manifest.bml
 share/denise/shader/CRT-Trinitron2.shader/crt-trinitron.fs
 share/denise/shader/CRT-Trinitron2.shader/manifest.bml
+share/denise/sounds/floppy/Amiga/extern/eject.wav
+share/denise/sounds/floppy/Amiga/extern/insert.wav
+share/denise/sounds/floppy/Amiga/extern/spin.wav
+share/denise/sounds/floppy/Amiga/extern/spindown.wav
+share/denise/sounds/floppy/Amiga/extern/spinup.wav
+share/denise/sounds/floppy/Amiga/extern/step.wav
+share/denise/sounds/floppy/Amiga/extern/stepseek.wav
 share/denise/sounds/floppy/C64/1541-TrackersWorld/eject.wav
 share/denise/sounds/floppy/C64/1541-TrackersWorld/headbang.wav
 share/denise/sounds/floppy/C64/1541-TrackersWorld/insert.wav
@@ -143,4 +154,4 @@ share/denise/translation/japanese.txt
 share/denise/translation/spanish.png
 share/denise/translation/spanish.txt
 share/icons/denise.png
-share/mime/packages/application-x-denise.xml
+@pkgdir share/mime/packages
diff --git a/denise/distinfo b/denise/distinfo
index 003f4aa650..504a290102 100644
--- a/denise/distinfo
+++ b/denise/distinfo
@@ -1,10 +1,7 @@
 $NetBSD$
 
-BLAKE2s (denise/v1.1.3.1.tar.bz2) = 09985665f436161de663c68b21da862fc45f312c3170c1603a0e6ae5e1964eae
-SHA512 (denise/v1.1.3.1.tar.bz2) = cd987b26de621a2b2c6cba149210b5795e13292b054320a9320d36bfee759cf4306db880f43bb4f9c45bf8a8af0c1fb48d2c28e40300c832002f24bed7f7ceb6
-Size (denise/v1.1.3.1.tar.bz2) = 11430217 bytes
-SHA1 (patch-Makefile) = 003ca5b84e18e7603d6e2d0fb183edf4557da2e7
-SHA1 (patch-data_Makefile) = 506377eae091e8dc7da38fad68d0e7d8820032e1
-SHA1 (patch-driver_Makefile) = 7bbe730a461cb75c6a56430d352ce5f6eb9aca48
-SHA1 (patch-emulation_tools_socket.cpp) = 6ae695c4187de352f4d27c7d7a3f937869850cf7
-SHA1 (patch-guikit_gtk_main.cpp) = a8ef2efc8fc297be82d34d30bb4ce58eb1b2592f
+BLAKE2s (denise/v2.0.tar.bz2) = 311e6b46b988b4d594f0e06bae650257dd365b500ed4722493e816c5c410a63b
+SHA512 (denise/v2.0.tar.bz2) = aa320950721ec924a05b7ff40d0bd4901a597a699f94cd58365dfc75f104f7396cf02f6d8080cba53a3de2ec84ddf72c0888e6041516cc37ced12da257c6238a
+Size (denise/v2.0.tar.bz2) = 16324313 bytes
+SHA1 (patch-Makefile) = 2050b7b562345d9fc0290732bbf49734dcc06591
+SHA1 (patch-driver_Makefile) = a3179f48c86f3819f0ef7108d6466859dbd585a5
diff --git a/denise/patches/patch-Makefile b/denise/patches/patch-Makefile
index 02c10f0072..0df12d6f0c 100644
--- a/denise/patches/patch-Makefile
+++ b/denise/patches/patch-Makefile
@@ -2,9 +2,9 @@ $NetBSD$
 
 Fix installation directories, and use of install command.
 
---- Makefile.orig	2022-06-27 19:02:54.000000000 +0000
+--- Makefile.orig	2023-04-21 20:52:47.000000000 +0000
 +++ Makefile
-@@ -14,7 +14,8 @@ shaderFolder := shader
+@@ -15,7 +15,8 @@ shaderFolder := shader
  imgFolder := img
  soundFolder := sounds
  
@@ -14,7 +14,7 @@ Fix installation directories, and use of install command.
  #prefix ?= $(HOME)/.local
  
  include data/Makefile
-@@ -256,7 +258,7 @@ ifeq ($(platform),macosx)
+@@ -275,7 +276,7 @@ ifeq ($(platform),macosx)
  else ifeq ($(platform),windows)
  	$(strip $(compiler) -o out/$(name) $(objects) $(link))
  else ifeq ($(platform),BSD)
@@ -23,17 +23,12 @@ Fix installation directories, and use of install command.
  
  	$(strip $(compiler) -o out/$(loname) $(objects) $(link))
  else
-@@ -319,12 +321,7 @@ install: ## Install
- 	fi
- 	install -m 644 data/img/$(loname).png $(prefix)/share/icons/$(loname).png
- 	install -m 644 data/$(loname).desktop $(prefix)/share/applications/$(loname).desktop
--	@echo "Install file associations? [y/n]"; \
--	read line; if [ $$line = "y" ]; then \
--	    install -m 644 data/application-x-$(loname).xml $(prefix)/share/mime/packages/application-x-$(loname).xml; \
+@@ -367,8 +368,6 @@ uninstall: ## Unistall
+ 	if [ -f $(prefix)/share/applications/$(loname).desktop ]; then rm $(prefix)/share/applications/$(loname).desktop; fi
+ 	if [ -f $(prefix)/share/mime/packages/application-x-$(loname).xml ]; then \
+ 		rm $(prefix)/share/mime/packages/application-x-$(loname).xml; \
 -	    if [ $(shell which update-mime-database) ]; then update-mime-database $(prefix)/share/mime; fi; \
 -	    if [ $(shell which update-desktop-database) ]; then update-desktop-database $(prefix)/share/applications; fi; \
--	fi
-+	    install -m 644 data/application-x-$(loname).xml $(prefix)/share/mime/packages/application-x-$(loname).xml;
- 	install -m 644 data/$(translationFolder)/* $(prefix)/share/$(loname)/$(translationFolder)
- 	install -m 644 data/$(dataFolder)/* $(prefix)/share/$(loname)/$(dataFolder)
- 	install -m 644 data/$(fontFolder)/*.ttf $(prefix)/share/$(loname)/$(fontFolder)
+ 	fi
+ 	if [ -d $(prefix)/share/$(loname) ]; then rm -rf $(prefix)/share/$(loname); fi
+     endif
diff --git a/denise/patches/patch-data_Makefile b/denise/patches/patch-data_Makefile
deleted file mode 100644
index d1d44f6fdc..0000000000
--- a/denise/patches/patch-data_Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Use plain g++ instead of g++10.
-
---- data/Makefile.bak	2022-09-11 17:48:38.629412808 +0000
-+++ data/Makefile
-@@ -33,7 +33,8 @@ ifeq ($(compiler),)
- 	compiler := clang++
-     endif
-     ifeq ($(platform),BSD)
--	compiler := g++10
-+	# compiler := g++10
-+	compiler := g++
-     endif
- endif
- 
diff --git a/denise/patches/patch-driver_Makefile b/denise/patches/patch-driver_Makefile
index 4843fca7c9..3ca85a94be 100644
--- a/denise/patches/patch-driver_Makefile
+++ b/denise/patches/patch-driver_Makefile
@@ -1,29 +1,8 @@
 $NetBSD$
 
-We don't have udev, and need a RPATH for -lX11.
-
---- driver/Makefile.orig	2021-03-20 16:41:21.000000000 +0000
+--- driver/Makefile.orig	2023-04-21 20:52:47.000000000 +0000
 +++ driver/Makefile
-@@ -21,7 +21,8 @@ else ifeq ($(platform),macosx)
-     drv += cgl openal coreaudio iokit
- 
- else
--    drv += glx openal pulseaudio xlib udev sdlinput
-+    # drv += glx openal pulseaudio xlib udev sdlinput
-+    drv += glx openal pulseaudio xlib sdlinput
- 
- endif
- # show in screen status text for opengl
-@@ -43,7 +44,7 @@ else ifeq ($(platform),macosx)
- else
-     drvflags = $(cppflags) 
-     drvflags += $(shell pkg-config --cflags gtk+-3.0)
--    drvlink = -lX11 -lXext -ldl -lXfixes
-+    drvlink = -Wl,-R,/usr/X11R7/lib -lX11 -lXext -lXfixes
-     drvlink += $(if $(findstring openal,$(drv)),-lopenal)
-     ifneq ($(findstring xlib,$(drv)),)
- 	drvlink += $(if $(findstring sdl,$(drv)), $(shell $(env)sdl2-config --libs))
-@@ -75,5 +76,5 @@ drvlink += $(if $(findstring cgl,$(drv))
+@@ -72,5 +72,5 @@ drvlink += $(if $(findstring cgl,$(drv))
  drvlink += $(if $(findstring coreaudio,$(drv)),-framework CoreAudio -framework AudioToolbox -framework AudioUnit)
  
  drvlink += $(if $(findstring glx,$(drv)),-lGL)
diff --git a/denise/patches/patch-emulation_tools_socket.cpp b/denise/patches/patch-emulation_tools_socket.cpp
deleted file mode 100644
index 6ec34001c5..0000000000
--- a/denise/patches/patch-emulation_tools_socket.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Include required header file.
-
---- emulation/tools/socket.cpp.orig	2021-05-12 15:32:16.000000000 +0000
-+++ emulation/tools/socket.cpp
-@@ -6,6 +6,7 @@
-     #define closesocket close
-     #include <sys/socket.h>
-     #include <netdb.h>
-+    #include <netinet/in.h>
-     #include <netinet/tcp.h>
-     #include <unistd.h>
-     #include <cerrno>
diff --git a/denise/patches/patch-guikit_gtk_main.cpp b/denise/patches/patch-guikit_gtk_main.cpp
deleted file mode 100644
index 8650600e51..0000000000
--- a/denise/patches/patch-guikit_gtk_main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Don't crash if XDG_CURRENT_DESKTOP is not set.
-
---- guikit/gtk/main.cpp.orig	2022-06-27 19:02:54.000000000 +0000
-+++ guikit/gtk/main.cpp
-@@ -78,6 +78,9 @@ auto pApplication::fetchDesktopSession()
- 
-     const char* currentDesktop = getenv("XDG_CURRENT_DESKTOP");
- 
-+    if (currentDesktop == NULL)
-+	return;
-+
-     if (String::findString(currentDesktop, "Cinnamon"))
-         desktopSession = DesktopSession::Cinnamon;
-     else if (String::findString(currentDesktop, "GNOME"))
Prev by Date: libxtend: Update to 0.1.8.5
Next by Date: biolibc: Update to 0.2.4.5
Previous by Thread: libxtend: Update to 0.1.8.5
Next by Thread: biolibc: Update to 0.2.4.5
Indexes:
Home | Main Index | Thread Index | Old Index