pkgsrc-WIP-changes archive

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

virtualxt: Update wip/virtualxt to 0.10.1



Module Name:	pkgsrc-wip
Committed By:	Andreas T Jonsson <mail%andreasjonsson.se@localhost>
Pushed By:	phix
Date:		Mon Oct 16 15:56:55 2023 +0200
Changeset:	3e22964838f123aa3d518911b29e61cb045bc55a

Modified Files:
	virtualxt/Makefile
	virtualxt/PLIST
	virtualxt/distinfo
	virtualxt/files/virtualxt.freedos
Added Files:
	virtualxt/files/virtualxt.elks

Log Message:
virtualxt: Update wip/virtualxt to 0.10.1

Changes:
 * More modules
 * UART abstraction
 * New RTC
 * ELKS Linux image included

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

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

diffstat:
 virtualxt/Makefile                |  9 +++++++--
 virtualxt/PLIST                   |  3 +++
 virtualxt/distinfo                |  6 +++---
 virtualxt/files/virtualxt.elks    | 12 ++++++++++++
 virtualxt/files/virtualxt.freedos | 12 +++++-------
 5 files changed, 30 insertions(+), 12 deletions(-)

diffs:
diff --git a/virtualxt/Makefile b/virtualxt/Makefile
index 014937d2ba..6fc7159bd2 100644
--- a/virtualxt/Makefile
+++ b/virtualxt/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 GITHUB_TAG=	refs/tags/v${PKGVERSION_NOREV}
-DISTNAME=	virtualxt-0.9
+DISTNAME=	virtualxt-0.10.1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=andreas-jonsson/}
 
@@ -13,6 +13,7 @@ LICENSE=		zlib
 USE_LANGUAGES=		c
 USE_CC_FEATURES=	c11
 
+DEPENDS+=	xdg-utils-1.1.*:../../misc/xdg-utils
 TOOL_DEPENDS+=	premake5-5.0.*:../../devel/premake5
 USE_TOOLS+=	gmake
 
@@ -22,22 +23,26 @@ WRKSRC=			${WRKDIR}/${DISTNAME}
 
 post-extract:
 	${CP} ${FILESDIR}/virtualxt.freedos ${WRKSRC}
+	${CP} ${FILESDIR}/virtualxt.elks ${WRKSRC}
 
 pre-build:
-	cd ${WRKSRC} && premake5 --static --modules=-network gmake
+	cd ${WRKSRC} && premake5 --static --modules=-network,lua gmake
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/build/bin/virtualxt ${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/virtualxt.freedos ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/virtualxt.elks ${DESTDIR}${PREFIX}/bin
 
 	${INSTALL_DATA} ${WRKSRC}/bios/GLABIOS.ROM ${DESTDIR}${PREFIX}/share/virtualxt/bios
 	${INSTALL_DATA} ${WRKSRC}/bios/GLABIOS640.ROM ${DESTDIR}${PREFIX}/share/virtualxt/bios
+	${INSTALL_DATA} ${WRKSRC}/bios/GLaTICK_0.8.4_AT.ROM ${DESTDIR}${PREFIX}/share/virtualxt/bios
 	${INSTALL_DATA} ${WRKSRC}/bios/pcxtbios.bin ${DESTDIR}${PREFIX}/share/virtualxt/bios
 	${INSTALL_DATA} ${WRKSRC}/bios/vxtx.bin ${DESTDIR}${PREFIX}/share/virtualxt/bios
 
 	${INSTALL_DATA} ${WRKSRC}/boot/freedos.img ${DESTDIR}${PREFIX}/share/virtualxt/boot
 	${INSTALL_DATA} ${WRKSRC}/boot/freedos_hd.img ${DESTDIR}${PREFIX}/share/virtualxt/boot
 	${INSTALL_DATA} ${WRKSRC}/boot/freedos_web_hd.img ${DESTDIR}${PREFIX}/share/virtualxt/boot
+	${INSTALL_DATA} ${WRKSRC}/boot/elks.img ${DESTDIR}${PREFIX}/share/virtualxt/boot
 
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/virtualxt/PLIST b/virtualxt/PLIST
index af29cbee0c..7c1df313d4 100644
--- a/virtualxt/PLIST
+++ b/virtualxt/PLIST
@@ -1,10 +1,13 @@
 @comment $NetBSD$
 bin/virtualxt
+bin/virtualxt.elks
 bin/virtualxt.freedos
 share/virtualxt/bios/GLABIOS.ROM
 share/virtualxt/bios/GLABIOS640.ROM
+share/virtualxt/bios/GLaTICK_0.8.4_AT.ROM
 share/virtualxt/bios/pcxtbios.bin
 share/virtualxt/bios/vxtx.bin
+share/virtualxt/boot/elks.img
 share/virtualxt/boot/freedos.img
 share/virtualxt/boot/freedos_hd.img
 share/virtualxt/boot/freedos_web_hd.img
diff --git a/virtualxt/distinfo b/virtualxt/distinfo
index 86a549cb78..6b73658da3 100644
--- a/virtualxt/distinfo
+++ b/virtualxt/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (virtualxt-0.9.tar.gz) = 219e3e0e1755adb1d55f6bed31fb9c3d543502c8ba0ead5cad208329b995331c
-SHA512 (virtualxt-0.9.tar.gz) = 2509e038dfb83291638dfddc6b5f74cd4cfe55cd48bc37225dbc0a608803ed917c7919cf3df0ba9125eb0bd2e836ec9d68e661dade32715d5a3a034ebe5647f6
-Size (virtualxt-0.9.tar.gz) = 92657477 bytes
+BLAKE2s (virtualxt-0.10.1.tar.gz) = 6c5308017c99caf94c7ff4bc12ae7e3f2e521f492a476212a209bbf7764eb93b
+SHA512 (virtualxt-0.10.1.tar.gz) = dc1ae19e92d21542f3643f3e7f9ca9039f877e1c825552b4994ec5cee80c738fb909b5f2edae1e54f0d08c96fcc21868862c47a71713a1ca4c093e1a2a4dd50c
+Size (virtualxt-0.10.1.tar.gz) = 92930994 bytes
diff --git a/virtualxt/files/virtualxt.elks b/virtualxt/files/virtualxt.elks
new file mode 100755
index 0000000000..0cf2a54820
--- /dev/null
+++ b/virtualxt/files/virtualxt.elks
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+HERE="$(cd "$(dirname "$0")" && pwd -P)"
+DATA=$HERE/../share/virtualxt
+CONFIG=$($HERE/virtualxt --locate)
+
+mkdir -p $CONFIG/boot
+if [ ! -f $CONFIG/boot/elks.img ]; then
+    cp $DATA/boot/elks.img $CONFIG/boot/
+fi
+
+exec "$HERE/virtualxt" -a "$CONFIG/boot/elks.img" "$@"
diff --git a/virtualxt/files/virtualxt.freedos b/virtualxt/files/virtualxt.freedos
index a874aa4c3e..090e2f90e6 100755
--- a/virtualxt/files/virtualxt.freedos
+++ b/virtualxt/files/virtualxt.freedos
@@ -2,15 +2,13 @@
 
 HERE="$(cd "$(dirname "$0")" && pwd -P)"
 DATA=$HERE/../share/virtualxt
+CONFIG=$($HERE/virtualxt --locate)
 
-mkdir -p $HOME/.virtualxt/boot
-if [ ! -f $HOME/.virtualxt/boot/freedos_hd.img ]; then
-    cp $DATA/boot/freedos_hd.img $HOME/.virtualxt/boot/
+mkdir -p $CONFIG/boot
+if [ ! -f $CONFIG/boot/freedos_hd.img ]; then
+    cp $DATA/boot/freedos_hd.img $CONFIG/boot/
 fi
 
-export VXT_DEFAULT_MODULES_PATH=$DATA/modules
-export VXT_DEFAULT_BIOS_PATH=$DATA/bios/GLABIOS.ROM
-export VXT_DEFAULT_VXTX_BIOS_PATH=$DATA/bios/vxtx.bin
-export VXT_DEFAULT_HD_IMAGE=$HOME/.virtualxt/boot/freedos_hd.img
+export VXT_DEFAULT_HD_IMAGE=$CONFIG/boot/freedos_hd.img
 
 exec "$HERE/virtualxt" "$@"


Home | Main Index | Thread Index | Old Index