Compare commits

..

No commits in common. "a4f721e8fc10bd4d69682b47a0f37aa9576d3206" and "c855a4112dd64c6f328750cc4a3ef8f16a7e347f" have entirely different histories.

4 changed files with 37 additions and 3 deletions

View File

@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e0f1d50df739a9fb8eae12a8f37ce352"
SRC_URI:append = " \
file://0001-meson.build-Dont-build-hyprland-share-picker-with-me.patch \
file://0001-ScreencopyShared.hpp-drop-define-SPA_VERSION_POD_BUI.patch \
"
require xdg-desktop-portal-hyprland.inc

View File

@ -1,3 +1,3 @@
SRC_URI = "gitsm://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1"
SRCREV = "0e2f3b9c85f7bab3983098a01366876d34daf383"
PV = "1.3.3"
SRCREV = "24be4a26f0706e456fca1b61b8c79f7486a9e86d"
PV = "1.3.2"

View File

@ -0,0 +1,33 @@
From f181899034beb4311c8e63056ce73d00df6981c8 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Sun, 30 Jun 2024 15:10:05 +0200
Subject: [PATCH] ScreencopyShared.hpp: drop #define
SPA_VERSION_POD_BUILDER_CALLBACKS
This is defined in pipewire
Fixes build with pipewire 1.2.0
| ../git/src/portals/../core/../portals/../shared/ScreencopyShared.hpp:9:43: error: expected primary-expression before '.' token
| 9 | #define SPA_VERSION_POD_BUILDER_CALLBACKS .version = 0
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
src/shared/ScreencopyShared.hpp | 4 +---
1 file changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/shared/ScreencopyShared.hpp b/src/shared/ScreencopyShared.hpp
index d626da6..e3b0a94 100644
--- a/src/shared/ScreencopyShared.hpp
+++ b/src/shared/ScreencopyShared.hpp
@@ -5,8 +5,6 @@
extern "C" {
#include <spa/pod/builder.h>
-#undef SPA_VERSION_POD_BUILDER_CALLBACKS
-#define SPA_VERSION_POD_BUILDER_CALLBACKS .version = 0
#include <spa/buffer/meta.h>
#include <spa/utils/result.h>
#include <spa/param/props.h>
--
2.45.1

View File

@ -47,7 +47,7 @@ RRECOMMENDS:${PN} ?= " \
SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main"
SRCREV = "a9d87bd6669568741704de08b6f0328a92e29396"
SRCREV = "bc86afea7e177a7ad4335737417fc0e468698dc4"
PV = "0.42-dev"
S = "${WORKDIR}/git"