denise: update to version 1.1.0.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: denise: update to version 1.1.0.
From: Olaf Seibert <rhialto%falu.nl@localhost>
Date: Tue, 13 Apr 2021 20:33:22 +0000
Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Tue Apr 13 22:33:22 2021 +0200
Changeset:	9a208e2401b15cbd5fc26b9d4beaea272b334675

Modified Files:
	denise/Makefile
	denise/PLIST
	denise/distinfo
	denise/patches/patch-Makefile
	denise/patches/patch-driver_Makefile
Removed Files:
	denise/patches/patch-driver_video_opengl_bind.h

Log Message:
denise: update to version 1.1.0.

1.1.0

    save/load additional settings files for a lot of purposes, like
        define keyboard inputs for individual games one time only
        prepare different C64 models
        prepare individual Multi SID configurations
    rework sub-menu handling within configuration window
    rework status bar (Drive LED's, Tape control)
        status bar is switchable via Hotkey in windows/fullscreen (Options / Hotkeys)
        show LED for EasyFlash and EF³
    add UI for custom RAM init patterns
    load savestates per drag'n'drop or from File Explorer
    support to paste clipboard or copy screen to clipboard
    fix OpenGL 1/4 screen BUG for newer macOS versions
    Gmod2 cartridge mapper (i.e. Sams Journey)
        support Flash and Eeprom writes
    Magic Desk cartridge mapper
    Final Cartridge I, II, Plus, III, III+
    Simons Basic, Warp Speed
    Atomic Power, Mach5, Pagefox, Ross, Westermann
    expansion port expander to use REU + Retro Replay together
    GeoRAM
    EasyFlash³
        hotkey for menu switch
        support Super Snapshot 5, Retro(Nordic) Replay, Atomic(Nordic) Power
        Kernal replacement
        optional 64 MBit mode
            create a single EF3 file (slot 0) from all slots during emulation
            strip down single EF3 file (slot 0) to all slots (Note: multi CRT file writing can trigger a false positive in your security app)

1.0.9.1

    fix TAPE emulation (broken in 1.0.9)
    nice performance improvement
    load follow-up disks via hotkey
        map hotkeys for disk 1, 2, 3, ...
        map disk 0 for reinserting boot disk
        emulator guesses file name for requested disk and insert it
        override guessing of file names by assigning disks in "Disk Swapper"

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

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

diffstat:
 denise/Makefile                                 |  6 ++-
 denise/PLIST                                    |  1 +
 denise/distinfo                                 | 13 +++---
 denise/patches/patch-Makefile                   | 55 +++++++++++--------------
 denise/patches/patch-driver_Makefile            | 17 +++++---
 denise/patches/patch-driver_video_opengl_bind.h | 19 ---------
 6 files changed, 47 insertions(+), 64 deletions(-)

diffs:
diff --git a/denise/Makefile b/denise/Makefile
index c8e1605dd1..3ed83cc5ba 100644
--- a/denise/Makefile
+++ b/denise/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	v1.0.9
+DISTNAME=	v1.1.0
 PKGNAME=	denise-${DISTNAME:S,^v,,}
 CATEGORIES=	emulators
 MASTER_SITES=	https://bitbucket.org/piciji/denise/get/
@@ -12,10 +12,12 @@ HOMEPAGE=	https://bitbucket.org/piciji/denise/
 COMMENT=	Commodore-64 emulator
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=		${WRKDIR}/piciji-denise-b0f2c4bf4115
+WRKSRC=		${WRKDIR}/piciji-denise-958d8df8f7f7
 USE_LANGUAGES=	c c++	#c++17
 USE_TOOLS+=	gmake
 
+# ??? Doesn't x11-links contain <GL/gl.h> ???
+
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
diff --git a/denise/PLIST b/denise/PLIST
index e9a8f15b9e..93eb462853 100644
--- a/denise/PLIST
+++ b/denise/PLIST
@@ -24,3 +24,4 @@ share/denise/translation/german.txt
 share/denise/translation/japanese.png
 share/denise/translation/japanese.txt
 share/icons/denise.png
+share/mime/packages/application-x-denise.xml
diff --git a/denise/distinfo b/denise/distinfo
index c845fe027f..9ae7c3f040 100644
--- a/denise/distinfo
+++ b/denise/distinfo
@@ -1,9 +1,8 @@
 $NetBSD$
 
-SHA1 (v1.0.9.tar.bz2) = aa792444d372fe353edcabe8328d7b8c9efa31a3
-RMD160 (v1.0.9.tar.bz2) = 8f204e0c3aef864ecd1e5ebad08fc26b5014bf41
-SHA512 (v1.0.9.tar.bz2) = e106db70e37a22c0e861e2860e9fe4c08a91759da401e107b0d00bf0c35c4758367925eaa3b330ed021944ce86d4b4903038dcdb419e401b587293519ab71183
-Size (v1.0.9.tar.bz2) = 5941348 bytes
-SHA1 (patch-Makefile) = ffaa85b5cd947b87fa423e1ecb2bb54a9bd8f46a
-SHA1 (patch-driver_Makefile) = cfb336839ccbef29e01e4fb3fe045340592ff90c
-SHA1 (patch-driver_video_opengl_bind.h) = c09521cece8c1dd1ddd88dda7d5f50a3ae9d867c
+SHA1 (denise/v1.1.0.tar.bz2) = 3d097b86a473a45ddd74c3f8cfb3a60563c2e6e2
+RMD160 (denise/v1.1.0.tar.bz2) = ef9e0cc632b471ed134687171aad9dbe9f1a8e3b
+SHA512 (denise/v1.1.0.tar.bz2) = 2e77d5076395caba74229203e68e6d6cc44f24701a2d0329db2663fd450fb624678246916f9af19e1b3536057adb7bc9f1ac22ee61e6b8fa18a24727756a24a1
+Size (denise/v1.1.0.tar.bz2) = 5994258 bytes
+SHA1 (patch-Makefile) = b2cd86ce177a6ac2d81988969ce17a3720066fdc
+SHA1 (patch-driver_Makefile) = 7bbe730a461cb75c6a56430d352ce5f6eb9aca48
diff --git a/denise/patches/patch-Makefile b/denise/patches/patch-Makefile
index 1dd99a9c93..e80fc96016 100644
--- a/denise/patches/patch-Makefile
+++ b/denise/patches/patch-Makefile
@@ -2,49 +2,42 @@ $NetBSD$
 
 Fix installation directories, and use of install command.
 
---- Makefile.orig	2020-10-25 12:34:43.000000000 +0000
+--- Makefile.orig	2021-03-20 16:41:21.000000000 +0000
 +++ Makefile
-@@ -10,7 +10,7 @@ dataFolder := data
- fontFolder := fonts
+@@ -11,7 +11,8 @@ fontFolder := fonts
  shaderFolder := shader
  imgFolder := img
--prefix := $(HOME)/.local
+ 
+-prefix ?= /usr
 +prefix := ${DESTDIR}${PREFIX}
- target := $(shell g++ --version | grep i686)
++#prefix ?= /usr
+ #prefix ?= $(HOME)/.local
+ 
+ # temporary: to uninstall previous versions of Denise, will be removed in future releases
+@@ -255,17 +256,17 @@ install:
+ 	mkdir -p $(prefix)/share/$(loname)/$(shaderFolder)/
  
- include data/Makefile
-@@ -228,20 +228,20 @@ install:
- 	mkdir -p $(prefix)/bin/
- 	mkdir -p $(prefix)/share/icons/
- 	mkdir -p $(prefix)/share/applications/
--	mkdir -p $(prefix)/$(loname)/$(translationFolder)/
--	mkdir -p $(prefix)/$(loname)/$(dataFolder)/
--	mkdir -p $(prefix)/$(loname)/$(fontFolder)/
--	mkdir -p $(prefix)/$(loname)/$(imgFolder)/
--	mkdir -p $(prefix)/$(loname)/$(shaderFolder)/
--
--	install -D -m 755 out/$(name) $(prefix)/bin/$(name)
+ 	if [ -d $(prefix)/local ]; then	\
+-	    install -D -m 755 out/$(name) $(prefix)/local/bin/$(name);	\
++	    install -m 755 out/$(name) $(prefix)/local/bin/$(name);	\
+ 	else	\
+-	    install -D -m 755 out/$(name) $(prefix)/bin/$(name);	\
++	    install -m 755 out/$(name) $(prefix)/bin/$(name);	\
+ 	fi
 -	install -D -m 644 data/img/$(loname).png $(prefix)/share/icons/$(loname).png
 -	install -D -m 644 data/$(loname).desktop $(prefix)/share/applications/$(loname).desktop
--	install -D -m 644 data/$(translationFolder)/* $(prefix)/$(loname)/$(translationFolder)
--	install -D -m 644 data/$(dataFolder)/* $(prefix)/$(loname)/$(dataFolder)
--	install -D -m 644 data/$(fontFolder)/*.ttf $(prefix)/$(loname)/$(fontFolder)
--	install -D -m 644 data/$(imgFolder)/bundle/* $(prefix)/$(loname)/$(imgFolder)
--	cp -r data/$(shaderFolder)/* $(prefix)/$(loname)/$(shaderFolder)/
-+	mkdir -p $(prefix)/share/$(loname)/$(translationFolder)/
-+	mkdir -p $(prefix)/share/$(loname)/$(dataFolder)/
-+	mkdir -p $(prefix)/share/$(loname)/$(fontFolder)/
-+	mkdir -p $(prefix)/share/$(loname)/$(imgFolder)/
-+	mkdir -p $(prefix)/share/$(loname)/$(shaderFolder)/
-+
-+	install -m 755 out/$(name) $(prefix)/bin/
+-	install -D -m 644 data/application-x-$(loname).xml $(prefix)/share/mime/packages/application-x-$(loname).xml
+-	install -D -m 644 data/$(translationFolder)/* $(prefix)/share/$(loname)/$(translationFolder)
+-	install -D -m 644 data/$(dataFolder)/* $(prefix)/share/$(loname)/$(dataFolder)
+-	install -D -m 644 data/$(fontFolder)/*.ttf $(prefix)/share/$(loname)/$(fontFolder)
+-	install -D -m 644 data/$(imgFolder)/bundle/* $(prefix)/share/$(loname)/$(imgFolder)
 +	install -m 644 data/img/$(loname).png $(prefix)/share/icons/$(loname).png
 +	install -m 644 data/$(loname).desktop $(prefix)/share/applications/$(loname).desktop
++	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)
 +	install -m 644 data/$(imgFolder)/bundle/* $(prefix)/share/$(loname)/$(imgFolder)
-+	cp -r data/$(shaderFolder)/* $(prefix)/share/$(loname)/$(shaderFolder)/
+ 	cp -r data/$(shaderFolder)/* $(prefix)/share/$(loname)/$(shaderFolder)/
      endif
  
- uninstall:
diff --git a/denise/patches/patch-driver_Makefile b/denise/patches/patch-driver_Makefile
index 216814f971..4843fca7c9 100644
--- a/denise/patches/patch-driver_Makefile
+++ b/denise/patches/patch-driver_Makefile
@@ -1,25 +1,32 @@
 $NetBSD$
 
 We don't have udev, and need a RPATH for -lX11.
-Also, GLEW may be the wrong thing but at least it compiles and links.
 
---- driver/Makefile.orig	2020-10-25 12:34:43.000000000 +0000
+--- driver/Makefile.orig	2021-03-20 16:41:21.000000000 +0000
 +++ driver/Makefile
-@@ -21,7 +21,7 @@ else ifeq ($(platform),macosx)
+@@ -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 +43,7 @@ else ifeq ($(platform),macosx)
+@@ -43,7 +44,7 @@ else ifeq ($(platform),macosx)
  else
      drvflags = $(cppflags) 
-     drvflags += `pkg-config --cflags gtk+-3.0`
+     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))
+ 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)
diff --git a/denise/patches/patch-driver_video_opengl_bind.h b/denise/patches/patch-driver_video_opengl_bind.h
deleted file mode 100644
index df5e2a2a3f..0000000000
--- a/denise/patches/patch-driver_video_opengl_bind.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- driver/video/opengl/bind.h.orig	2020-10-25 12:34:43.000000000 +0000
-+++ driver/video/opengl/bind.h
-@@ -1,4 +1,4 @@
--#if defined(_WIN32) || defined(__linux__)
-+#if defined(_WIN32) || defined(__linux__) || defined(__NetBSD__)
- 	PFNGLCREATEPROGRAMPROC glCreateProgram = nullptr;
- 	PFNGLDELETEPROGRAMPROC glDeleteProgram = nullptr;
- 	PFNGLUSEPROGRAMPROC glUseProgram = nullptr;
-@@ -58,7 +58,7 @@ static bool OpenGLBind() {
- 		function = (prototype)glGetProcAddress(#function); \
- 		if(function == nullptr) return false
- 
--	#if defined(_WIN32) || defined(__linux__)
-+	#if defined(_WIN32) || defined(__linux__) || defined(__NetBSD__)
- 		bind(PFNGLCREATEPROGRAMPROC, glCreateProgram);
- 		bind(PFNGLDELETEPROGRAMPROC, glDeleteProgram);
- 		bind(PFNGLUSEPROGRAMPROC, glUseProgram);
Prev by Date: gnome-desktop: Copy x11/gnome-desktop to wip/gnome-desktop2 (candidate for removal)
Next by Date: denise: remove a silly comment.
Previous by Thread: gnome-desktop: Copy x11/gnome-desktop to wip/gnome-desktop2 (candidate for removal)
Next by Thread: denise: remove a silly comment.
Indexes:
Home | Main Index | Thread Index | Old Index