pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

denise: update to 1.1.3.1.

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Mon Sep 12 21:16:22 2022 +0200
Changeset:	440794362cf53221b12531f9e84eeece111b41c0

Modified Files:
	denise/Makefile
	denise/PLIST
	denise/distinfo
	denise/patches/patch-Makefile
Added Files:
	denise/patches/patch-data_Makefile
	denise/patches/patch-guikit_gtk_main.cpp

Log Message:
denise: update to 1.1.3.1.

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

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                             | 87 +++++++++++++++++++++++++++++++-
 denise/distinfo                          | 10 ++--
 denise/patches/patch-Makefile            | 50 +++++++++---------
 denise/patches/patch-data_Makefile       | 16 ++++++
 denise/patches/patch-guikit_gtk_main.cpp | 16 ++++++
 6 files changed, 149 insertions(+), 34 deletions(-)

diffs:
diff --git a/denise/Makefile b/denise/Makefile
index 5219d6de88..abe41a7717 100644
--- a/denise/Makefile
+++ b/denise/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	v1.1.2
+DISTNAME=	v1.1.3.1
 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-a3a771d2672c
+WRKSRC=		${WRKDIR}/piciji-denise-c592258703c8
 USE_LANGUAGES=	c c++17
 USE_TOOLS+=	gmake
 
diff --git a/denise/PLIST b/denise/PLIST
index 780b8fd59d..5de330b1e4 100644
--- a/denise/PLIST
+++ b/denise/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD$
-bin/Denise
+bin/denise
 share/applications/denise.desktop
 share/denise/data/Basic
 share/denise/data/Char
@@ -33,6 +33,80 @@ share/denise/sounds/floppy/C64/1541-agedDisk/spin.wav
 share/denise/sounds/floppy/C64/1541-agedDisk/spindown.wav
 share/denise/sounds/floppy/C64/1541-agedDisk/spinup.wav
 share/denise/sounds/floppy/C64/1541-agedDisk/step.wav
+share/denise/sounds/floppy/C64/1541-newtronics/eject.wav
+share/denise/sounds/floppy/C64/1541-newtronics/headbang.wav
+share/denise/sounds/floppy/C64/1541-newtronics/insert.wav
+share/denise/sounds/floppy/C64/1541-newtronics/spin.wav
+share/denise/sounds/floppy/C64/1541-newtronics/spindown.wav
+share/denise/sounds/floppy/C64/1541-newtronics/spinup.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step1.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step10.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step11.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step12.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step13.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step14.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step15.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step16.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step17.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step18.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step19.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step2.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step20.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step21.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step22.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step23.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step24.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step25.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step26.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step27.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step28.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step29.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step3.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step30.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step31.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step32.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step33.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step34.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step4.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step5.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step6.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step7.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step8.wav
+share/denise/sounds/floppy/C64/1541-newtronics/step9.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort1.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort10.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort11.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort12.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort13.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort14.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort15.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort16.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort17.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort18.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort19.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort2.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort20.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort21.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort22.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort23.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort24.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort25.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort26.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort27.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort28.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort29.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort3.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort30.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort31.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort32.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort33.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort34.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort4.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort5.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort6.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort7.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort8.wav
+share/denise/sounds/floppy/C64/1541-newtronics/stepshort9.wav
 share/denise/sounds/floppy/C64/1541-rubbed/eject.wav
 share/denise/sounds/floppy/C64/1541-rubbed/headbang.wav
 share/denise/sounds/floppy/C64/1541-rubbed/insert.wav
@@ -47,6 +121,15 @@ share/denise/sounds/floppy/C64/1541-silent/spin.wav
 share/denise/sounds/floppy/C64/1541-silent/spindown.wav
 share/denise/sounds/floppy/C64/1541-silent/spinup.wav
 share/denise/sounds/floppy/C64/1541-silent/step.wav
+share/denise/sounds/tape/C64/low-cost/anybutton.wav
+share/denise/sounds/tape/C64/low-cost/eject.wav
+share/denise/sounds/tape/C64/low-cost/forwardspin.wav
+share/denise/sounds/tape/C64/low-cost/insert.wav
+share/denise/sounds/tape/C64/low-cost/playspin.wav
+share/denise/sounds/tape/C64/low-cost/playspinup.wav
+share/denise/sounds/tape/C64/low-cost/rewindspin.wav
+share/denise/sounds/tape/C64/low-cost/spindown.wav
+share/denise/sounds/tape/C64/low-cost/stopbutton.wav
 share/denise/translation/english.png
 share/denise/translation/english.txt
 share/denise/translation/french.png
@@ -57,5 +140,7 @@ share/denise/translation/hungarian.png
 share/denise/translation/hungarian.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
 share/mime/packages/application-x-denise.xml
diff --git a/denise/distinfo b/denise/distinfo
index d50c7f2cc8..003f4aa650 100644
--- a/denise/distinfo
+++ b/denise/distinfo
@@ -1,8 +1,10 @@
 $NetBSD$
 
-BLAKE2s (denise/v1.1.2.tar.bz2) = bf8a7ce61986056f3111f6f2631b2a622da17a26a6f50030665369135a8d3559
-SHA512 (denise/v1.1.2.tar.bz2) = e061d224831e5502728b6ace698dbd86c4ecde050f517d30e9e5e1d02fe09a576f21679fbff3e9fa0a52d5178ab3d5d88a1ccbadfd0c74d9bd59348ab019f29d
-Size (denise/v1.1.2.tar.bz2) = 8888652 bytes
-SHA1 (patch-Makefile) = 79b2a01b93a301bf4b1dabe375332f2529ac3efb
+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
diff --git a/denise/patches/patch-Makefile b/denise/patches/patch-Makefile
index 0abd2ff4b2..02c10f0072 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	2021-11-16 17:17:14.000000000 +0000
+--- Makefile.orig	2022-06-27 19:02:54.000000000 +0000
 +++ Makefile
-@@ -12,7 +12,8 @@ shaderFolder := shader
+@@ -14,7 +14,8 @@ shaderFolder := shader
  imgFolder := img
  soundFolder := sounds
  
@@ -14,30 +14,26 @@ Fix installation directories, and use of install command.
  #prefix ?= $(HOME)/.local
  
  include data/Makefile
-@@ -271,17 +272,17 @@ install:
- 	mkdir -p $(prefix)/share/$(loname)/$(shaderFolder)/
+@@ -256,7 +258,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
  
- 	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);	\
+ 	$(strip $(compiler) -o out/$(loname) $(objects) $(link))
+ else
+@@ -319,12 +321,7 @@ install: ## Install
  	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/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/$(soundFolder)/* $(prefix)/share/$(loname)/$(soundFolder)/
- 	cp -r data/$(shaderFolder)/* $(prefix)/share/$(loname)/$(shaderFolder)/
-     endif
+ 	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; \
+-	    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)
diff --git a/denise/patches/patch-data_Makefile b/denise/patches/patch-data_Makefile
new file mode 100644
index 0000000000..d1d44f6fdc
--- /dev/null
+++ b/denise/patches/patch-data_Makefile
@@ -0,0 +1,16 @@
+$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-guikit_gtk_main.cpp b/denise/patches/patch-guikit_gtk_main.cpp
new file mode 100644
index 0000000000..8650600e51
--- /dev/null
+++ b/denise/patches/patch-guikit_gtk_main.cpp
@@ -0,0 +1,16 @@
+$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"))
Home | Main Index | Thread Index | Old Index