diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 56b52d0e7fdd..d13ea67e3b4d 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -1,72 +1,75 @@ # $FreeBSD$ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 1.20.0-652 DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} +PORTREVISION= 1 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel PATCH_SITES= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/commit/ PATCHFILES+= 71749de24509.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/393 PATCHFILES+= 1e897704c822.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/393 PATCHFILES+= 83cda3ce3195.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/393 +PATCHFILES+= 9e0086f99b39.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/432 +PATCHFILES+= 30ea6cb622e9.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/432 MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Wayland client (development snapshot) LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ ${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \ wayland-protocols>=1.18:graphics/wayland-protocols LIB_DEPENDS= libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy \ libwayland-client.so:graphics/wayland RUN_DEPENDS= xkbcomp:x11/xkbcomp \ xkeyboard-config>0:x11/xkeyboard-config CONFLICTS_INSTALL= ${PORTNAME} USES= compiler:c11 gl meson pkgconfig xorg USE_GITLAB= yes USE_GL= gbm gl USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= xorg GL_PROJECT= xserver GL_COMMIT= 0777cf46d7260f3d0c7fe82af5c94137d1e4f3de MESON_ARGS= -Dxwayland=true \ -Dxorg=false \ -Dxnest=false \ -Dxvfb=false \ -Dudev=false \ -Dudev_kms=false \ -Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}" PLIST_FILES= bin/Xwayland # Keep in sync with xorg-server FONTPATH_ROOT?= ${LOCALBASE}/share/fonts FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/misc/ \ ${FONTPATH_ROOT}/TTF/ \ ${FONTPATH_ROOT}/OTF/ \ ${FONTPATH_ROOT}/Type1/ \ ${FONTPATH_ROOT}/100dpi/ \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} OPTIONS_DEFINE= NVIDIA NVIDIA_DESC= EGLStream support for glamor on Xwayland NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland NVIDIA_MESON_TRUE= xwayland_eglstream do-install: # Wayland compositors only use the binary ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/xwayland/Xwayland \ ${STAGEDIR}${PREFIX}/bin .include diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index b9e629c91b93..f7d8449c65cc 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -1,9 +1,13 @@ TIMESTAMP = 1589361588 SHA256 (xorg-xserver-0777cf46d7260f3d0c7fe82af5c94137d1e4f3de_GL0.tar.gz) = 5f73005cc2c0f5067f5124f1a32c6d09cbc572c00cd1e6fa428e5d1a7715bcca SIZE (xorg-xserver-0777cf46d7260f3d0c7fe82af5c94137d1e4f3de_GL0.tar.gz) = 5107892 SHA256 (71749de24509.diff) = 03735bd385487becee29ce4aea7795007da0fc08db6477018862653e4df575ac SIZE (71749de24509.diff) = 585 SHA256 (1e897704c822.diff) = 74142d8b7046ee3741e063bddc161449a26300203e497b9b421d2361bee35557 SIZE (1e897704c822.diff) = 550 SHA256 (83cda3ce3195.diff) = 93a6c9edcff5d3438fa6d9aeeb128cd5c891a158cb0c22c772217846f9404e1b SIZE (83cda3ce3195.diff) = 3340 +SHA256 (9e0086f99b39.diff) = e8de09e5ca2e44dbd35924f353f903d7e3393e872732cdf0dfa638e566b43e4d +SIZE (9e0086f99b39.diff) = 10299 +SHA256 (30ea6cb622e9.diff) = c568c39b302dea2271ffb9a711eb76154f920c17da2f90a275cf3d0535da27bf +SIZE (30ea6cb622e9.diff) = 15620 diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index 06628f7ac025..eef9244fa1db 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -1,62 +1,65 @@ # $FreeBSD$ PORTNAME= wlroots DISTVERSION= 0.10.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= f0594fb73225.patch:-p1 144d2041adfb.patch:-p1 PATCHFILES+= 2bad34e02423.patch:-p1 PATCHFILES+= 8d2e8d8a0612.patch:-p1 +PATCHFILES+= 9bd90890457d.patch:-p1 # https://github.com/swaywm/wlroots/pull/2064 +PATCHFILES+= d069ab71d43e.patch:-p1 # https://github.com/swaywm/wlroots/pull/2064 MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.17:graphics/wayland-protocols LIB_DEPENDS= libudev.so:devel/libudev-devd \ libdrm.so:graphics/libdrm \ libwayland-egl.so:graphics/wayland \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= libudev-devd>=0.4.1:devel/libudev-devd \ mesa-dri>0:graphics/mesa-dri USES= compiler:c11 gl meson pkgconfig xorg USE_GITHUB= yes USE_GL= egl gbm glesv2 USE_XORG= pixman USE_LDCONFIG= yes GH_ACCOUNT= swaywm MESON_ARGS= -Dexamples=false # XXX Drop after FreeBSD 11.3 EOL (aarch64) .if exists(/usr/lib/clang/8.0.0) # https://github.com/swaywm/wlroots/issues/1450 LLD_UNSAFE= yes .endif OPTIONS_DEFINE= CONSOLEKIT X11 OPTIONS_DEFAULT=X11 OPTIONS_SUB= yes CONSOLEKIT_DESC= DRM sessions without root using ConsoleKit2 CONSOLEKIT_PATCH_SITES= https://github.com/myfreeweb/${GH_PROJECT}/commit/:ck2 CONSOLEKIT_PATCHFILES= e8cc137111bc.patch:-p1:ck2 # see #1467 upstream CONSOLEKIT_LIB_DEPENDS= libdbus-1.so:devel/dbus \ libconsolekit.so:sysutils/consolekit2 CONSOLEKIT_MESON_ENABLED= consolekit2 .if make(makesum) .MAKEFLAGS: WITH+=CONSOLEKIT .endif X11_LIB_DEPENDS=libxcb-errors.so:x11/xcb-util-errors \ libxcb-icccm.so:x11/xcb-util-wm X11_RUN_DEPENDS=xwayland-devel>0:x11-servers/xwayland-devel X11_USE= XORG=x11,xcb X11_MESON_ENABLED=x11-backend xcb-icccm xwayland .include diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo index fe0f88d0bd15..79c8cd2ce220 100644 --- a/x11-toolkits/wlroots/distinfo +++ b/x11-toolkits/wlroots/distinfo @@ -1,13 +1,17 @@ TIMESTAMP = 1583848544 SHA256 (swaywm-wlroots-0.10.1_GH0.tar.gz) = b84baefbaff7bb04b3d2c43cbacef1a433e2cd65111f8fbf4bfc5faaa4b34b08 SIZE (swaywm-wlroots-0.10.1_GH0.tar.gz) = 455232 SHA256 (f0594fb73225.patch) = 18bf269fcd6831246604654dc1e229e8ed75a5d3dbb46c49600609e144404dc2 SIZE (f0594fb73225.patch) = 2971 SHA256 (144d2041adfb.patch) = e76603d04d24063182e05876313f1ac697a132771e32c50ae7cf1d962a866c40 SIZE (144d2041adfb.patch) = 1838 SHA256 (2bad34e02423.patch) = b37db858d0caaf205f35f14c23417ea411c3cd94fe78e6b185869c61919326c7 SIZE (2bad34e02423.patch) = 1116 SHA256 (8d2e8d8a0612.patch) = 2548770a92535b1112c2199c0ace8baf4f4b4cee66f256be23bebbc612d6058c SIZE (8d2e8d8a0612.patch) = 1502 +SHA256 (9bd90890457d.patch) = 953208a977fa5332b58ab3d145b8c293ab70b61af082a05403f7d75a1340767f +SIZE (9bd90890457d.patch) = 5125 +SHA256 (d069ab71d43e.patch) = 5aaf3959922b41797f1ca3f8537d6dd5c35920d08fc3373c693dfc6181b19379 +SIZE (d069ab71d43e.patch) = 3953 SHA256 (e8cc137111bc.patch) = e0b686193a6925eedb09298e0f300aa93d4910c41dbe788a47a2699df34cfafe SIZE (e8cc137111bc.patch) = 27737 diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index 7d14b8414bcb..6fab73517195 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -1,58 +1,62 @@ # $FreeBSD$ PORTNAME= sway DISTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= x11-wm +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090 + MAINTAINER= jbeich@FreeBSD.org COMMENT= i3-compatible Wayland compositor LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.14:graphics/wayland-protocols \ wlroots>=0.9.0<0.11.0:x11-toolkits/wlroots LIB_DEPENDS= libjson-c.so:devel/json-c \ libevdev.so:devel/libevdev \ libpcre.so:devel/pcre \ libwayland-egl.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= swaybg:x11/swaybg USES= compiler:c11 gl gnome meson pkgconfig xorg USE_GITHUB= yes USE_GL= glesv2 USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= swaywm OPTIONS_DEFINE= MANPAGES PIXBUF SUID X11 OPTIONS_DEFAULT=MANPAGES PIXBUF SUID X11 OPTIONS_SUB= yes MANPAGES_BUILD_DEPENDS= scdoc>=1.9.2:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages PIXBUF_USE= GNOME=gdkpixbuf2 PIXBUF_MESON_ENABLED= gdk-pixbuf SUID_DESC= setuid bit on "sway" binary (required for DRM session) SUID_PLIST_SUB= MAYBE_SUID="@(,,4755) " SUID_PLIST_SUB_OFF= MAYBE_SUID="" X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland post-patch: # Let @sample handle default files under etc/ @${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \ ${WRKSRC}/meson.build # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build .include diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo index 4b7866138f13..ead47adb49f3 100644 --- a/x11-wm/sway/distinfo +++ b/x11-wm/sway/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1579718009 SHA256 (swaywm-sway-1.4_GH0.tar.gz) = e2805291fc01d49e21dda4b273e38170d1fff4e1757215439729edbed880dfbe SIZE (swaywm-sway-1.4_GH0.tar.gz) = 5514489 +SHA256 (cd9d1038a822.patch) = 4183dffdf4e3dbe70302d7e6e665cc83243a7166cf9bc2b8aacd7d56a9876069 +SIZE (cd9d1038a822.patch) = 8946