From nobody Sun Jan 12 12:04:23 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YWDZv4Cf6z5kZ3d; Sun, 12 Jan 2025 12:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YWDZv1sWhz4Vvj; Sun, 12 Jan 2025 12:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736683463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=soSf/cvyZ4+ChaAQAFLvITzjW07qNMkopougImP+jJ0=; b=uFVxK2Mgdni9dCFRq4Ri1tXyuZBzXOnpOu3Dh9Z/QXVyoHOqrlxXc7vMIUDDIgMrL945IU 4bSrA6JZ+rtiUYacFO8pdUfAgm+In4/e7NKqneDG4iFCvjhs2py3IBPfC4ElZUGCjv21qd QOrnWWzHzpujcUQ2cVdj5imPPxBGwJKOF1+auUSGBU1pXmQmDwaeh5aAm7Era3Qp+6pEoZ L8yUmyAxzwBYogjDmUIXiR6z/8RJWT/S0Y9x7gSl0YXCyz302yNj+H+Jvb+h1LIbtdSpNs wsWcYptUAWuuvHOMH7O7mYKWNzEY6imKkjs7AJAryGAG9qnNwyG+2YHeLouohQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736683463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=soSf/cvyZ4+ChaAQAFLvITzjW07qNMkopougImP+jJ0=; b=k75Ea3f2xmqsy4FdnEdCq/jOIC+o4q+kESoD/o4rfIPNHIWKFO+K4WC52y/zzSgviZ//kp btq48xzabZnZlM+OyjFHSvUA8kNTTQ+YNV6sZvlQPrdNiqE3Iqb2XWE+OmqQK5fL1+2sl4 jX6wghBqKULaE1VzvQQTyK0rprUczctd77FEgk5DNYPlAi5zno8k8btubqlG6Egz1tWZAX 6qWyej/+ITSC95Dy61G0n7yIPJFO29bCUmGr1AD12O+wXXzVdJv8MVbV0fjPvUyyQ0NkxH Q7lWN2+yn5+NwUy+3LBDbgmg0oPm3YsoCDRPdvo6JONFypJdPwZDE2/WEvgYUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736683463; a=rsa-sha256; cv=none; b=tBnnkKmUYgU/qN6Lm0Arpaj2/GYkt/GuS7sqCvjMsINmPkE/UksnqlYKhX9Dk5BJhZ8K5r Yr7tlsEDGgbUEzj0DErLx37MWFbX3guiZ0ncv4rd1M6LB5pB2s9FhNUBbuLHktnimcWLiO Eewc/fRidBH1qxJ5aup6yIedupvrcw9PcQelBC5+zxqRvzzDpTJ5XOwbQY0whaBuyb7YV+ 019wV7aPxB2pg6n/qraTzbGQqCt+neNyElxvLhqn4MkbmB1D2gvNHiMlFyg/9Ui/5hnq5F XO4Ud2cDqlTdmxqpBBpIDM8RxC/Qilr4NCSvS02tRuAooh70i1HMF04OSrW79A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YWDZv1KynzkFP; Sun, 12 Jan 2025 12:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50CC4Ncl008318; Sun, 12 Jan 2025 12:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50CC4Nvd008315; Sun, 12 Jan 2025 12:04:23 GMT (envelope-from git) Date: Sun, 12 Jan 2025 12:04:23 GMT Message-Id: <202501121204.50CC4Nvd008315@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 2acb6e55988b - main - emulators/wine-devel: Enable Wayland support List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2acb6e55988b6fc62015ce70132c885dc2d620a2 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=2acb6e55988b6fc62015ce70132c885dc2d620a2 commit 2acb6e55988b6fc62015ce70132c885dc2d620a2 Author: tatarataratatan@gmail.com AuthorDate: 2025-01-12 11:54:40 +0000 Commit: Gerald Pfeifer CommitDate: 2025-01-12 12:03:48 +0000 emulators/wine-devel: Enable Wayland support This is not on by default (yet). PR: 282825 Reviewed by: Thibault Payet --- emulators/wine-devel/Makefile | 19 ++++++++++++++++--- emulators/wine-devel/files/pkg-message.in | 8 ++++++++ emulators/wine-devel/pkg-plist | 2 ++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 5cf273979ec8..93e9ec36d6e9 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= wine DISTVERSION= 10.0-rc4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/10.0/ @@ -53,8 +54,7 @@ CONFIGURE_ARGS+=--verbose \ --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) @@ -72,7 +72,7 @@ PIE_UNSAFE= yes PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS V4L WINEMAKER X11 GECKO MONO +OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS V4L WINEMAKER X11 GECKO MONO WAYLAND OPTIONS_DEFAULT=ALSA GNUTLS X11 OPTIONS_RADIO= AUDIO OPTIONS_RADIO_AUDIO= ALSA OSS @@ -82,6 +82,7 @@ DOSBOX_DESC= Use DOSBox to run MS-DOS programs 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 @@ -101,6 +102,10 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls 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 @@ -128,6 +133,14 @@ 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 # Wine is composed of three parts: # - wine (aka this port on FreeBSD/i386) is the 32-bit component diff --git a/emulators/wine-devel/files/pkg-message.in b/emulators/wine-devel/files/pkg-message.in index a8632c68958b..18639d47533e 100644 --- a/emulators/wine-devel/files/pkg-message.in +++ b/emulators/wine-devel/files/pkg-message.in @@ -8,6 +8,14 @@ is KVA_PAGES=500, which should still be enough for ZFS. 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 + +To enable Wayland run the following two commands: +$ cat > wayland.reg <