diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile index 9d4c647f68c4..1d78831a441b 100644 --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -1,78 +1,79 @@ PORTNAME= xdg-desktop-portal-hyprland DISTVERSIONPREFIX= v DISTVERSION= 1.3.1 PORTREVISION= 4 CATEGORIES= x11 wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 65fb44ae4960.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/issues/190 PATCHFILES+= 9c370fd55d6e.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/pull/193 MAINTAINER= jbeich@FreeBSD.org COMMENT= xdg-desktop-portal backend for hyprland WWW= https://github.com/hyprwm/xdg-desktop-portal-hyprland LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.31:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libsdbus-c++.so:devel/sdbus-cpp \ libdrm.so:graphics/libdrm \ libwayland-client.so:graphics/wayland \ libpipewire-0.3.so:multimedia/pipewire -RUN_DEPENDS= grim:x11/grim \ +RUN_DEPENDS= xdg-desktop-portal>0:deskutils/xdg-desktop-portal \ + grim:x11/grim \ slurp:x11/slurp FLAVORS= qt6 qt5 qt5_PKGNAMESUFFIX= -qt5 qt5_CONFLICTS_INSTALL= ${PORTNAME} qt6_CONFLICTS_INSTALL= ${PORTNAME}-qt5 USES= cmake compiler:c++11-lib gl pkgconfig qt:6 USE_GITHUB= yes USE_GL= gbm USE_QT= base wayland:run GH_ACCOUNT= hyprwm GH_TUPLE= hyprwm:hyprland-protocols:v0.2:hyprland_protocols/subprojects/hyprland-protocols LDFLAGS+= -Wl,--as-needed # GL, sdbus-cpp deps PLIST_FILES= bin/hyprland-share-picker \ lib/systemd/user/${PORTNAME}.service \ libexec/${PORTNAME} \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.hyprland.service \ share/xdg-desktop-portal/portals/hyprland.portal .if ${FLAVOR:U} == qt5 USES:= ${USES:S/qt:6/qt:5/} USE_QT= qmake:build buildtools:build core gui wayland:run widgets .endif # XXX Drop after FreeBSD 14.0 EOL around 2025-03-01 .if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) CXXFLAGS+= -fexperimental-library .endif # 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,export PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm* CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}" # 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 diff --git a/x11/xdg-desktop-portal-luminous/Makefile b/x11/xdg-desktop-portal-luminous/Makefile index d6764f286072..718c71d307ae 100644 --- a/x11/xdg-desktop-portal-luminous/Makefile +++ b/x11/xdg-desktop-portal-luminous/Makefile @@ -1,41 +1,42 @@ PORTNAME= xdg-desktop-portal-luminous DISTVERSIONPREFIX= v DISTVERSION= 0.1.4 PORTREVISION= 4 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= xdg-desktop-portal backend for wlroots WWW= https://github.com/waycrate/xdg-desktop-portal-luminous LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire \ libxkbcommon.so:x11/libxkbcommon -RUN_DEPENDS= slurp:x11/slurp +RUN_DEPENDS= xdg-desktop-portal>0:deskutils/xdg-desktop-portal \ + slurp:x11/slurp USES= cargo llvm meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= waycrate MAKE_ENV= ${CARGO_ENV} CARGO_BUILD= no CARGO_INSTALL= no CARGO_TEST= no PLIST_FILES= lib/systemd/user/${PORTNAME}.service \ libexec/${PORTNAME} \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.luminous.service \ share/xdg-desktop-portal/portals/luminous.portal post-patch: @${REINPLACE_CMD} -e 's,"llvm-config,"${LLVM_CONFIG},' \ ${WRKSRC_crate_clang-sys}/build/common.rs \ ${WRKSRC_crate_clang-sys}/src/support.rs # Make each cargo subcommand very verbose # Add explicit subdir for --target from USES=cargo # Adjust for CARGO_TARGET_DIR outside of meson.global_source_root() @${REINPLACE_CMD} -e "/cargo.*build/s/$$/ '--verbose', '--verbose',/" \ -e "/cp/s,'target','..' / & / '${CARGO_BUILD_TARGET}'," \ ${WRKSRC}/meson.build .include diff --git a/x11/xdg-desktop-portal-wlr/Makefile b/x11/xdg-desktop-portal-wlr/Makefile index 2b64a969a484..b3ac2ba4517b 100644 --- a/x11/xdg-desktop-portal-wlr/Makefile +++ b/x11/xdg-desktop-portal-wlr/Makefile @@ -1,48 +1,49 @@ PORTNAME= xdg-desktop-portal-wlr DISTVERSIONPREFIX= v DISTVERSION= 0.7.1 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= xdg-desktop-portal backend for wlroots WWW= https://github.com/emersion/xdg-desktop-portal-wlr LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.24:graphics/wayland-protocols LIB_DEPENDS= libbasu.so:devel/basu \ libinih.so:devel/inih \ libdrm.so:graphics/libdrm \ libwayland-client.so:graphics/wayland \ libpipewire-0.3.so:multimedia/pipewire -RUN_DEPENDS= grim:x11/grim \ +RUN_DEPENDS= xdg-desktop-portal>0:deskutils/xdg-desktop-portal \ + grim:x11/grim \ slurp:x11/slurp USES= compiler:c11 gl meson pkgconfig USE_GITHUB= yes USE_GL= gbm GH_ACCOUNT= emersion MESON_ARGS= -Dsd-bus-provider=basu -Dsystemd=disabled PLIST_FILES= libexec/${PORTNAME} \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.wlr.service \ share/xdg-desktop-portal/portals/wlr.portal # XXX Drop after FreeBSD 13.4 EOL around 2026-01-31 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 .if !exists(/usr/include/sys/timerfd.h) LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim .endif OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT=MANPAGES MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages MANPAGES_PLIST_FILES= share/man/man5/${PORTNAME}.5.gz post-patch: @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ ${WRKSRC}/${PORTNAME}.5.scd .include