diff --git a/dynamic-layers/meta-qt6/recipes-qt/hyprland-share-picker/hyprland-share-picker.bb b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/hyprland-share-picker.bb similarity index 63% rename from dynamic-layers/meta-qt6/recipes-qt/hyprland-share-picker/hyprland-share-picker.bb rename to dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/hyprland-share-picker.bb index 44049b4..b358ce6 100644 --- a/dynamic-layers/meta-qt6/recipes-qt/hyprland-share-picker/hyprland-share-picker.bb +++ b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/hyprland-share-picker.bb @@ -1,19 +1,19 @@ SUMMARY = "Share picker for hyprlands screenshot/screencast xdg-desktop-portal backend" HOMEPAGE = "https://github.com/hyprwm/xdg-desktop-portal-hyprland" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=e0f1d50df739a9fb8eae12a8f37ce352" # Note: meta-qt6 is needed DEPENDS = "qtbase" RDEPENDS:${PN} = "qtwayland" RRECOMMENDS:${PN} = "qgnomeplatform" +require xdg-desktop-portal-hyprland.inc + inherit qt6-cmake features_check REQUIRED_DISTRO_FEATURES = "opengl wayland" -SRC_URI = "git://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1" - S = "${WORKDIR}/git/hyprland-share-picker" -SRCREV = "198d019583e332653d4e8dcca9439817b39b6a20" -PV = "0.2.1" + + diff --git a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb index 0144be3..d1f728f 100644 --- a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb +++ b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb @@ -1,7 +1,9 @@ SUMMARY = "This provides screenshot/screencast xdg-desktop-portal backends for hyprland." HOMEPAGE = "https://github.com/hyprwm/xdg-desktop-portal-hyprland" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e0f1d50df739a9fb8eae12a8f37ce352" + +require xdg-desktop-portal-hyprland.inc # Note: meta-qt6 is needed DEPENDS = " \ @@ -9,9 +11,8 @@ DEPENDS = " \ wayland-native \ wayland-protocols \ libdrm \ - libinih \ - util-linux \ pipewire \ + sdbus-c++ \ virtual/libgbm \ " @@ -21,15 +22,9 @@ RCONFLICTS:${PN} = "xdg-desktop-portal-wlr xdg-desktop-portal-gnome" inherit meson pkgconfig features_check REQUIRED_DISTRO_FEATURES = "opengl wayland" -SRC_URI = "gitsm://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1" - S = "${WORKDIR}/git" -SRCREV = "42747d267ab4345c4ceb78cd4a4fe99f072d80fc" -PV = "0.5.0" -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'basu', d)}" - -PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsd-bus-provider=libsystemd,-Dsystemd=disabled,systemd" -PACKAGECONFIG[basu] = "-Dsd-bus-provider=basu,,basu" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" FILES:${PN} += "${systemd_user_unitdir} ${datadir}" diff --git a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.inc b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.inc new file mode 100644 index 0000000..08798b0 --- /dev/null +++ b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.inc @@ -0,0 +1,3 @@ +SRC_URI = "gitsm://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1" +SRCREV = "676571b2c042da64cf7625865e11bcdd560abfbf" +PV = "1.0.0"