diff --git a/x11/hyprland-share-picker/Makefile b/x11/hyprland-share-picker/Makefile index a03f7fdee75d..7e5a7df28670 100644 --- a/x11/hyprland-share-picker/Makefile +++ b/x11/hyprland-share-picker/Makefile @@ -1,35 +1,35 @@ PORTNAME= hyprland-share-picker DISTVERSIONPREFIX= v -DISTVERSION= 1.2.4 +DISTVERSION= 1.2.5 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Share picker for xdg-desktop-portal-hyprland WWW= https://github.com/hyprwm/xdg-desktop-portal-hyprland LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC:H}/LICENSE RUN_DEPENDS= slurp:x11/slurp FLAVORS= qt5 qt6 USES= compiler:c++11-lib cmake qt:5 USE_GITHUB= yes USE_QT= qmake:build buildtools:build core gui wayland:run widgets GH_ACCOUNT= hyprwm GH_PROJECT= xdg-desktop-portal-hyprland WRKSRC_SUBDIR= ${PORTNAME} LDFLAGS+= -Wl,--as-needed # GL PLIST_FILES= bin/${PORTNAME} .if ${FLAVOR:U} == qt6 PKGNAMESUFFIX= -${FLAVOR} USES:= ${USES:S/qt:5/qt:6/} USE_QT= base wayland:run CONFLICTS_INSTALL= ${PORTNAME} .else CONFLICTS_INSTALL= ${PORTNAME}-qt6 .endif .include diff --git a/x11/hyprland-share-picker/distinfo b/x11/hyprland-share-picker/distinfo index 310edce25a1c..0d26bf23e367 100644 --- a/x11/hyprland-share-picker/distinfo +++ b/x11/hyprland-share-picker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699048835 -SHA256 (hyprwm-xdg-desktop-portal-hyprland-v1.2.4_GH0.tar.gz) = dfb1026f9355e78dad8b01e8637b569dc3ae5d5d570e1ac47f016b695ce98f9f -SIZE (hyprwm-xdg-desktop-portal-hyprland-v1.2.4_GH0.tar.gz) = 43277 +TIMESTAMP = 1700508250 +SHA256 (hyprwm-xdg-desktop-portal-hyprland-v1.2.5_GH0.tar.gz) = c8ba3d173a580d8b4ec9a5ee15e7780d266e536a78a12aa28d8234e0854ae86d +SIZE (hyprwm-xdg-desktop-portal-hyprland-v1.2.5_GH0.tar.gz) = 45688 diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile index 7f11c0a7d5c1..9ba45b3c4b99 100644 --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -1,77 +1,79 @@ PORTNAME= xdg-desktop-portal-hyprland DISTVERSIONPREFIX= v -DISTVERSION= 1.2.4 +DISTVERSION= 1.2.5 CATEGORIES= x11 wayland 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 BROKEN_FreeBSD_12= libc++ too old BUILD_DEPENDS= wayland-protocols>=1.31:graphics/wayland-protocols LIB_DEPENDS= libsdbus-c++.so:devel/sdbus-cpp \ libdrm.so:graphics/libdrm \ libwayland-client.so:graphics/wayland \ libpipewire-0.3.so:multimedia/pipewire -RUN_DEPENDS= hyprland-share-picker:x11/hyprland-share-picker@${FLAVOR} +RUN_DEPENDS= grim:x11/grim \ + hyprland-share-picker:x11/hyprland-share-picker@${FLAVOR} \ + slurp:x11/slurp FLAVORS= qt5 qt6 qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 qt6_CONFLICTS_INSTALL= ${PORTNAME} qt6_PKGNAMESUFFIX= -qt6 USES= compiler:c++11-lib gl meson pkgconfig USE_GITHUB= yes USE_GL= gbm GH_ACCOUNT= hyprwm GH_TUPLE= hyprwm:hyprland-protocols:v0.2:hyprland_protocols/subprojects/hyprland-protocols MESON_ARGS= -Dsystemd=disabled PLIST_FILES= libexec/${PORTNAME} \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.hyprland.service \ share/xdg-desktop-portal/portals/hyprland.portal # 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 post-patch: # XXX Merge with hyprland-share-picker instead @${REINPLACE_CMD} '/hyprland-share-picker/d' ${WRKSRC}/meson.build .ifdef GH_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .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) BUILD_DEPENDS+= ${CMAKE_BIN}:devel/cmake-core 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}" 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 diff --git a/x11/xdg-desktop-portal-hyprland/distinfo b/x11/xdg-desktop-portal-hyprland/distinfo index 5c661a27ccac..c00d1b53908a 100644 --- a/x11/xdg-desktop-portal-hyprland/distinfo +++ b/x11/xdg-desktop-portal-hyprland/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1699048835 -SHA256 (hyprwm-xdg-desktop-portal-hyprland-v1.2.4_GH0.tar.gz) = dfb1026f9355e78dad8b01e8637b569dc3ae5d5d570e1ac47f016b695ce98f9f -SIZE (hyprwm-xdg-desktop-portal-hyprland-v1.2.4_GH0.tar.gz) = 43277 +TIMESTAMP = 1700508250 +SHA256 (hyprwm-xdg-desktop-portal-hyprland-v1.2.5_GH0.tar.gz) = c8ba3d173a580d8b4ec9a5ee15e7780d266e536a78a12aa28d8234e0854ae86d +SIZE (hyprwm-xdg-desktop-portal-hyprland-v1.2.5_GH0.tar.gz) = 45688 SHA256 (hyprwm-hyprland-protocols-v0.2_GH0.tar.gz) = 106cb189d0fbe4ec0ee11a12a17238172f4c4cd1b2b26db904df144e5c7a05f0 SIZE (hyprwm-hyprland-protocols-v0.2_GH0.tar.gz) = 6342 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803