dosbox-x: import dosbox-x-0.82.7 as wip/dosbox-x

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: dosbox-x: import dosbox-x-0.82.7 as wip/dosbox-x
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Sun, 03 Jun 2018 10:35:11 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sun Jun 3 12:35:11 2018 +0200
Changeset:	d0fc984e5446d2c582f541254ba122f4321087ef

Modified Files:
	Makefile
Added Files:
	dosbox-x/DESCR
	dosbox-x/Makefile
	dosbox-x/PLIST
	dosbox-x/distinfo
	dosbox-x/patches/patch-configure.ac
	dosbox-x/patches/patch-include_byteorder.h
	dosbox-x/patches/patch-include_dos__inc.h

Log Message:
dosbox-x: import dosbox-x-0.82.7 as wip/dosbox-x

As a fork of DOSBox, it retains compatibility with the wide base
of DOS games and DOS gaming DOSBox was designed for. DOSBox-X
however goes further, with a focus on accurate emulation of the
hardware and many more ways to tweak and configure the DOS virtual
machine! We believe that a better way to emulate the legacy PC
platform is to give the user all the options they need to emulate
everything from original IBM PC hardware with 64KB of RAM all the
way up to late 90's hardware, whatever it takes to get that game
or software package to run. Our goal is to eventually make DOSBox-X
a complete emulation package that covers all pre-2000 DOS and
Windows 9x based hardware scenarios, including peripherals,
motherboards, CPUs, and all manner of hardware that was made for
PC hardware of that time.

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

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

diffstat:
 Makefile                                   |  1 +
 dosbox-x/DESCR                             | 13 ++++++++++
 dosbox-x/Makefile                          | 40 +++++++++++++++++++++++++++++
 dosbox-x/PLIST                             |  5 ++++
 dosbox-x/distinfo                          |  9 +++++++
 dosbox-x/patches/patch-configure.ac        | 41 ++++++++++++++++++++++++++++++
 dosbox-x/patches/patch-include_byteorder.h | 20 +++++++++++++++
 dosbox-x/patches/patch-include_dos__inc.h  | 17 +++++++++++++
 8 files changed, 146 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index e359d493ee..34574687f7 100644
--- a/Makefile
+++ b/Makefile
@@ -591,6 +591,7 @@ SUBDIR+=	dolphin-emu
 SUBDIR+=	dolphin-plugins
 SUBDIR+=	dolphin5
 SUBDIR+=	doorman
+SUBDIR+=	dosbox-x
 SUBDIR+=	dosemu2
 SUBDIR+=	dosfstools
 SUBDIR+=	dotclear
diff --git a/dosbox-x/DESCR b/dosbox-x/DESCR
new file mode 100644
index 0000000000..81829da7dd
--- /dev/null
+++ b/dosbox-x/DESCR
@@ -0,0 +1,13 @@
+As a fork of DOSBox, it retains compatibility with the wide base
+of DOS games and DOS gaming DOSBox was designed for. DOSBox-X
+however goes further, with a focus on accurate emulation of the
+hardware and many more ways to tweak and configure the DOS virtual
+machine! We believe that a better way to emulate the legacy PC
+platform is to give the user all the options they need to emulate
+everything from original IBM PC hardware with 64KB of RAM all the
+way up to late 90's hardware, whatever it takes to get that game
+or software package to run. Our goal is to eventually make DOSBox-X
+a complete emulation package that covers all pre-2000 DOS and
+Windows 9x based hardware scenarios, including peripherals,
+motherboards, CPUs, and all manner of hardware that was made for
+PC hardware of that time.
diff --git a/dosbox-x/Makefile b/dosbox-x/Makefile
new file mode 100644
index 0000000000..118d26747e
--- /dev/null
+++ b/dosbox-x/Makefile
@@ -0,0 +1,40 @@
+# $NetBSD$
+
+GITHUB_PROJECT=	dosbox-x
+PKGNAME=	${GITHUB_TAG:S/-windows-v/-/}
+DISTNAME=	${GITHUB_TAG}
+CATEGORIES=	emulators
+MASTER_SITES=	${MASTER_SITE_GITHUB:=joncampbell123/}
+GITHUB_TAG=	dosbox-x-windows-v0.82.7
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://dosbox-x.com/
+COMMENT=	DOSBox with accurate emulation and wide testing
+LICENSE=	gnu-gpl-v2
+
+WRKSRC=			${WRKDIR}/dosbox-x-${GITHUB_TAG}
+GNU_CONFIGURE=		yes
+# dosbox-x uses a modified SDL1 or system SDL2
+CONFIGURE_ARGS+=	--enable-sdl2
+USE_TOOLS+=		autoconf automake pkg-config
+USE_LANGUAGES=		c c++
+LIBS.NetBSD+=		-lcompat
+
+PKGCONFIG_OVERRIDE+=	vs2015/libpng/libpng.pc.in
+PKGCONFIG_OVERRIDE+=	vs2015/sdl/sdl.pc.in
+PKGCONFIG_OVERRIDE+=	vs2015/sdl2/sdl2.pc.in
+PKGCONFIG_OVERRIDE+=	vs2015/sdlnet/SDL_net.pc.in
+PKGCONFIG_OVERRIDE+=	vs2015/zlib/zlib.pc.in
+
+CHECK_PORTABILITY_SKIP+=	vs2015/sdl2/build-scripts/androidbuildlibs.sh
+CHECK_PORTABILITY_SKIP+=	vs2015/sdl2/build-scripts/iosbuild.sh
+
+pre-configure:
+	cd ${WRKSRC} && ${SH} autogen.sh
+
+.include "../../audio/fluidsynth/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
+#.include "../../net/SDL2_net/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/dosbox-x/PLIST b/dosbox-x/PLIST
new file mode 100644
index 0000000000..82fbb25f62
--- /dev/null
+++ b/dosbox-x/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD$
+bin/dosbox-x
+share/dosbox-x/CHANGELOG
+share/dosbox-x/FREECG98.BMP
+share/dosbox-x/dosbox.reference.conf
diff --git a/dosbox-x/distinfo b/dosbox-x/distinfo
new file mode 100644
index 0000000000..52d7fed550
--- /dev/null
+++ b/dosbox-x/distinfo
@@ -0,0 +1,9 @@
+$NetBSD$
+
+SHA1 (dosbox-x-windows-v0.82.7.tar.gz) = f00a5074ce86346b1d640435bd0a3c8f6caf2000
+RMD160 (dosbox-x-windows-v0.82.7.tar.gz) = 4df0f3ed061bf1c488b8e68d54600724168bc24d
+SHA512 (dosbox-x-windows-v0.82.7.tar.gz) = 1c576cabce6b896de955144b4f462ecb5757639a27bd83d75d0899c7467e01a10fc04174d7bf030bf8d77adaee992d7852e786c61651092d0a23bb710068b36c
+Size (dosbox-x-windows-v0.82.7.tar.gz) = 21359280 bytes
+SHA1 (patch-configure.ac) = e1f5e6dd13ef0b797056ab20f701288749def5b2
+SHA1 (patch-include_byteorder.h) = 54268aef66ed25f8209876a28fb980358b787664
+SHA1 (patch-include_dos__inc.h) = a2b8589b7dcb4430267af7948b0d31d3c4aca2c9
diff --git a/dosbox-x/patches/patch-configure.ac b/dosbox-x/patches/patch-configure.ac
new file mode 100644
index 0000000000..7baf448d43
--- /dev/null
+++ b/dosbox-x/patches/patch-configure.ac
@@ -0,0 +1,41 @@
+$NetBSD$
+
+Fix == test in configure script.
+
+--- configure.ac.orig	2018-06-01 19:29:54.000000000 +0000
++++ configure.ac
+@@ -159,14 +159,14 @@ AC_ARG_ENABLE(hx-dos,AC_HELP_STRING([--e
+ dnl Some stuff for the icon.
+ case "$host" in
+     *-*-cygwin* | *-*-mingw32*)
+-    if test x$enable_hx == xyes; then
++    if test x$enable_hx = xyes; then
+         CXXFLAGS="$CXXFLAGS -DHX_DOS"
+         AC_DEFINE(C_HX_DOS,1,[Targeting HX DOS extender])
+     fi
+     ;;
+ esac
+ 
+-if test x$enable_force_menu_sdldraw == xyes; then
++if test x$enable_force_menu_sdldraw = xyes; then
+     CXXFLAGS="$CXXFLAGS -DFORCE_SDLDRAW"
+     AC_DEFINE(C_FORCE_MENU_SDLDRAW,1,[Force SDL drawn menus])
+ fi
+@@ -359,7 +359,7 @@ case "$host" in
+        ;;
+ esac
+ 
+-AM_CONDITIONAL(MACOSX, test x"$macosx" == x"1")
++AM_CONDITIONAL(MACOSX, test x"$macosx" = x"1")
+ 
+ dnl The target cpu checks for dynamic cores
+ AH_TEMPLATE(C_TARGETCPU,[The type of cpu this target has])
+@@ -534,7 +534,7 @@ else
+   enable_mt32=no
+   AC_MSG_RESULT(no)
+ fi 
+-AM_CONDITIONAL(C_MT32, test "x$enable_mt32" == "xyes")
++AM_CONDITIONAL(C_MT32, test "x$enable_mt32" = "xyes")
+ 
+ dnl FEATURE: DEBUG and HEAVY DEBUG options (debugger)
+ AH_TEMPLATE(C_DEBUG,[Define to 1 to enable internal debugger, requires libcurses])
diff --git a/dosbox-x/patches/patch-include_byteorder.h b/dosbox-x/patches/patch-include_byteorder.h
new file mode 100644
index 0000000000..cf0b2536b9
--- /dev/null
+++ b/dosbox-x/patches/patch-include_byteorder.h
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Include the correct endian.h on NetBSD.
+
+--- include/byteorder.h.orig	2018-03-01 04:56:27.000000000 +0000
++++ include/byteorder.h
+@@ -105,11 +105,11 @@
+ 
+ #include <endian.h>
+ 
+-#elif defined(__OpenBSD__)
++#elif defined(__OpenBSD__) || defined(__NetBSD__)
+ 
+ #include <sys/endian.h>
+ 
+-#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ #include <sys/endian.h>
+ 
diff --git a/dosbox-x/patches/patch-include_dos__inc.h b/dosbox-x/patches/patch-include_dos__inc.h
new file mode 100644
index 0000000000..60fc19f709
--- /dev/null
+++ b/dosbox-x/patches/patch-include_dos__inc.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Use ftello and fseeko on NetBSD.
+
+--- include/dos_inc.h.orig	2018-06-01 19:29:54.000000000 +0000
++++ include/dos_inc.h
+@@ -295,6 +295,10 @@ static INLINE Bit16u DOS_PackDate(Bit16u
+   #define ftello64 ftell
+   #define fseeko64 fseek
+  #endif
++#elif defined(__NetBSD__)
++ #define fopen64 fopen
++ #define ftello64 ftello
++ #define fseeko64 fseeko
+ #endif
+ 
+ /* Dos Error Codes */
Prev by Date: singularity: Fix comment
Next by Date: dosbox-svn: import wip/dosbox-svn
Previous by Thread: singularity: Fix comment
Next by Thread: dosbox-svn: import wip/dosbox-svn
Indexes:
Home | Main Index | Thread Index | Old Index