Attachment 255250 Details for Bug 282825 – git diff(wayland support)

[patch] git diff(wayland support)

gitdiff.txt (text/plain), 3.28 KB, created by tatarataratatan on 2024-11-18 05:23:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tatarataratatan

Created: 2024-11-18 05:23:01 UTC

Size: 3.28 KB

patch

obsolete

>diff --git a/wine-devel/Makefile b/wine-devel/Makefile
>--- a/wine-devel/Makefile	2024-11-18 13:37:31.036487000 +0900
>+++ b/wine-devel/Makefile	2024-11-18 13:52:23.903062000 +0900
>@@ -1,6 +1,6 @@
> PORTNAME=	wine
> DISTVERSION=	9.21
>-PORTEPOCH=	1
>+PORTEPOCH=	2
> CATEGORIES=	emulators
> MASTER_SITES=	https://dl.winehq.org/wine/source/9.x/
> PKGNAMESUFFIX=	-devel
>@@ -53,8 +53,7 @@
> 		--with-sdl \
> 		--without-udev \
> 		--without-unwind \
>-		--without-usb \
>-		--without-wayland
>+		--without-usb
> CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
> WINELIBDIR=	${PREFIX}/lib
> .if !defined(USE_LDCONFIG32)
>@@ -70,8 +69,8 @@
> 
> PORTDATA=	wine.inf
> 
>-OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS V4L WINEMAKER X11 GECKO MONO
>-OPTIONS_DEFAULT=ALSA GNUTLS X11
>+OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS V4L WINEMAKER X11 GECKO MONO WAYLAND
>+OPTIONS_DEFAULT=ALSA GNUTLS X11 WAYLAND
> OPTIONS_RADIO=	AUDIO
> OPTIONS_RADIO_AUDIO=	ALSA OSS
> OPTIONS_SUB=	yes
>@@ -80,6 +79,7 @@
> WINEMAKER_DESC=	Fully support winemaker (requires Perl)
> GECKO_DESC=	Bundle Gecko MSI package for Wine
> MONO_DESC=	Bundle Mono MSI package for Wine
>+WAYLAND_DESC=	Wayland Support
> 
> ALSA_CONFIGURE_WITH=	alsa
> ALSA_USES=		gnome gstreamer
>@@ -99,6 +99,10 @@
> 
> MONO_RUN_DEPENDS=	wine-mono-devel>0:emulators/wine-mono-devel
> 
>+WAYLAND_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
>+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
>+			libxkbcommon.so:x11/libxkbcommon
>+
> OSS_CONFIGURE_WITH=	oss
> OSS_USES=		gnome gstreamer
> OSS_USE=		GNOME=glib20
>@@ -124,6 +128,14 @@
> .else
> CONFIGURE_ARGS+=	--without-gstreamer
> PLIST_SUB+=		GSTREAMER="@comment "
>+.endif
>+
>+.if ${PORT_OPTIONS:MWAYLAND}
>+CONFIGURE_ARGS+=	--with-wayland
>+PLIST_SUB+=		WAYLAND=""
>+.else
>+CONFIGURE_ARGS+=	--without-wayland
>+PLIST_SUB+=		WAYLAND="@comment "
> .endif
> 
> .if ${ARCH} == amd64
>diff --git a/wine-devel/files/pkg-message.in b/wine-devel/files/pkg-message.in
>--- a/wine-devel/files/pkg-message.in	2024-11-18 13:37:31.036561000 +0900
>+++ b/wine-devel/files/pkg-message.in	2024-11-18 13:43:01.838629000 +0900
>@@ -8,6 +8,15 @@
> The port also installs some of Wine's documentation which describes
> additional programs that are not in the manual pages under
>   %%PREFIX%%/share/doc/wine
>+
>+For enabling Wayland,
>+$ cat <<EOF > wayland.reg
>+Windows Registry Editor Version 5.00
>+[HKEY_CURRENT_USER\Software\Wine\Drivers]
>+"Graphics"="x11,wayland"
>+EOF
>+$ wine64 regedit wayland.reg
>+
> EOM
> }
> ]
>diff --git a/wine-devel/pkg-plist b/wine-devel/pkg-plist
>--- a/wine-devel/pkg-plist	2024-11-18 13:37:31.036822000 +0900
>+++ b/wine-devel/pkg-plist	2024-11-18 12:03:30.049522000 +0900
>@@ -1630,6 +1630,7 @@
> %%OSS%%lib/wine/%%WINEARCH%%-unix/wineoss.so
> lib/wine/%%WINEARCH%%-unix/wineps.so
> lib/wine/%%WINEARCH%%-unix/winevulkan.so
>+%%WAYLAND%%lib/wine/%%WINEARCH%%-unix/winewayland.so
> %%X11%%lib/wine/%%WINEARCH%%-unix/winex11.so
> lib/wine/%%WINEARCH%%-unix/winspool.so
> lib/wine/%%WINEARCH%%-unix/ws2_32.so
>@@ -2571,6 +2572,7 @@
> %%WINE32%%lib/wine/%%WINEARCH%%-windows/wineps16.drv16
> %%WINE32%%lib/wine/%%WINEARCH%%-windows/winevdm.exe
> lib/wine/%%WINEARCH%%-windows/winevulkan.dll
>+%%WAYLAND%%lib/wine/%%WINEARCH%%-windows/winewayland.drv
> %%X11%%lib/wine/%%WINEARCH%%-windows/winex11.drv
> %%X11%%lib/wine/%%WINEARCH%%-windows/winexinput.sys
> %%WINE32%%lib/wine/%%WINEARCH%%-windows/wing.dll16

Actions: View | Diff

Attachments on bug 282825: 255249 | 255250 | 256483 | 256484