diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile index e8d0a582d793..9bd738ab5e8a 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -1,85 +1,85 @@ PORTNAME= wlroots -DISTVERSION= 0.16.0-677 -DISTVERSIONSUFFIX= -gd40bcfe2c1 +DISTVERSION= 0.16.0-681 +DISTVERSIONSUFFIX= -gc74f89d4f8 CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github PATCHFILES+= 10f80a8f1bb2.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 PATCHFILES+= 3196c73d487f.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library (development snapshot) WWW= https://gitlab.freedesktop.org/wlroots/wlroots LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.32:graphics/wayland-protocols LIB_DEPENDS= libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gl meson pkgconfig xorg USE_GITLAB= yes USE_GL= gbm USE_XORG= pixman USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} .ifdef PKGNAMESUFFIX PORTSCOUT= ignore:1 PREFIX= ${LOCALBASE}/${PKGBASE} # avoid conflict with the default MESON_ARGS+= -Ddatadir="${LOCALBASE}/share" .endif OPTIONS_DEFINE= DRM OPENGL VULKAN X11 OPTIONS_DEFAULT=DRM OPENGL VULKAN X11 OPTIONS_SUB= yes DRM_DESC= KMS console support DRM_BUILD_DEPENDS= hwdata>0:misc/hwdata DRM_LIB_DEPENDS= libudev.so:devel/libudev-devd \ libliftoff.so:graphics/libliftoff \ libdisplay-info.so:sysutils/libdisplay-info \ libseat.so:sysutils/seatd \ libinput.so:x11/libinput DRM_MESON_ENABLED= session DRM_VARS= BACKENDS+="drm libinput" OPENGL_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri OPENGL_USE= GL=egl,glesv2 OPENGL_VARS= RENDERERS+=gles2 VULKAN_DESC= Vulkan renderer VULKAN_BUILD_DEPENDS= glslangValidator:graphics/glslang \ vulkan-headers>0:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri VULKAN_VARS= RENDERERS+=vulkan X11_LIB_DEPENDS= libxcb-errors.so:x11/xcb-util-errors \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-icccm.so:x11/xcb-util-wm X11_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ xwayland-devel>0:x11-servers/xwayland-devel X11_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland X11_VARS= BACKENDS+=x11 post-patch: # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} "/STR/s/meson.project_version()/'${DISTVERSIONFULL}'/" \ ${WRKSRC}/include/wlr/meson.build # XXX Drop after FreeBSD 12.4 EOL around 2023-12-31 # https://cgit.freebsd.org/src/commit/?id=d7535fb3e3cb @if [ ${OPSYS} = FreeBSD -a ${OSVERSION} -lt 1300515 ]; then \ ${REINPLACE_CMD} -e '/POSIX/s/199309/200112/' \ ${WRKSRC}/render/gles2/pass.c \ ${WRKSRC}/render/gles2/renderer.c; \ fi .include diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo index 2110441f8b32..48633601e3c9 100644 --- a/x11-toolkits/wlroots-devel/distinfo +++ b/x11-toolkits/wlroots-devel/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1690546897 -SHA256 (wlroots-0.16.0-677-gd40bcfe2c1.tar.bz2) = 1b4207e329d0f2b5ab6ec441029572c1748ca6305509445059f33144a0579320 -SIZE (wlroots-0.16.0-677-gd40bcfe2c1.tar.bz2) = 475552 +TIMESTAMP = 1691073628 +SHA256 (wlroots-0.16.0-681-gc74f89d4f8.tar.bz2) = 1646610e3ff533a4110d9f9297d45975c3820aa026229ed5bc5b01073ca35a6d +SIZE (wlroots-0.16.0-681-gc74f89d4f8.tar.bz2) = 476133 SHA256 (10f80a8f1bb2.patch) = ca65f8eecf32e7364d5ba43cd9ee91060710a6fb8392892c86ad71e4f2a4c0b5 SIZE (10f80a8f1bb2.patch) = 6097 SHA256 (3196c73d487f.patch) = 69c6bc4658852bb45a24b129f625a7faaed8035dab0d79c388ae74d650beacdc SIZE (3196c73d487f.patch) = 4243 diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 104c75d5db1b..2dd84563684a 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,104 +1,113 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v DISTVERSION= 0.27.2 PORTREVISION= 5 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 9fc5f4c48b20.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/2690 PATCHFILES+= f6b340cc19d2.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/2799 PATCHFILES+= f5913135c638.patch:-p1 # cursor-shape-v1 PATCHFILES+= 7a2027d1fd5d.patch:-p1 # https://github.com/hyprwm/Hyprland/issues/2828 +PATCHFILES+= 7d98181ade0a.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/2884 MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #' WWW= https://hyprland.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.25:graphics/wayland-protocols \ wlroots>=0.16.0.668<0.17.0:x11-toolkits/wlroots LIB_DEPENDS= libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c++11-lib gl gnome meson pkgconfig xorg USE_GITHUB= yes USE_GL= egl opengl USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= hyprwm GH_PROJECT= Hyprland GH_TUPLE= hyprwm:hyprland-protocols:4d29e48:hyprland_protocols/subprojects/hyprland-protocols \ canihavesomecoffee:udis86:1.7.2-186-g5336633:udis86/subprojects/udis86 MESON_ARGS= -Dsystemd=disabled OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland +post-extract: +.if defined(PATCHFILES) && ${PATCHFILES:M7d98181ade0a*} +# Pretend to be a regular file for vendor patch to apply as is + @${RMDIR} ${WRKSRC}/subprojects/wlroots + @${ECHO_CMD} "Subproject commit e8d545a9770a2473db32e0a0bfa757b05d2af4f3" \ + >${WRKSRC}/subprojects/wlroots +.endif + post-patch: # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e "/GIT_BRANCH/s/run_command.*/'main'/" \ -e "/GIT_COMMIT_HASH/s/run_command.*/'${DISTVERSIONFULL}'/" \ -e "/GIT_COMMIT_MESSAGE/d" \ -e "/GIT_DIRTY/s/run_command.*/'portbld'/" \ -e "/version.*jq/s/run_command.*/'${DISTVERSIONFULL}',/" \ ${WRKSRC}/meson.build # Respect PREFIX for wallpapers @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/src/render/OpenGL.cpp # Respect LOCALBASE for xdg-desktop-portal-hyprland installation @${REINPLACE_CMD} 's,/usr/share,${LOCALBASE}/share,g' \ ${WRKSRC}/src/Compositor.cpp .ifdef GH_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .endif post-install: # Plugin API installs all headers (no private vs. public) @(cd ${STAGEDIR}${PREFIX} && ${FIND} include/${PORTNAME} ! -type d) >>${TMPPLIST} # XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo) .if ${CXX} == c++ && exists(/usr/lib/libc++.so) .if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch) USES+= llvm:min=16,build PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm* CC= clang${LLVM_VERSION} CXX= clang++${LLVM_VERSION} CPP= clang-cpp${LLVM_VERSION} CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}" CMAKE_BIN= ${LOCALBASE}/bin/cmake # XXX Move into separate port and standardize via USES GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 # Don't link against new libc++ as it's not necessary #LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt pre-configure: bundled-libcxx bundled-libcxx: @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build .endif .endif # exists(/usr/lib/libc++.so) .include "${.CURDIR:H:H}/x11-toolkits/wlroots-devel/override.mk" post-patch: wlroots-devel-patch wlroots-devel-patch: # Prefer headers (used by ) from wlroots-devel @${REINPLACE_CMD} -i .devel "/subdirs/s|''|'../wlroots-devel/include', &|" \ ${WRKSRC}/meson.build .include diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index 13f464ef5327..c147d27e7154 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -1,17 +1,19 @@ TIMESTAMP = 1689766295 SHA256 (hyprwm-Hyprland-v0.27.2_GH0.tar.gz) = 709aaea35c889b34b6620a01fde295f751a7385ccbe4f89d562f77369b0b2a2f SIZE (hyprwm-Hyprland-v0.27.2_GH0.tar.gz) = 4233148 SHA256 (hyprwm-hyprland-protocols-4d29e48_GH0.tar.gz) = 1384ccdbb0149cdc40d74fbe21fba97d706db08b718c7df9481076381d852c74 SIZE (hyprwm-hyprland-protocols-4d29e48_GH0.tar.gz) = 6340 SHA256 (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 69aff959179ff6247b375b92e797221dbd8e078eabbf1366280b0532617e7fb8 SIZE (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 116938 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 SHA256 (9fc5f4c48b20.patch) = f8125b6acb6c36082cb42b745b4726b5d73b15ebd27b8ac5136f287fbe196f09 SIZE (9fc5f4c48b20.patch) = 2721 SHA256 (f6b340cc19d2.patch) = 08148878a527d544bc2abef7050bb453ae7f335290bc766f473ee2fd83e711e8 SIZE (f6b340cc19d2.patch) = 1737 SHA256 (f5913135c638.patch) = 5ce790d91b4918f77dfa67cf3f42a129a1dbef20f8906facb8a40efae2f3748c SIZE (f5913135c638.patch) = 9018 SHA256 (7a2027d1fd5d.patch) = dcf2e5b2233077c3b35dd1191ea672104e0f7632a6310a8c4661933444d13819 SIZE (7a2027d1fd5d.patch) = 1916 +SHA256 (7d98181ade0a.patch) = d94c45c2abeb4d3b96c058e31d2c2090cdaf934a6f289846e9c4050c54b25c23 +SIZE (7d98181ade0a.patch) = 1195