denise: added first version, doesn't work for me yet.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: denise: added first version, doesn't work for me yet.
From: Olaf Seibert <rhialto%falu.nl@localhost>
Date: Sun, 25 Oct 2020 17:41:13 +0000
Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sun Oct 25 18:41:13 2020 +0100
Changeset:	70e13045709d4245ebf4cc2a2249372480ff355e

Modified Files:
	Makefile
Added Files:
	denise/DESCR
	denise/Makefile
	denise/PLIST
	denise/distinfo
	denise/patches/patch-Makefile
	denise/patches/patch-driver_Makefile
	denise/patches/patch-driver_video_opengl_opengl.h

Log Message:
denise: added first version, doesn't work for me yet.

(it crashes, maybe due to -lGLEW)

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

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

diffstat:
 Makefile                                          |  1 +
 denise/DESCR                                      |  1 +
 denise/Makefile                                   | 24 +++++++++++
 denise/PLIST                                      | 26 ++++++++++++
 denise/distinfo                                   |  9 ++++
 denise/patches/patch-Makefile                     | 50 +++++++++++++++++++++++
 denise/patches/patch-driver_Makefile              | 33 +++++++++++++++
 denise/patches/patch-driver_video_opengl_opengl.h | 16 ++++++++
 8 files changed, 160 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index ff249001ec..6b0700bba6 100644
--- a/Makefile
+++ b/Makefile
@@ -585,6 +585,7 @@ SUBDIR+=	deforaos-init
 SUBDIR+=	deforaos-probe
 SUBDIR+=	deluge
 SUBDIR+=	delve
+SUBDIR+=	denise
 SUBDIR+=	denyhosts
 SUBDIR+=	depsolver
 SUBDIR+=	deskcribe
diff --git a/denise/DESCR b/denise/DESCR
new file mode 100644
index 0000000000..ef6b23fae6
--- /dev/null
+++ b/denise/DESCR
@@ -0,0 +1 @@
+Denise is a Commodore 64 emulator.
diff --git a/denise/Makefile b/denise/Makefile
new file mode 100644
index 0000000000..927d83dc59
--- /dev/null
+++ b/denise/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD$
+
+DISTNAME=	v1.0.9
+PKGNAME=	denise-${DISTNAME:S,^v,,}
+CATEGORIES=	emulators
+MASTER_SITES=	https://bitbucket.org/piciji/denise/get/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rhialto%NetBSD.org@localhost
+HOMEPAGE=	https://bitbucket.org/piciji/denise/
+COMMENT=	Commodore-64 emulator
+#LICENSE=	# TODO: (see mk/license.mk)
+
+WRKSRC=		${WRKDIR}/piciji-denise-b0f2c4bf4115
+USE_LANGUAGES=	c c++	#c++17
+USE_TOOLS+=	gmake
+
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"	# needed? glUseProgram, glDeleteSync, glGetUniformLocation, glClientWaitSync, glBindFramebuffer, ...
+.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../audio/openal-soft/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/denise/PLIST b/denise/PLIST
new file mode 100644
index 0000000000..e9a8f15b9e
--- /dev/null
+++ b/denise/PLIST
@@ -0,0 +1,26 @@
+@comment $NetBSD$
+bin/Denise
+share/applications/denise.desktop
+share/denise/data/Basic
+share/denise/data/Char
+share/denise/data/Kernal
+share/denise/data/VC1541-II
+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/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/translation/english.png
+share/denise/translation/english.txt
+share/denise/translation/french.png
+share/denise/translation/french.txt
+share/denise/translation/german.png
+share/denise/translation/german.txt
+share/denise/translation/japanese.png
+share/denise/translation/japanese.txt
+share/icons/denise.png
diff --git a/denise/distinfo b/denise/distinfo
new file mode 100644
index 0000000000..d2ad491449
--- /dev/null
+++ b/denise/distinfo
@@ -0,0 +1,9 @@
+$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) = fdf126d30eec635fdc01f9adac5ac330404b4b3a
+SHA1 (patch-driver_video_opengl_opengl.h) = f4a18802efc2d05e7f68ed23e3d12c75541256f9
diff --git a/denise/patches/patch-Makefile b/denise/patches/patch-Makefile
new file mode 100644
index 0000000000..1dd99a9c93
--- /dev/null
+++ b/denise/patches/patch-Makefile
@@ -0,0 +1,50 @@
+$NetBSD$
+
+Fix installation directories, and use of install command.
+
+--- Makefile.orig	2020-10-25 12:34:43.000000000 +0000
++++ Makefile
+@@ -10,7 +10,7 @@ dataFolder := data
+ fontFolder := fonts
+ shaderFolder := shader
+ imgFolder := img
+-prefix := $(HOME)/.local
++prefix := ${DESTDIR}${PREFIX}
+ target := $(shell g++ --version | grep i686)
+ 
+ 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)
+-	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 -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/$(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)/
+     endif
+ 
+ uninstall:
diff --git a/denise/patches/patch-driver_Makefile b/denise/patches/patch-driver_Makefile
new file mode 100644
index 0000000000..e89a2c6319
--- /dev/null
+++ b/denise/patches/patch-driver_Makefile
@@ -0,0 +1,33 @@
+$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
+@@ -21,7 +21,7 @@ else ifeq ($(platform),macosx)
+     drv += cgl openal coreaudio iokit
+ 
+ else
+-    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)
+ else
+     drvflags = $(cppflags) 
+     drvflags += `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))
+@@ -74,6 +74,6 @@ drvlink += $(if $(findstring iokit,$(drv
+ drvlink += $(if $(findstring cgl,$(drv)),-framework OpenGL)
+ drvlink += $(if $(findstring coreaudio,$(drv)),-framework CoreAudio -framework AudioToolbox)
+ 
+-drvlink += $(if $(findstring glx,$(drv)),-lGL)
++drvlink += $(if $(findstring glx,$(drv)),-lGL -lGLEW)
+ drvlink += $(if $(findstring udev,$(drv)),-ludev)
+ drvlink += $(if $(findstring pulseaudio,$(drv)),-lpulse)
diff --git a/denise/patches/patch-driver_video_opengl_opengl.h b/denise/patches/patch-driver_video_opengl_opengl.h
new file mode 100644
index 0000000000..06dc968cfe
--- /dev/null
+++ b/denise/patches/patch-driver_video_opengl_opengl.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Lots of functions remain undeclared in the original. I'm not sure which
+header should be included. With <GL/glew.h> you also need to link with -lGLEW
+which makes me uncomfortable.
+
+--- driver/video/opengl/opengl.h.orig	2020-10-25 12:34:43.000000000 +0000
++++ driver/video/opengl/opengl.h
+@@ -6,6 +6,7 @@
+     #include <GL/glext.h>
+     #define glGetProcAddress(name) wglGetProcAddress(name)
+ #else
++    #include <GL/glew.h>
+     #include <GL/gl.h>
+     #include <GL/glx.h>
+     #define glGetProcAddress(name) (*glXGetProcAddress)((const GLubyte*)(name))
Prev by Date: wip/py-google-cloud-core: import py-google-cloud-core 1.4.3
Next by Date: wip/parole/MESSAGE: set category sound to audio
Previous by Thread: wip/py-google-cloud-core: import py-google-cloud-core 1.4.3
Next by Thread: wip/parole/MESSAGE: set category sound to audio
Indexes:
Home | Main Index | Thread Index | Old Index