Attachment 217657 Details for Bug 249018 – add option to use emulators/dosbox or emulators/dosbox-staging

[patch] add option to use emulators/dosbox or emulators/dosbox-staging

wine-devel.diff (text/plain), 2.28 KB, created by Vladimir Druzenko on 2020-08-30 19:17:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2020-08-30 19:17:32 UTC

Size: 2.28 KB

patch

obsolete

>diff -urN emulators/wine-devel.orig/Makefile emulators/wine-devel/Makefile
>--- emulators/wine-devel.orig/Makefile
>+++ emulators/wine-devel/Makefile
>@@ -59,11 +59,14 @@
> 
> PORTDATA=	wine.inf
> 
>-OPTIONS_DEFINE=	CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO
>+OPTIONS_DEFINE=	CUPS DOCS GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO
> OPTIONS_DEFAULT=GCC GNUTLS X11
>+OPTIONS_SINGLE=	DOSBOX
>+OPTIONS_SINGLE_DOSBOX=	DOSBOX DOSBOXSTAGING
> OPTIONS_SUB=	yes
> 
> DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
>+DOSBOXSTAGING_DESC=	Use DOSBox Staging to run MS-DOS programs
> LIBXSLT_DESC=	Use libxslt (only used by msxml3.dll)
> STAGING_DESC=	Include the Wine Staging patchset (experimental)
> VKD3D_DESC=	Direct3D 12 support via Vulkan
>@@ -76,6 +79,9 @@
> CUPS_LIB_DEPENDS=	libcups.so:print/cups
> 
> DOSBOX_RUN_DEPENDS=	dosbox:emulators/dosbox
>+
>+DOSBOXSTAGING_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bosbox-staging
>+DOSBOXSTAGING_RUN_DEPENDS=	dosbox-staging:emulators/dosbox-staging
> 
> GCC_USE=		gcc=yes
> GCC_USES_OFF=		compiler:c11
>diff -urN emulators/wine-devel.orig/files/extrapatch-bosbox-staging emulators/wine-devel/files/extrapatch-bosbox-staging
>--- emulators/wine-devel.orig/files/extrapatch-bosbox-staging
>+++ emulators/wine-devel/files/extrapatch-bosbox-staging
>@@ -0,0 +1,28 @@
>+--- programs/winevdm/winevdm.c.orig
>++++ programs/winevdm/winevdm.c
>+@@ -107,6 +107,7 @@
>+ /***********************************************************************
>+  *           find_dosbox
>+  */
>++#define DOSBOX "/dosbox-staging"
>+ static char *find_dosbox(void)
>+ {
>+     const char *envpath = getenv( "PATH" );
>+@@ -118,7 +119,7 @@
>+ 
>+     envpath_len = strlen( envpath );
>+     path = HeapAlloc( GetProcessHeap(), 0, envpath_len + 1 );
>+-    buffer = HeapAlloc( GetProcessHeap(), 0, envpath_len + sizeof("/dosbox") );
>++    buffer = HeapAlloc( GetProcessHeap(), 0, envpath_len + sizeof(DOSBOX) );
>+     strcpy( path, envpath );
>+ 
>+     p = path;
>+@@ -130,7 +131,7 @@
>+         while (*p && *p != ':') p++;
>+         if (*p == ':') *p++ = 0;
>+         strcpy( buffer, dir );
>+-        strcat( buffer, "/dosbox" );
>++        strcat( buffer, DOSBOX );
>+         if (!stat( buffer, &st ))
>+         {
>+             HeapFree( GetProcessHeap(), 0, path );

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 249018: 217657