Attachment #250607 for bug #278940




PORTNAME=	wine-proton
DISTVERSION=	9.0-1
PORTREVISION=	0
CATEGORIES=	emulators

MAINTAINER=	iwtcex@gmail.com

ONLY_FOR_ARCHS=	amd64 i386

BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
		${LOCALBASE}/include/linux/input.h:devel/evdev-proto

LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libgnutls.so:security/gnutls \
		libvulkan.so:graphics/vulkan-loader

# amd_ags_x64.so
LIB_DEPENDS+=	libdrm.so:graphics/libdrm \
		libdrm_amdgpu.so:graphics/libdrm

# winewayland.so
LIB_DEPENDS+=	libwayland-client.so:graphics/wayland \
		libxkbcommon.so:x11/libxkbcommon \
		libxkbregistry.so:x11/libxkbcommon

USES=		autoreconf bison desktop-file-utils gl gmake gnome gstreamer llvm:${_LLVM_VERSION},build localbase perl5 pkgconfig python:build sdl shebangfix tar:xz xorg
USE_GCC=	yes
PIE_UNSAFE=	yes

USE_GITHUB=	yes
GH_ACCOUNT=	ValveSoftware
GH_PROJECT=	wine
GH_TAGNAME=	a8514f9606ee3fdc3d912c988f651edc5d7d0d55

USE_GL=		gl
USE_GNOME=	glib20
USE_GSTREAMER=	gl good mpeg2dec x264 # https://github.com/ValveSoftware/wine/commit/8cdd506d7e68c27cd564c317320bfc8d3a999eda
USE_PERL5=	build
USE_SDL=	sdl2
USE_XORG=	x11 xext xcomposite xcursor xi xinerama xrandr xrender


GNU_CONFIGURE_PREFIX=	${PREFIX}/${PORTNAME}

CONFIGURE_ARGS=	--verbose \
		--enable-archs=${ARCH:S|amd64|x86_64|} \
		--with-mingw CROSSCC="clang" CROSSCFLAGS="-isystem ${FILESDIR}/clang" \
		--libdir=${PREFIX}/${PORTNAME}/lib \
		--disable-kerberos \
		--disable-tests \

		--with-gstreamer \
		--with-opengl \
		--with-oss \
		--with-pthread \
		--with-sdl \
		--with-vulkan \
		--with-wayland \
		--with-x \
		--with-xinerama \
		--with-xinput2 \
		--with-xrandr \
		--with-xrender \
		--with-pcap \
		--with-pthread \
		--with-mingw CROSSCC="clang" CROSSCFLAGS="-isystem ${FILESDIR}/clang" \
		--without-alsa \
		--without-capi \
		--without-coreaudio \

		--without-netapi \
		--without-opencl \
		--without-osmesa \
		--without-pcap \
		--without-pcsclite \
		--without-sane \
		--without-udev \

CONFIGURE_ENV=	CPPBIN="false" CPPFLAGS="" FLEX="${LOCALBASE}/bin/flex" JXRLIB_CFLAGS="-I${LOCALBASE}/include/jxrlib"

CFLAGS+=	-D__NR_futex="-1" -Werror=implicit-function-declaration
CFLAGS_i386+=	-mpreferred-stack-boundary=4 -mstackrealign
PIE_UNSAFE=	yes

BINARY_ALIAS+=	clang=${LOCALBASE}/bin/clang${_LLVM_VERSION} \
		lld-link=${LOCALBASE}/bin/lld-link${_LLVM_VERSION}

PLIST_SUB+=	WINE32="" WINE64="@comment " WINEARCH="i386"
.endif

post-patch:
	${REINPLACE_CMD} 's/CFLAGS="$$llvm_extra_cflags $$llvm_cflags"/CFLAGS="$$CROSSCFLAGS $$llvm_extra_cflags $$llvm_cflags"/g' ${WRKSRC}/configure.ac

pre-configure:
	cd ${WRKSRC} && ${PYTHON_CMD} dlls/winevulkan/make_vulkan --xml vk.xml
	cd ${WRKSRC} && ${PERL5} tools/make_specfiles

pre-build:
	cd ${WRKSRC} && ${MAKE_CMD} depend
	cd ${WRKSRC} && ${PERL5} tools/make_requests

post-install:
.if ${ARCH} == i386

.else
	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh                ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/pkg32.sh
	${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64     ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64.bin
	-${ELFCTL} -e +noaslr                                 ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64.bin
	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh                 ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64
	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh           ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine
.endif
	${RM} -r ${STAGEDIR}${PREFIX}/${PORTNAME}/include
	${RM} -r ${STAGEDIR}${PREFIX}/share/man
	${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in README.md ANNOUNCE.md AUTHORS
	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
.endfor


Lines 1-3 Link Here

(-)b/emulators/wine-proton/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1711968876	1	TIMESTAMP = 1715246618
2	SHA256 (ValveSoftware-wine-8.0-5-bb66944d9d7a0fc7692f05d4a2db418b468d3021_GH0.tar.gz) = 3f8e7e58b235d3101c866ff367afe9745b6abaf6fd1d4d864953bc389abb192d	2	SHA256 (ValveSoftware-wine-9.0-1-a8514f9606ee3fdc3d912c988f651edc5d7d0d55_GH0.tar.gz) = 68ceb4f987f3de1a03ff82a589de13d3029153ceb21d0129034ccc8042e7b866
3	SIZE (ValveSoftware-wine-8.0-5-bb66944d9d7a0fc7692f05d4a2db418b468d3021_GH0.tar.gz) = 48756464	3	SIZE (ValveSoftware-wine-9.0-1-a8514f9606ee3fdc3d912c988f651edc5d7d0d55_GH0.tar.gz) = 49101467




 */

#ifndef __STDARG_H
#define __STDARG_H

#ifndef __GNUC_VA_LIST
#define __GNUC_VA_LIST
typedef __builtin_va_list __gnuc_va_list;
#endif

#ifdef __need___va_list
#undef __need___va_list
#else
#define __STDARG_H
#ifndef _VA_LIST
typedef __builtin_va_list va_list;
#define _VA_LIST
#endif

/* FIXME: This is using the placeholder dates Clang produces for these macros
   in C2x mode; switch to the correct values once they've been published. */
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L
/* C2x does not require the second parameter for va_start. */
#define va_start(ap, ...) __builtin_va_start(ap, 0)
#else
/* Versions before C2x do require the second parameter. */
#define va_start(ap, param) __builtin_va_start(ap, param)
#endif
#define va_end(ap)          __builtin_va_end(ap)
#define va_arg(ap, type)    __builtin_va_arg(ap, type)


 */
#define __va_copy(d,s) __builtin_va_copy(d,s)

#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) ||              \
    (defined(__cplusplus) && __cplusplus >= 201103L) ||                        \
    !defined(__STRICT_ANSI__)
#define va_copy(dest, src)  __builtin_va_copy(dest, src)
#endif

#ifndef __GNUC_VA_LIST
#define __GNUC_VA_LIST 1
typedef __builtin_va_list __gnuc_va_list;
#endif

#endif /* __STDARG_H */

#endif /* not __STDARG_H */




/*===---- stdbool.h - Standard header for booleans -------------------------===
 *
 * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 * See https://llvm.org/LICENSE.txt for license information.
 * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 *
 *===-----------------------------------------------------------------------===
 */

#ifndef __STDBOOL_H
#define __STDBOOL_H

#define __bool_true_false_are_defined 1

#if defined(__STDC_VERSION__) && __STDC_VERSION__ > 201710L
/* FIXME: We should be issuing a deprecation warning here, but cannot yet due
 * to system headers which include this header file unconditionally.
 */
#elif !defined(__cplusplus)
#define bool _Bool
#define true 1
#define false 0
#elif defined(__GNUC__) && !defined(__STRICT_ANSI__)
/* Define _Bool as a GNU extension. */
#define _Bool bool
#if defined(__cplusplus) && __cplusplus < 201103L
/* For C++98, define bool, false, true as a GNU extension. */
#define bool bool
#define false false
#define true true
#endif
#endif

#endif /* __STDBOOL_H */




/*===---- stddef.h - Basic type definitions --------------------------------===
 *
 * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 * See https://llvm.org/LICENSE.txt for license information.
 * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 *
 *===-----------------------------------------------------------------------===
 */

#if !defined(__STDDEF_H) || defined(__need_ptrdiff_t) ||                       \
    defined(__need_size_t) || defined(__need_wchar_t) ||                       \
    defined(__need_NULL) || defined(__need_wint_t)

#if !defined(__need_ptrdiff_t) && !defined(__need_size_t) &&                   \
    !defined(__need_wchar_t) && !defined(__need_NULL) &&                       \
    !defined(__need_wint_t)
/* Always define miscellaneous pieces when modules are available. */
#if !__has_feature(modules)
#define __STDDEF_H
#endif
#define __need_ptrdiff_t
#define __need_size_t
#define __need_wchar_t
#define __need_NULL
#define __need_STDDEF_H_misc
/* __need_wint_t is intentionally not defined here. */
#endif

#if defined(__need_ptrdiff_t)
#if !defined(_PTRDIFF_T) || __has_feature(modules)
/* Always define ptrdiff_t when modules are available. */
#if !__has_feature(modules)
#define _PTRDIFF_T
#endif
typedef __PTRDIFF_TYPE__ ptrdiff_t;
#endif
#undef __need_ptrdiff_t
#endif /* defined(__need_ptrdiff_t) */

#if defined(__need_size_t)
#if !defined(_SIZE_T) || __has_feature(modules)
/* Always define size_t when modules are available. */
#if !__has_feature(modules)
#define _SIZE_T
#endif
typedef __SIZE_TYPE__ size_t;
#endif
#undef __need_size_t
#endif /*defined(__need_size_t) */

#if defined(__need_STDDEF_H_misc)
/* ISO9899:2011 7.20 (C11 Annex K): Define rsize_t if __STDC_WANT_LIB_EXT1__ is
 * enabled. */
#if (defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ >= 1 && \
     !defined(_RSIZE_T)) || __has_feature(modules)
/* Always define rsize_t when modules are available. */
#if !__has_feature(modules)
#define _RSIZE_T
#endif
typedef __SIZE_TYPE__ rsize_t;
#endif
#endif /* defined(__need_STDDEF_H_misc) */

#if defined(__need_wchar_t)
#if !defined(__cplusplus) || (defined(_MSC_VER) && !_NATIVE_WCHAR_T_DEFINED)
/* Always define wchar_t when modules are available. */
#if !defined(_WCHAR_T) || __has_feature(modules)
#if !__has_feature(modules)
#define _WCHAR_T
#if defined(_MSC_EXTENSIONS)
#define _WCHAR_T_DEFINED
#endif
#endif
typedef __WCHAR_TYPE__ wchar_t;
#endif
#endif
#undef __need_wchar_t
#endif /* defined(__need_wchar_t) */

#if defined(__need_NULL)
#undef NULL
#ifdef __cplusplus
#  if !defined(__MINGW32__) && !defined(_MSC_VER)
#    define NULL __null
#  else
#    define NULL 0
#  endif
#else
#  define NULL ((void*)0)
#endif
#ifdef __cplusplus
#if defined(_MSC_EXTENSIONS) && defined(_NATIVE_NULLPTR_SUPPORTED)
namespace std { typedef decltype(nullptr) nullptr_t; }
using ::std::nullptr_t;
#endif
#endif
#undef __need_NULL
#endif /* defined(__need_NULL) */

/* FIXME: This is using the placeholder dates Clang produces for these macros
   in C2x mode; switch to the correct values once they've been published. */
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L
typedef typeof(nullptr) nullptr_t;
#endif /* defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L */

#if defined(__need_STDDEF_H_misc)
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) ||              \
    (defined(__cplusplus) && __cplusplus >= 201103L)
#include "__stddef_max_align_t.h"
#endif
#define offsetof(t, d) __builtin_offsetof(t, d)
#undef __need_STDDEF_H_misc
#endif  /* defined(__need_STDDEF_H_misc) */

/* Some C libraries expect to see a wint_t here. Others (notably MinGW) will use
__WINT_TYPE__ directly; accommodate both by requiring __need_wint_t */
#if defined(__need_wint_t)
/* Always define wint_t when modules are available. */
#if !defined(_WINT_T) || __has_feature(modules)
#if !__has_feature(modules)
#define _WINT_T
#endif
typedef __WINT_TYPE__ wint_t;
#endif
#undef __need_wint_t
#endif /* __need_wint_t */

#endif




--- configure.ac.orig	2023-09-02 23:55:42.978760000 +0300
+++ configure.ac	2023-09-03 00:08:27.789243000 +0300
@@ -863,11 +863,13 @@
 
     saved_CC=$CC
     saved_CFLAGS=$CFLAGS
+    saved_LDFLAGS=$LDFLAGS
 
     CFLAGS=${CROSSCFLAGS:-"-g -O2"}
+    LDFLAGS=${CROSSLDFLAGS:-""}
     AS_VAR_COPY([CC],[${wine_arch}_CC])
     AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS])
-    AS_VAR_COPY([${wine_arch}_LDFLAGS],[CROSSLDFLAGS])
+    AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS])
     AS_VAR_SET([${wine_arch}_EXTRACFLAGS],["-D__WINE_PE_BUILD -Wall"])
 
     target=""
@@ -915,6 +915,7 @@
     then
         CC=$saved_CC
         CFLAGS=$saved_CFLAGS
+        LDFLAGS=$saved_LDFLAGS
         continue
     fi
     AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"])
@@ -1005,6 +1006,7 @@
 
     CC=$saved_CC
     CFLAGS=$saved_CFLAGS
+    LDFLAGS=$saved_LDFLAGS
 done
 
 if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x




--- dlls/ntdll/unix/loader.c.orig	2023-07-17 16:05:30.000000000 +0300
+++ dlls/ntdll/unix/loader.c	2023-09-12 03:00:51.850143000 +0300
@@ -742,6 +742,21 @@ static NTSTATUS loader_exec( char **argv, WORD machine
 {
     if (machine != current_machine)
     {
+        char* wineserver_path = getenv("WINESERVER");
+        if (wineserver_path != NULL && wineserver_path[0] == '/') {
+            char* s = remove_tail(wineserver_path, "server");
+            if (s != NULL) {
+                if (machine == IMAGE_FILE_MACHINE_AMD64) {
+                    argv[1] = malloc(strlen(s) + 3);
+                    strcpy(argv[1], s);
+                    strcat(argv[1], "64");
+                } else {
+                    argv[1] = s;
+                }
+                preloader_exec(argv);
+            }
+        }
+
         if (machine == IMAGE_FILE_MACHINE_AMD64)  /* try the 64-bit loader */
         {
             size_t len = strlen(wineloader);




--- dlls/ntdll/unix/virtual.c.orig
+++ dlls/ntdll/unix/virtual.c
@@ -1562,7 +1562,6 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz
 
     if (vprot & VPROT_WRITEWATCH && use_kernel_writewatch)
     {
-        madvise( view->base, view->size, MADV_NOHUGEPAGE );
         reset_write_watches( view->base, view->size );
     }
 
@@ -2158,7 +2157,6 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
                 ERR("set_protection failed.\n");
             if (vprot & VPROT_WRITEWATCH)
             {
-                madvise( base, size, MADV_NOHUGEPAGE );
                 reset_write_watches( base, size );
             }
             return STATUS_SUCCESS;




--- dlls/ntdll/unix/loader.c.orig	2024-04-05 17:03:05 UTC
+++ dlls/ntdll/unix/loader.c
@@ -480,6 +480,21 @@ char *get_alternate_wineloader( WORD machine )
 
     if (machine == current_machine) return NULL;
 
+    char* wineserver_path = getenv("WINESERVER");
+    if (wineserver_path != NULL && wineserver_path[0] == '/') {
+        char* s = remove_tail(wineserver_path, "server");
+        if (s != NULL) {
+            if (machine == IMAGE_FILE_MACHINE_AMD64) {
+                ret = malloc(strlen(s) + 3);
+                strcpy(ret, s);
+                strcat(ret, "64");
+            } else {
+                ret = s;
+            }
+            return ret;
+        }
+    }
+
     if (machine == IMAGE_FILE_MACHINE_AMD64)  /* try the 64-bit loader */
     {
          size_t len = strlen(wineloader);




--- dlls/ntdll/unix/system.c.orig	2024-04-26 15:24:41 UTC
+++ dlls/ntdll/unix/system.c
@@ -574,6 +574,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info 
 
 #endif /* End architecture specific feature detection for CPUs */
 
+#ifdef __linux__
 static void fill_performance_core_info(void);
 static BOOL sysfs_parse_bitmap(const char *filename, ULONG_PTR *mask);
 
@@ -712,6 +713,12 @@ error:
     cpu_override.mapping.cpu_count = 0;
     ERR("Invalid WINE_CPU_TOPOLOGY string %s (%s).\n", debugstr_a(env_override), debugstr_a(s));
 }
+#else
+static void fill_cpu_override(unsigned int)
+{
+    /* do nothing */
+}
+#endif
 
 struct cpu_topology_override *get_cpu_topology_override(void)
 {




--- dlls/ntdll/unix/virtual.c.orig	2024-04-26 15:24:41 UTC
+++ dlls/ntdll/unix/virtual.c
@@ -64,9 +64,11 @@
 # include <mach/mach_vm.h>
 #endif
 
+#ifdef __linux__
 #include <linux/userfaultfd.h>
 #include <sys/ioctl.h>
 #include "uffd_tmp_defs.h"
+#endif
 
 #include <sys/uio.h>
 
@@ -258,6 +260,7 @@ void *anon_mmap_alloc( size_t size, int prot )
     return mmap( NULL, size, prot, MAP_PRIVATE | MAP_ANON, -1, 0 );
 }
 
+#ifdef __linux__
 static void kernel_writewatch_softdirty_init(void)
 {
     if ((pagemap_reset_fd = open( "/proc/self/pagemap_reset", O_RDONLY | O_CLOEXEC )) == -1) return;
@@ -494,7 +497,27 @@ static NTSTATUS kernel_get_write_watches( void *base, 
     }
     return STATUS_SUCCESS;
 }
+#else
+static void kernel_writewatch_init(void)
+{
+    use_kernel_writewatch = 0;
+}
 
+static void kernel_writewatch_register_range(struct file_view*, void*, size_t)
+{
+    /* do nothing */
+}
+
+static void kernel_writewatch_reset(void*, SIZE_T)
+{
+    abort();
+}
+
+static NTSTATUS kernel_get_write_watches(void*, SIZE_T, void**, ULONG_PTR*, BOOL)
+{
+    abort();
+}
+#endif
 
 static void mmap_add_reserved_area( void *addr, SIZE_T size )
 {

Added Link Here

(-)b/emulators/wine-proton/files/patch-include_wine_asm.h (+14 lines)
1	--- include/wine/asm.h.orig 2024-02-24 10:23:40.551780000 +0300
2	+++ include/wine/asm.h 2024-02-24 10:23:43.285931000 +0300
3	@@ -242,9 +242,9 @@
4	".byte 0x75,0x03\n\t" /* jne 1f */ \
5	".byte 0x0f,0x05\n\t" /* syscall */ \
6	".byte 0xc3\n\t" /* ret */ \
7	- "jmp 1f\n\t" \
8	+ ".byte 0xeb,0x01\n\t" /* jmp 1f */ \
9	".byte 0xc3\n" /* ret */ \
10	- "1:\t.byte 0xff,0x14,0x25\n\t" /* 1: callq (0x7ffe1000) / \
11	+ ".byte 0xff,0x14,0x25\n\t" /* 1: callq (0x7ffe1000) / \
12	".long 0x7ffe1000\n\t" \
13	"ret" )
14	# else

Removed Link Here

(-)a/emulators/wine-proton/files/patch-libs__wine__config.c (-11 lines)
1	--- libs/wine/config.c.orig 2023-07-17 16:05:30.000000000 +0300
2	+++ libs/wine/config.c 2023-09-10 09:32:37.552268000 +0300
3	@@ -147,7 +147,7 @@ static char *get_runtime_exedir(void)
4	static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
5	size_t dir_size = PATH_MAX;
6	char *dir = malloc( dir_size );
7	- if (dir && !sysctl( pathname, ARRAY_SIZE( pathname ), dir, &dir_size, NULL, 0 ))
8	+ if (dir && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), dir, &dir_size, NULL, 0 ))
9	return dir;
10	free( dir );
11	return NULL;




--- server/token.c.orig	2022-12-18 11:53:01.498015000 +0300
+++ server/token.c	2022-12-18 11:53:14.540515000 +0300
@@ -212,10 +212,10 @@ void init_user_sid(void)
     size_t n;
     FILE *f;
 
-    f = fopen( "/etc/machine-id", "r" );
+    f = fopen( "/var/lib/dbus/machine-id", "r" );
     if (!f)
     {
-        fprintf( stderr, "Failed to open /etc/machine-id, error %s.\n", strerror( errno ));
+        fprintf( stderr, "Failed to open /var/lib/dbus/machine-id, error %s.\n", strerror( errno ));
         return;
     }
 
@@ -224,7 +224,7 @@ void init_user_sid(void)
 
     if (n != 16)
     {
-        fprintf( stderr, "Failed to read /etc/machine-id, error %s.\n", strerror( errno ));
+        fprintf( stderr, "Failed to read /var/lib/dbus/machine-id, error %s.\n", strerror( errno ));
         return;
     }
     machine_id[n] = 0;

Return to bug 278940

Lines 1-6 Link Here

(-)b/emulators/wine-proton/Makefile (-14 / +30 lines)
1	PORTNAME= wine-proton	1	PORTNAME= wine-proton
2	DISTVERSION= 8.0-5	2	DISTVERSION= 9.0-1
3	PORTREVISION= 1	3	PORTREVISION= 0
4	CATEGORIES= emulators	4	CATEGORIES= emulators
5		5
6	MAINTAINER= iwtcex@gmail.com	6	MAINTAINER= iwtcex@gmail.com
Lines 14-38 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
14	ONLY_FOR_ARCHS= amd64 i386	14	ONLY_FOR_ARCHS= amd64 i386
15		15
16	BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \	16	BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \
17	llvm${_LLVM_VERSION}>=0:devel/llvm${_LLVM_VERSION}	17	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
18		18
19	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \	19	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
20	libfreetype.so:print/freetype2 \	20	libfreetype.so:print/freetype2 \
21	libgnutls.so:security/gnutls \	21	libgnutls.so:security/gnutls \
22	libvulkan.so:graphics/vulkan-loader	22	libvulkan.so:graphics/vulkan-loader
23		23
24	USES= autoreconf bison desktop-file-utils gl gmake gnome gstreamer localbase pkgconfig python:build sdl shebangfix tar:xz xorg	24	# amd_ags_x64.so
		25	LIB_DEPENDS+= libdrm.so:graphics/libdrm \
		26	libdrm_amdgpu.so:graphics/libdrm
		27
		28	# winewayland.so
		29	LIB_DEPENDS+= libwayland-client.so:graphics/wayland \
		30	libxkbcommon.so:x11/libxkbcommon \
		31	libxkbregistry.so:x11/libxkbcommon
		32
		33	USES= autoreconf bison desktop-file-utils gl gmake gnome gstreamer llvm:${_LLVM_VERSION},build localbase perl5 pkgconfig python:build sdl shebangfix tar:xz xorg
25	USE_GCC= yes	34	USE_GCC= yes
26	PIE_UNSAFE= yes
27		35
28	USE_GITHUB= yes	36	USE_GITHUB= yes
29	GH_ACCOUNT= ValveSoftware	37	GH_ACCOUNT= ValveSoftware
30	GH_PROJECT= wine	38	GH_PROJECT= wine
31	GH_TAGNAME= bb66944d9d7a0fc7692f05d4a2db418b468d3021	39	GH_TAGNAME= a8514f9606ee3fdc3d912c988f651edc5d7d0d55
32		40
33	USE_GL= gl	41	USE_GL= gl
34	USE_GNOME= glib20	42	USE_GNOME= glib20
35	USE_GSTREAMER= gl mpeg2dec x264 # https://github.com/ValveSoftware/wine/commit/8cdd506d7e68c27cd564c317320bfc8d3a999eda	43	USE_GSTREAMER= gl good mpeg2dec x264 # https://github.com/ValveSoftware/wine/commit/8cdd506d7e68c27cd564c317320bfc8d3a999eda
		44	USE_PERL5= build
36	USE_SDL= sdl2	45	USE_SDL= sdl2
37	USE_XORG= x11 xext xcomposite xcursor xi xinerama xrandr xrender	46	USE_XORG= x11 xext xcomposite xcursor xi xinerama xrandr xrender
38		47
Lines 43-48 GNU_CONFIGURE= yes Link Here
43	GNU_CONFIGURE_PREFIX= ${PREFIX}/${PORTNAME}	52	GNU_CONFIGURE_PREFIX= ${PREFIX}/${PORTNAME}
44		53
45	CONFIGURE_ARGS= --verbose \	54	CONFIGURE_ARGS= --verbose \
		55	--enable-archs=${ARCH:S\|amd64\|x86_64\|} \
		56	--with-mingw CROSSCC="clang" CROSSCFLAGS="-isystem ${FILESDIR}/clang" \
46	--libdir=${PREFIX}/${PORTNAME}/lib \	57	--libdir=${PREFIX}/${PORTNAME}/lib \
47	--disable-kerberos \	58	--disable-kerberos \
48	--disable-tests \	59	--disable-tests \
Lines 52-67 CONFIGURE_ARGS= --verbose \ Link Here
52	--with-gstreamer \	63	--with-gstreamer \
53	--with-opengl \	64	--with-opengl \
54	--with-oss \	65	--with-oss \
		66	--with-pthread \
55	--with-sdl \	67	--with-sdl \
56	--with-vulkan \	68	--with-vulkan \
		69	--with-wayland \
57	--with-x \	70	--with-x \
58	--with-xinerama \	71	--with-xinerama \
59	--with-xinput2 \	72	--with-xinput2 \
60	--with-xrandr \	73	--with-xrandr \
61	--with-xrender \	74	--with-xrender \
62	--with-pcap \
63	--with-pthread \
64	--with-mingw CROSSCC="clang" CROSSCFLAGS="-isystem ${FILESDIR}/clang" \
65	--without-alsa \	75	--without-alsa \
66	--without-capi \	76	--without-capi \
67	--without-coreaudio \	77	--without-coreaudio \
Lines 76-81 CONFIGURE_ARGS= --verbose \ Link Here
76	--without-netapi \	86	--without-netapi \
77	--without-opencl \	87	--without-opencl \
78	--without-osmesa \	88	--without-osmesa \
		89	--without-pcap \
79	--without-pcsclite \	90	--without-pcsclite \
80	--without-sane \	91	--without-sane \
81	--without-udev \	92	--without-udev \
Lines 86-91 CONFIGURE_ARGS= --verbose \ Link Here
86	CONFIGURE_ENV= CPPBIN="false" CPPFLAGS="" FLEX="${LOCALBASE}/bin/flex" JXRLIB_CFLAGS="-I${LOCALBASE}/include/jxrlib"	97	CONFIGURE_ENV= CPPBIN="false" CPPFLAGS="" FLEX="${LOCALBASE}/bin/flex" JXRLIB_CFLAGS="-I${LOCALBASE}/include/jxrlib"
87		98
88	CFLAGS+= -D__NR_futex="-1" -Werror=implicit-function-declaration	99	CFLAGS+= -D__NR_futex="-1" -Werror=implicit-function-declaration
		100	CFLAGS_i386+= -mpreferred-stack-boundary=4 -mstackrealign
		101	PIE_UNSAFE= yes
89		102
90	BINARY_ALIAS+= clang=${LOCALBASE}/bin/clang${_LLVM_VERSION} \	103	BINARY_ALIAS+= clang=${LOCALBASE}/bin/clang${_LLVM_VERSION} \
91	lld-link=${LOCALBASE}/bin/lld-link${_LLVM_VERSION}	104	lld-link=${LOCALBASE}/bin/lld-link${_LLVM_VERSION}
Lines 115-126 CONFIGURE_ARGS+=--enable-win64 Link Here
115	PLIST_SUB+= WINE32="" WINE64="@comment " WINEARCH="i386"	128	PLIST_SUB+= WINE32="" WINE64="@comment " WINEARCH="i386"
116	.endif	129	.endif
117		130
		131	post-patch:
		132	${REINPLACE_CMD} 's/CFLAGS="$$llvm_extra_cflags $$llvm_cflags"/CFLAGS="$$CROSSCFLAGS $$llvm_extra_cflags $$llvm_cflags"/g' ${WRKSRC}/configure.ac
		133
118	pre-configure:	134	pre-configure:
119	cd ${WRKSRC} && ${PYTHON_CMD} dlls/winevulkan/make_vulkan --xml vk.xml	135	cd ${WRKSRC} && ${PYTHON_CMD} dlls/winevulkan/make_vulkan --xml vk.xml
		136	cd ${WRKSRC} && ${PERL5} tools/make_specfiles
120		137
121	pre-build:	138	pre-build:
122	cd ${WRKSRC} && ${MAKE_CMD} depend	139	cd ${WRKSRC} && ${MAKE_CMD} depend
123	cd ${WRKSRC} && tools/make_requests	140	cd ${WRKSRC} && ${PERL5} tools/make_requests
124		141
125	post-install:	142	post-install:
126	.if ${ARCH} == i386	143	.if ${ARCH} == i386
Lines 131-144 post-install: Link Here
131	.else	148	.else
132	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/pkg32.sh	149	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/pkg32.sh
133	${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64 ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64.bin	150	${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64 ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64.bin
134	-${ELFCTL} -e +noaslr ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64.bin
135	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64	151	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64
136	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine	152	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine
137	.endif	153	.endif
138	${RM} -r ${STAGEDIR}${PREFIX}/${PORTNAME}/include	154	${RM} -r ${STAGEDIR}${PREFIX}/${PORTNAME}/include
139	${RM} -r ${STAGEDIR}${PREFIX}/man	155	${RM} -r ${STAGEDIR}${PREFIX}/share/man
140	${MKDIR} ${STAGEDIR}${DOCSDIR}	156	${MKDIR} ${STAGEDIR}${DOCSDIR}
141	.for i in README ANNOUNCE AUTHORS	157	.for i in README.md ANNOUNCE.md AUTHORS
142	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}	158	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
143	.endfor	159	.endfor
144		160

Lines 8-20 Link Here

(-)b/emulators/wine-proton/files/clang/stdarg.h (-7 / +23 lines)
8	*/	8	*/
9		9
10	#ifndef __STDARG_H	10	#ifndef __STDARG_H
11	#define __STDARG_H
12		11
		12	#ifndef __GNUC_VA_LIST
		13	#define __GNUC_VA_LIST
		14	typedef __builtin_va_list __gnuc_va_list;
		15	#endif
		16
		17	#ifdef __need___va_list
		18	#undef __need___va_list
		19	#else
		20	#define __STDARG_H
13	#ifndef _VA_LIST	21	#ifndef _VA_LIST
14	typedef __builtin_va_list va_list;	22	typedef __builtin_va_list va_list;
15	#define _VA_LIST	23	#define _VA_LIST
16	#endif	24	#endif
		25
		26	/* FIXME: This is using the placeholder dates Clang produces for these macros
		27	in C2x mode; switch to the correct values once they've been published. */
		28	#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L
		29	/* C2x does not require the second parameter for va_start. */
		30	#define va_start(ap, ...) __builtin_va_start(ap, 0)
		31	#else
		32	/* Versions before C2x do require the second parameter. */
17	#define va_start(ap, param) __builtin_va_start(ap, param)	33	#define va_start(ap, param) __builtin_va_start(ap, param)
		34	#endif
18	#define va_end(ap) __builtin_va_end(ap)	35	#define va_end(ap) __builtin_va_end(ap)
19	#define va_arg(ap, type) __builtin_va_arg(ap, type)	36	#define va_arg(ap, type) __builtin_va_arg(ap, type)
20		37
Lines 23-35 typedef __builtin_va_list va_list; Link Here
23	*/	40	*/
24	#define __va_copy(d,s) __builtin_va_copy(d,s)	41	#define __va_copy(d,s) __builtin_va_copy(d,s)
25		42
26	#if __STDC_VERSION__ >= 199901L \|\| __cplusplus >= 201103L \|\| !defined(__STRICT_ANSI__)	43	#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \|\| \
		44	(defined(__cplusplus) && __cplusplus >= 201103L) \|\| \
		45	!defined(__STRICT_ANSI__)
27	#define va_copy(dest, src) __builtin_va_copy(dest, src)	46	#define va_copy(dest, src) __builtin_va_copy(dest, src)
28	#endif	47	#endif
29		48
30	#ifndef __GNUC_VA_LIST
31	#define __GNUC_VA_LIST 1
32	typedef __builtin_va_list __gnuc_va_list;
33	#endif
34
35	#endif /* __STDARG_H */	49	#endif /* __STDARG_H */
		50
		51	#endif /* not __STDARG_H */

Added Link Here

(-)b/emulators/wine-proton/files/clang/stdbool.h (+34 lines)
1	/*===---- stdbool.h - Standard header for booleans -------------------------===
2	*
3	* Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	* See https://llvm.org/LICENSE.txt for license information.
5	* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	*
7	*===-----------------------------------------------------------------------===
8	*/
9
10	#ifndef __STDBOOL_H
11	#define __STDBOOL_H
12
13	#define __bool_true_false_are_defined 1
14
15	#if defined(__STDC_VERSION__) && __STDC_VERSION__ > 201710L
16	/* FIXME: We should be issuing a deprecation warning here, but cannot yet due
17	* to system headers which include this header file unconditionally.
18	*/
19	#elif !defined(__cplusplus)
20	#define bool _Bool
21	#define true 1
22	#define false 0
23	#elif defined(__GNUC__) && !defined(__STRICT_ANSI__)
24	/* Define _Bool as a GNU extension. */
25	#define _Bool bool
26	#if defined(__cplusplus) && __cplusplus < 201103L
27	/* For C++98, define bool, false, true as a GNU extension. */
28	#define bool bool
29	#define false false
30	#define true true
31	#endif
32	#endif
33
34	#endif /* __STDBOOL_H */

Added Link Here

(-)b/emulators/wine-proton/files/clang/stddef.h (+128 lines)
1	/*===---- stddef.h - Basic type definitions --------------------------------===
2	*
3	* Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	* See https://llvm.org/LICENSE.txt for license information.
5	* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	*
7	*===-----------------------------------------------------------------------===
8	*/
9
10	#if !defined(__STDDEF_H) \|\| defined(__need_ptrdiff_t) \|\| \
11	defined(__need_size_t) \|\| defined(__need_wchar_t) \|\| \
12	defined(__need_NULL) \|\| defined(__need_wint_t)
13
14	#if !defined(__need_ptrdiff_t) && !defined(__need_size_t) && \
15	!defined(__need_wchar_t) && !defined(__need_NULL) && \
16	!defined(__need_wint_t)
17	/* Always define miscellaneous pieces when modules are available. */
18	#if !__has_feature(modules)
19	#define __STDDEF_H
20	#endif
21	#define __need_ptrdiff_t
22	#define __need_size_t
23	#define __need_wchar_t
24	#define __need_NULL
25	#define __need_STDDEF_H_misc
26	/* __need_wint_t is intentionally not defined here. */
27	#endif
28
29	#if defined(__need_ptrdiff_t)
30	#if !defined(_PTRDIFF_T) \|\| __has_feature(modules)
31	/* Always define ptrdiff_t when modules are available. */
32	#if !__has_feature(modules)
33	#define _PTRDIFF_T
34	#endif
35	typedef __PTRDIFF_TYPE__ ptrdiff_t;
36	#endif
37	#undef __need_ptrdiff_t
38	#endif /* defined(__need_ptrdiff_t) */
39
40	#if defined(__need_size_t)
41	#if !defined(_SIZE_T) \|\| __has_feature(modules)
42	/* Always define size_t when modules are available. */
43	#if !__has_feature(modules)
44	#define _SIZE_T
45	#endif
46	typedef __SIZE_TYPE__ size_t;
47	#endif
48	#undef __need_size_t
49	#endif /defined(__need_size_t) /
50
51	#if defined(__need_STDDEF_H_misc)
52	/* ISO9899:2011 7.20 (C11 Annex K): Define rsize_t if __STDC_WANT_LIB_EXT1__ is
53	* enabled. */
54	#if (defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ >= 1 && \
55	!defined(_RSIZE_T)) \|\| __has_feature(modules)
56	/* Always define rsize_t when modules are available. */
57	#if !__has_feature(modules)
58	#define _RSIZE_T
59	#endif
60	typedef __SIZE_TYPE__ rsize_t;
61	#endif
62	#endif /* defined(__need_STDDEF_H_misc) */
63
64	#if defined(__need_wchar_t)
65	#if !defined(__cplusplus) \|\| (defined(_MSC_VER) && !_NATIVE_WCHAR_T_DEFINED)
66	/* Always define wchar_t when modules are available. */
67	#if !defined(_WCHAR_T) \|\| __has_feature(modules)
68	#if !__has_feature(modules)
69	#define _WCHAR_T
70	#if defined(_MSC_EXTENSIONS)
71	#define _WCHAR_T_DEFINED
72	#endif
73	#endif
74	typedef __WCHAR_TYPE__ wchar_t;
75	#endif
76	#endif
77	#undef __need_wchar_t
78	#endif /* defined(__need_wchar_t) */
79
80	#if defined(__need_NULL)
81	#undef NULL
82	#ifdef __cplusplus
83	# if !defined(__MINGW32__) && !defined(_MSC_VER)
84	# define NULL __null
85	# else
86	# define NULL 0
87	# endif
88	#else
89	# define NULL ((void*)0)
90	#endif
91	#ifdef __cplusplus
92	#if defined(_MSC_EXTENSIONS) && defined(_NATIVE_NULLPTR_SUPPORTED)
93	namespace std { typedef decltype(nullptr) nullptr_t; }
94	using ::std::nullptr_t;
95	#endif
96	#endif
97	#undef __need_NULL
98	#endif /* defined(__need_NULL) */
99
100	/* FIXME: This is using the placeholder dates Clang produces for these macros
101	in C2x mode; switch to the correct values once they've been published. */
102	#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L
103	typedef typeof(nullptr) nullptr_t;
104	#endif /* defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L */
105
106	#if defined(__need_STDDEF_H_misc)
107	#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) \|\| \
108	(defined(__cplusplus) && __cplusplus >= 201103L)
109	#include "__stddef_max_align_t.h"
110	#endif
111	#define offsetof(t, d) __builtin_offsetof(t, d)
112	#undef __need_STDDEF_H_misc
113	#endif /* defined(__need_STDDEF_H_misc) */
114
115	/* Some C libraries expect to see a wint_t here. Others (notably MinGW) will use
116	__WINT_TYPE__ directly; accommodate both by requiring __need_wint_t */
117	#if defined(__need_wint_t)
118	/* Always define wint_t when modules are available. */
119	#if !defined(_WINT_T) \|\| __has_feature(modules)
120	#if !__has_feature(modules)
121	#define _WINT_T
122	#endif
123	typedef __WINT_TYPE__ wint_t;
124	#endif
125	#undef __need_wint_t
126	#endif /* __need_wint_t */
127
128	#endif

Removed Link Here

(-)a/emulators/wine-proton/files/patch-configure.ac (-33 lines)
1	--- configure.ac.orig 2023-09-02 23:55:42.978760000 +0300
2	+++ configure.ac 2023-09-03 00:08:27.789243000 +0300
3	@@ -863,11 +863,13 @@
4
5	saved_CC=$CC
6	saved_CFLAGS=$CFLAGS
7	+ saved_LDFLAGS=$LDFLAGS
8
9	CFLAGS=${CROSSCFLAGS:-"-g -O2"}
10	+ LDFLAGS=${CROSSLDFLAGS:-""}
11	AS_VAR_COPY([CC],[${wine_arch}_CC])
12	AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS])
13	- AS_VAR_COPY([${wine_arch}_LDFLAGS],[CROSSLDFLAGS])
14	+ AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS])
15	AS_VAR_SET([${wine_arch}_EXTRACFLAGS],["-D__WINE_PE_BUILD -Wall"])
16
17	target=""
18	@@ -915,6 +915,7 @@
19	then
20	CC=$saved_CC
21	CFLAGS=$saved_CFLAGS
22	+ LDFLAGS=$saved_LDFLAGS
23	continue
24	fi
25	AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"])
26	@@ -1005,6 +1006,7 @@
27
28	CC=$saved_CC
29	CFLAGS=$saved_CFLAGS
30	+ LDFLAGS=$saved_LDFLAGS
31	done
32
33	if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x

Removed Link Here

(-)a/emulators/wine-proton/files/patch-dlls__ntdll__unix__loader.c (-24 lines)
1	--- dlls/ntdll/unix/loader.c.orig 2023-07-17 16:05:30.000000000 +0300
2	+++ dlls/ntdll/unix/loader.c 2023-09-12 03:00:51.850143000 +0300
3	@@ -742,6 +742,21 @@ static NTSTATUS loader_exec( char **argv, WORD machine
4	{
5	if (machine != current_machine)
6	{
7	+ char* wineserver_path = getenv("WINESERVER");
8	+ if (wineserver_path != NULL && wineserver_path[0] == '/') {
9	+ char* s = remove_tail(wineserver_path, "server");
10	+ if (s != NULL) {
11	+ if (machine == IMAGE_FILE_MACHINE_AMD64) {
12	+ argv[1] = malloc(strlen(s) + 3);
13	+ strcpy(argv[1], s);
14	+ strcat(argv[1], "64");
15	+ } else {
16	+ argv[1] = s;
17	+ }
18	+ preloader_exec(argv);
19	+ }
20	+ }
21	+
22	if (machine == IMAGE_FILE_MACHINE_AMD64) /* try the 64-bit loader */
23	{
24	size_t len = strlen(wineloader);

Removed Link Here

(-)a/emulators/wine-proton/files/patch-dlls__ntdll__unix__virtual.c (-18 lines)
1	--- dlls/ntdll/unix/virtual.c.orig
2	+++ dlls/ntdll/unix/virtual.c
3	@@ -1562,7 +1562,6 @@ static NTSTATUS create_view( struct file_view *view_ret, void base, size_t siz
4
5	if (vprot & VPROT_WRITEWATCH && use_kernel_writewatch)
6	{
7	- madvise( view->base, view->size, MADV_NOHUGEPAGE );
8	reset_write_watches( view->base, view->size );
9	}
10
11	@@ -2158,7 +2157,6 @@ static NTSTATUS map_view( struct file_view *view_ret, void base, size_t size,
12	ERR("set_protection failed.\n");
13	if (vprot & VPROT_WRITEWATCH)
14	{
15	- madvise( base, size, MADV_NOHUGEPAGE );
16	reset_write_watches( base, size );
17	}
18	return STATUS_SUCCESS;

Added Link Here

(-)b/emulators/wine-proton/files/patch-dlls_ntdll_unix_loader.c (+24 lines)
1	--- dlls/ntdll/unix/loader.c.orig 2024-04-05 17:03:05 UTC
2	+++ dlls/ntdll/unix/loader.c
3	@@ -480,6 +480,21 @@ char *get_alternate_wineloader( WORD machine )
4
5	if (machine == current_machine) return NULL;
6
7	+ char* wineserver_path = getenv("WINESERVER");
8	+ if (wineserver_path != NULL && wineserver_path[0] == '/') {
9	+ char* s = remove_tail(wineserver_path, "server");
10	+ if (s != NULL) {
11	+ if (machine == IMAGE_FILE_MACHINE_AMD64) {
12	+ ret = malloc(strlen(s) + 3);
13	+ strcpy(ret, s);
14	+ strcat(ret, "64");
15	+ } else {
16	+ ret = s;
17	+ }
18	+ return ret;
19	+ }
20	+ }
21	+
22	if (machine == IMAGE_FILE_MACHINE_AMD64) /* try the 64-bit loader */
23	{
24	size_t len = strlen(wineloader);

Added Link Here

(-)b/emulators/wine-proton/files/patch-dlls_ntdll_unix_system.c (+23 lines)
1	--- dlls/ntdll/unix/system.c.orig 2024-04-26 15:24:41 UTC
2	+++ dlls/ntdll/unix/system.c
3	@@ -574,6 +574,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info
4
5	#endif /* End architecture specific feature detection for CPUs */
6
7	+#ifdef __linux__
8	static void fill_performance_core_info(void);
9	static BOOL sysfs_parse_bitmap(const char filename, ULONG_PTR mask);
10
11	@@ -712,6 +713,12 @@ error:
12	cpu_override.mapping.cpu_count = 0;
13	ERR("Invalid WINE_CPU_TOPOLOGY string %s (%s).\n", debugstr_a(env_override), debugstr_a(s));
14	}
15	+#else
16	+static void fill_cpu_override(unsigned int)
17	+{
18	+ /* do nothing */
19	+}
20	+#endif
21
22	struct cpu_topology_override *get_cpu_topology_override(void)
23	{

Added Link Here

(-)b/emulators/wine-proton/files/patch-dlls_ntdll_unix_virtual.c (+50 lines)
1	--- dlls/ntdll/unix/virtual.c.orig 2024-04-26 15:24:41 UTC
2	+++ dlls/ntdll/unix/virtual.c
3	@@ -64,9 +64,11 @@
4	# include <mach/mach_vm.h>
5	#endif
6
7	+#ifdef __linux__
8	#include <linux/userfaultfd.h>
9	#include <sys/ioctl.h>
10	#include "uffd_tmp_defs.h"
11	+#endif
12
13	#include <sys/uio.h>
14
15	@@ -258,6 +260,7 @@ void *anon_mmap_alloc( size_t size, int prot )
16	return mmap( NULL, size, prot, MAP_PRIVATE \| MAP_ANON, -1, 0 );
17	}
18
19	+#ifdef __linux__
20	static void kernel_writewatch_softdirty_init(void)
21	{
22	if ((pagemap_reset_fd = open( "/proc/self/pagemap_reset", O_RDONLY \| O_CLOEXEC )) == -1) return;
23	@@ -494,7 +497,27 @@ static NTSTATUS kernel_get_write_watches( void *base,
24	}
25	return STATUS_SUCCESS;
26	}
27	+#else
28	+static void kernel_writewatch_init(void)
29	+{
30	+ use_kernel_writewatch = 0;
31	+}
32
33	+static void kernel_writewatch_register_range(struct file_view, void, size_t)
34	+{
35	+ /* do nothing */
36	+}
37	+
38	+static void kernel_writewatch_reset(void*, SIZE_T)
39	+{
40	+ abort();
41	+}
42	+
43	+static NTSTATUS kernel_get_write_watches(void, SIZE_T, void, ULONG_PTR, BOOL)
44	+{
45	+ abort();
46	+}
47	+#endif
48
49	static void mmap_add_reserved_area( void *addr, SIZE_T size )
50	{

Lines 1-6 Link Here

(-)b/emulators/wine-proton/pkg-plist (-12 / +42 lines)
1	%%DOCSDIR%%/ANNOUNCE	1	%%DOCSDIR%%/ANNOUNCE.md
2	%%DOCSDIR%%/AUTHORS	2	%%DOCSDIR%%/AUTHORS
3	%%DOCSDIR%%/README	3	%%DOCSDIR%%/README.md
4	%%PULSEAUDIO%%wine-proton/lib/wine/%%WINEARCH%%-unix/winepulse.so	4	%%PULSEAUDIO%%wine-proton/lib/wine/%%WINEARCH%%-unix/winepulse.so
5	%%PULSEAUDIO%%wine-proton/lib/wine/%%WINEARCH%%-windows/winepulse.drv	5	%%PULSEAUDIO%%wine-proton/lib/wine/%%WINEARCH%%-windows/winepulse.drv
6	%%WINE32%%wine-proton/bin/wine.bin	6	%%WINE32%%wine-proton/bin/wine.bin
Lines 77-83 Link Here
77	%%WINE64%%wine-proton/bin/wine64.bin	77	%%WINE64%%wine-proton/bin/wine64.bin
78	%%WINE64%%wine-proton/bin/wineserver	78	%%WINE64%%wine-proton/bin/wineserver
79	%%WINE64%%wine-proton/lib/wine/%%WINEARCH%%-unix/libwow64.a	79	%%WINE64%%wine-proton/lib/wine/%%WINEARCH%%-unix/libwow64.a
80	%%WINE64%%wine-proton/lib/wine/%%WINEARCH%%-windows/libwow64.a	80	%%WINE64%%wine-proton/lib/wine/%%WINEARCH%%-unix/winewayland.so
		81	%%WINE64%%wine-proton/lib/wine/%%WINEARCH%%-windows/vcruntime140_1.dll
		82	%%WINE64%%wine-proton/lib/wine/%%WINEARCH%%-windows/winewayland.drv
81	%%WINE64%%wine-proton/lib/wine/%%WINEARCH%%-windows/wow64.dll	83	%%WINE64%%wine-proton/lib/wine/%%WINEARCH%%-windows/wow64.dll
82	%%WINE64%%wine-proton/lib/wine/%%WINEARCH%%-windows/wow64cpu.dll	84	%%WINE64%%wine-proton/lib/wine/%%WINEARCH%%-windows/wow64cpu.dll
83	%%WINE64%%wine-proton/lib/wine/%%WINEARCH%%-windows/wow64win.dll	85	%%WINE64%%wine-proton/lib/wine/%%WINEARCH%%-windows/wow64win.dll
Lines 104-109 wine-proton/bin/winemine Link Here
104	wine-proton/bin/winepath	106	wine-proton/bin/winepath
105	wine-proton/bin/wmc	107	wine-proton/bin/wmc
106	wine-proton/bin/wrc	108	wine-proton/bin/wrc
		109	wine-proton/lib/wine/%%WINEARCH%%-unix/amd_ags_x64.so
107	wine-proton/lib/wine/%%WINEARCH%%-unix/avicap32.so	110	wine-proton/lib/wine/%%WINEARCH%%-unix/avicap32.so
108	wine-proton/lib/wine/%%WINEARCH%%-unix/bcrypt.so	111	wine-proton/lib/wine/%%WINEARCH%%-unix/bcrypt.so
109	wine-proton/lib/wine/%%WINEARCH%%-unix/crypt32.so	112	wine-proton/lib/wine/%%WINEARCH%%-unix/crypt32.so
Lines 125-130 wine-proton/lib/wine/%%WINEARCH%%-unix/libavicap32.a Link Here
125	wine-proton/lib/wine/%%WINEARCH%%-unix/libavifil32.a	128	wine-proton/lib/wine/%%WINEARCH%%-unix/libavifil32.a
126	wine-proton/lib/wine/%%WINEARCH%%-unix/libavrt.a	129	wine-proton/lib/wine/%%WINEARCH%%-unix/libavrt.a
127	wine-proton/lib/wine/%%WINEARCH%%-unix/libbcrypt.a	130	wine-proton/lib/wine/%%WINEARCH%%-unix/libbcrypt.a
		131	wine-proton/lib/wine/%%WINEARCH%%-unix/libbluetoothapis.a
128	wine-proton/lib/wine/%%WINEARCH%%-unix/libcabinet.a	132	wine-proton/lib/wine/%%WINEARCH%%-unix/libcabinet.a
129	wine-proton/lib/wine/%%WINEARCH%%-unix/libcards.a	133	wine-proton/lib/wine/%%WINEARCH%%-unix/libcards.a
130	wine-proton/lib/wine/%%WINEARCH%%-unix/libcfgmgr32.a	134	wine-proton/lib/wine/%%WINEARCH%%-unix/libcfgmgr32.a
Lines 132-137 wine-proton/lib/wine/%%WINEARCH%%-unix/libclusapi.a Link Here
132	wine-proton/lib/wine/%%WINEARCH%%-unix/libcombase.a	136	wine-proton/lib/wine/%%WINEARCH%%-unix/libcombase.a
133	wine-proton/lib/wine/%%WINEARCH%%-unix/libcomctl32.a	137	wine-proton/lib/wine/%%WINEARCH%%-unix/libcomctl32.a
134	wine-proton/lib/wine/%%WINEARCH%%-unix/libcomdlg32.a	138	wine-proton/lib/wine/%%WINEARCH%%-unix/libcomdlg32.a
		139	wine-proton/lib/wine/%%WINEARCH%%-unix/libcoml2.a
135	wine-proton/lib/wine/%%WINEARCH%%-unix/libcompstui.a	140	wine-proton/lib/wine/%%WINEARCH%%-unix/libcompstui.a

Removed Link Here

(-)a/emulators/wine-proton/files/patch-server_token.c (-24 lines)
1	--- server/token.c.orig 2022-12-18 11:53:01.498015000 +0300
2	+++ server/token.c 2022-12-18 11:53:14.540515000 +0300
3	@@ -212,10 +212,10 @@ void init_user_sid(void)
4	size_t n;
5	FILE *f;
6
7	- f = fopen( "/etc/machine-id", "r" );
8	+ f = fopen( "/var/lib/dbus/machine-id", "r" );
9	if (!f)
10	{
11	- fprintf( stderr, "Failed to open /etc/machine-id, error %s.\n", strerror( errno ));
12	+ fprintf( stderr, "Failed to open /var/lib/dbus/machine-id, error %s.\n", strerror( errno ));
13	return;
14	}
15
16	@@ -224,7 +224,7 @@ void init_user_sid(void)
17
18	if (n != 16)
19	{
20	- fprintf( stderr, "Failed to read /etc/machine-id, error %s.\n", strerror( errno ));
21	+ fprintf( stderr, "Failed to read /var/lib/dbus/machine-id, error %s.\n", strerror( errno ));
22	return;
23	}
24	machine_id[n] = 0;