pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

denise: update to 2.3.



Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sat Oct 5 16:36:52 2024 +0200
Changeset:	f40d392adaa264aa006f08e99b43a36d7cfb612d

Modified Files:
	denise/DESCR
	denise/Makefile
	denise/PLIST
	denise/distinfo
Removed Files:
	denise/patches/patch-Makefile
	denise/patches/patch-driver_Makefile

Log Message:
denise: update to 2.3.

2.3

    added RetroArch Shader support
        targets: openGL, D3D11
        converted existing GLSL/HLSL Shaders to SLANG
        fast switching of shaders from a favourite list (shader cache and compilation without blocking App)
        for shader development, compilation errors and translated native code are displayed in the UI
        looking for Shader authors, read more in the next paragraph
    Amiga: improved emulation, especially the disk drive
        thanks to amilo3438 for testing a huge number of games and demos
    Amiga: emulated Bitplane <> Refresh conflicts
    Amiga: Final Fight Enhanced supported by temporary option to fake ECS Denise
    Amiga: written floppy disks are now saved in a second file
        this does not apply to uncompressed ADF (don't worry, emulator asks if ADF can be changed)
        permanent writes are now possible for IPF, compressed images, EXT ADF, DMS
        the folder for the save files can be customized under Amiga > Software > Paths
    Amiga: added 4-player adapter
    Amiga: added copy protection dongle support
    C64: besides PRG, P00 and T64 are loadable as D64
        Drag'n'Drop PRG on Software TAB -> Disk file slot OR
        use filedialog and change file type to "all files"
    C64: fixed Hucky Cart emulation (thanks to Claus)
    fixed a bug not finishing Drag'n'Drop in Linux GTK
    fixed some OSX bugs/crashes [looking for tester]
        ARM builds can now handle IPF capsimg library
        fix UI file dialog crashes
    improved mouse capture handling for all OSes
    UI changes
        many global options are distributed among the individual emulator options
        volume slider has moved to status bar
        Shader controls have been reworked
        all hotkey assignments are now in the same place
        added option to capture pointer by left mouse button
    changed BuildSystem to CMAKE
    added Linux/BSD XCB input driver for keyboard/mouse
    improved GTK window resizing in some desktop environments

2.2.1

    fixed spanish translation

2.2

    added D3D11 driver
        openGL has bad VSYNC/VRR behavior on Windows 11 (replace it with D3D11: Options->Video->Driver)
        ported internal and external openGL shader to D3D11
    added italian translation (thanks to Luigi)
    added an option to rotate the screen (90°/180°/270°)
    added an option to force a single instance when opening another instance from frontend loader or file explorer
    fixed Amiga basic volume (louder)
    improved 1571 emulation
    added C64 cartridges: Comal-80, Silverrock, RGCD
    added a more easy way to set stereo separation (Audio -> DSP)
    added tapes to swapper (mixed disc/tape swapper)
    added option to decide if manual warping stops automatic warping until next restart
    added more options to control the screen aspect ratio
    added button/hotkey to crop the outer frame after resizing or changing "aspect ratio" or emulated border

2.1

    add drag'n'drop overlay
        files can be inserted into additional drives faster
        files can either only be inserted or inserted and restarted
        multi file support
    fix: Wasapi didn't work on some audio hardware
    thanks to all translators: Ben, Ulgon, Ferenc, Muzza
    [Amiga]
    greatly improved accuracy, thanks to amilo3438, vAmigaTS, CPU Tester, AW182
    ~15% speed up
    fix: Drive LED sometimes does not turn off
    display tracks more clearly
    add IPF, DMS, EXE and encrypted kick rom support
    add RTC
    add multi file support for any-loader (fill DF0-3 in one go)
    show power LED in status line
        colors for power and drive LEDs depend on the model
        click on power LED to select audio filter
    [C64]
    fix: multi SID UI not updated correctly from config
    fix: sometimes crashes when changing speeder
    add cartridges: Dinamic, Diashow Maker, Super Snapshot V5
    add option to intensify pseudo stereo (now also works with same SID models)

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

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

diffstat:
 denise/DESCR                         |  2 +-
 denise/Makefile                      |  9 ++++++---
 denise/PLIST                         | 39 +++++++++++++++++++++++++++++-------
 denise/distinfo                      |  8 +++-----
 denise/patches/patch-Makefile        | 34 -------------------------------
 denise/patches/patch-driver_Makefile | 11 ----------
 6 files changed, 42 insertions(+), 61 deletions(-)

diffs:
diff --git a/denise/DESCR b/denise/DESCR
index ef6b23fae6..4c7d261c9b 100644
--- a/denise/DESCR
+++ b/denise/DESCR
@@ -1 +1 @@
-Denise is a Commodore 64 emulator.
+Denise is a Commodore 64 and Amiga emulator.
diff --git a/denise/Makefile b/denise/Makefile
index 9e202917ed..cfc95a5042 100644
--- a/denise/Makefile
+++ b/denise/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	v2.0
+DISTNAME=	v2.3
 PKGNAME=	denise-${DISTNAME:S,^v,,}
 CATEGORIES=	emulators
 MASTER_SITES=	https://bitbucket.org/piciji/denise/get/
@@ -9,10 +9,10 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	rhialto%NetBSD.org@localhost
 HOMEPAGE=	https://bitbucket.org/piciji/denise/
-COMMENT=	Commodore-64 emulator
+COMMENT=	Commodore-64 and Amiga emulator
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=		${WRKDIR}/piciji-denise-216a07cbd83c
+WRKSRC=		${WRKDIR}/piciji-denise-7321cf311bdd
 USE_LANGUAGES=	c c++17
 USE_TOOLS+=	gmake pkg-config
 
@@ -22,9 +22,12 @@ SUBST_MESSAGE.path=	Fixing reference to installation path
 SUBST_FILES.path+=	guikit/gtk/tools.cpp
 SUBST_SED.path=		-e "s;/usr/pkg;${PREFIX};"
 
+.include "../../devel/cmake/build.mk"
+
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/denise/PLIST b/denise/PLIST
index 1ed9486969..243a1f70f2 100644
--- a/denise/PLIST
+++ b/denise/PLIST
@@ -16,13 +16,37 @@ 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/mediaSlot0.png
+share/denise/img/mediaSlot1.png
+share/denise/img/progress.png
 share/denise/img/startscreen.png
-share/denise/shader/CRT-Lottes.shader/manifest
-share/denise/shader/CRT-Lottes.shader/shadertoy.fs
-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/shader/amiga_svideo.slangp
+share/denise/shader/amiga_svideo_light.slangp
+share/denise/shader/amiga_svideo_scanlines.slangp
+share/denise/shader/c64_svideo.slangp
+share/denise/shader/c64_svideo_light.slangp
+share/denise/shader/c64_svideo_scanlines.slangp
+share/denise/shader/lottes.slang
+share/denise/shader/resources/bandwidth.slang
+share/denise/shader/resources/bloomHorizontal.slang
+share/denise/shader/resources/bloomVertical.slang
+share/denise/shader/resources/colorDecoding.slang
+share/denise/shader/resources/colorEncoding.slang
+share/denise/shader/resources/gamma.slang
+share/denise/shader/resources/lumaLatency.slang
+share/denise/shader/resources/lutBandwidth.png
+share/denise/shader/resources/lutBloom.png
+share/denise/shader/resources/lutMaskAperture.png
+share/denise/shader/resources/lutMaskShadow.png
+share/denise/shader/resources/lutMaskSlot.png
+share/denise/shader/resources/mask.slang
+share/denise/shader/resources/noise.slang
+share/denise/shader/resources/radialDistortion.slang
+share/denise/shader/resources/randomLineOffset.slang
+share/denise/shader/resources/scanlines.slang
+share/denise/shader/resources/vicGlitches.slang
+share/denise/shader/trinitron.slang
+share/denise/shader/trinitron2.slang
 share/denise/sounds/floppy/Amiga/extern/eject.wav
 share/denise/sounds/floppy/Amiga/extern/insert.wav
 share/denise/sounds/floppy/Amiga/extern/spin.wav
@@ -149,9 +173,10 @@ share/denise/translation/german.png
 share/denise/translation/german.txt
 share/denise/translation/hungarian.png
 share/denise/translation/hungarian.txt
+share/denise/translation/italian.png
+share/denise/translation/italian.txt
 share/denise/translation/japanese.png
 share/denise/translation/japanese.txt
 share/denise/translation/spanish.png
 share/denise/translation/spanish.txt
 share/icons/denise.png
-@pkgdir share/mime/packages
diff --git a/denise/distinfo b/denise/distinfo
index 67c253724a..4c8a2cd448 100644
--- a/denise/distinfo
+++ b/denise/distinfo
@@ -1,8 +1,6 @@
 $NetBSD$
 
-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
+BLAKE2s (denise/v2.3.tar.bz2) = a5c17eab2ecc6b8f847e051e70b62a61315f993e51ffac5fe7b8118bf5192533
+SHA512 (denise/v2.3.tar.bz2) = 1046d2e20e10be81e23b23af31c4820d7bbe339db216a4427d6f1d1bb09ca60261c140f603200fcef5a5bc4bea434cbd0f9e41c19f517075941f6d464b843152
+Size (denise/v2.3.tar.bz2) = 19381619 bytes
 SHA1 (patch-emulation_tools_socket.cpp) = 3d3fe88b3b51f95962fe068b1ea5375a048fd4b4
diff --git a/denise/patches/patch-Makefile b/denise/patches/patch-Makefile
deleted file mode 100644
index 0df12d6f0c..0000000000
--- a/denise/patches/patch-Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-Fix installation directories, and use of install command.
-
---- Makefile.orig	2023-04-21 20:52:47.000000000 +0000
-+++ Makefile
-@@ -15,7 +15,8 @@ shaderFolder := shader
- imgFolder := img
- soundFolder := sounds
- 
--prefix ?= /usr
-+prefix := ${DESTDIR}${PREFIX}
-+#prefix ?= /usr
- #prefix ?= $(HOME)/.local
- 
- include data/Makefile
-@@ -275,7 +276,7 @@ ifeq ($(platform),macosx)
- else ifeq ($(platform),windows)
- 	$(strip $(compiler) -o out/$(name) $(objects) $(link))
- else ifeq ($(platform),BSD)
--	@sed -i '' '1 s/$$(wildcard //g;1 s/.o:/.o: $$\(wildcard/g;$$ s/)//g;$$ s/$$/\)/g' obj/*.d
-+	#@sed -i '' '1 s/$$(wildcard //g;1 s/.o:/.o: $$\(wildcard/g;$$ s/)//g;$$ s/$$/\)/g' obj/*.d
- 
- 	$(strip $(compiler) -o out/$(loname) $(objects) $(link))
- else
-@@ -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
- 	if [ -d $(prefix)/share/$(loname) ]; then rm -rf $(prefix)/share/$(loname); fi
-     endif
diff --git a/denise/patches/patch-driver_Makefile b/denise/patches/patch-driver_Makefile
deleted file mode 100644
index 3ca85a94be..0000000000
--- a/denise/patches/patch-driver_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
---- driver/Makefile.orig	2023-04-21 20:52:47.000000000 +0000
-+++ driver/Makefile
-@@ -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)
--drvlink += $(if $(findstring udev,$(drv)),-ludev)
-+# drvlink += $(if $(findstring udev,$(drv)),-ludev)
- drvlink += $(if $(findstring pulseaudio,$(drv)),-lpulse)


Home | Main Index | Thread Index | Old Index