From 5af7ab93f268c09bc1184da200a08d2e1cb74bde Mon Sep 17 00:00:00 2001
From: David McKinney <mckinney@subgraph.com>
Date: Fri, 10 Jul 2020 12:18:34 -0400
Subject: [PATCH] Upgraded sway to 1.4, added wdisplays and swaybg recipes

---
 .../packagegroups/packagegroup-sway.bb        |  3 ++-
 meta-citadel/recipes-sway/sway/sway_git.bb    |  4 ++--
 .../recipes-sway/swaybg/swaybg_git.bb         | 19 ++++++++++++++++
 .../recipes-sway/wdisplays/wdisplays_git.bb   | 22 +++++++++++++++++++
 .../recipes-sway/wlroots/wlroots_0.10.1.bb    | 15 +++++++++++++
 5 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 meta-citadel/recipes-sway/swaybg/swaybg_git.bb
 create mode 100644 meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb
 create mode 100644 meta-citadel/recipes-sway/wlroots/wlroots_0.10.1.bb

diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb
index 3ff43f9..175c06c 100644
--- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb
+++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb
@@ -2,14 +2,15 @@
 inherit packagegroup
 
 RDEPENDS_${PN} = "\
-    sgstatus \
     wlroots \
     sway \
     xcb-util-xrm \
     sgflow \
+    swaybg \
     swaylock \
     grim \
     slurp \
+    wdisplays \
     polkit-gnome \
 "
 
diff --git a/meta-citadel/recipes-sway/sway/sway_git.bb b/meta-citadel/recipes-sway/sway/sway_git.bb
index 5b888b9..ee1bb71 100644
--- a/meta-citadel/recipes-sway/sway/sway_git.bb
+++ b/meta-citadel/recipes-sway/sway/sway_git.bb
@@ -1,9 +1,9 @@
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=dfc67e5b1fa10ebb4b70eb0c0ca67bea"
 
-SRCREV = "bcde298a719f60b9913133dbd2a169dedbc8dd7d"
+SRCREV = "ab77efc6caba50acc4c87e02ae3e6712ea808772"
 
-PV = "1.0+git${SRCPV}"
+PV = "1.4+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/swaywm/sway;protocol=https \
diff --git a/meta-citadel/recipes-sway/swaybg/swaybg_git.bb b/meta-citadel/recipes-sway/swaybg/swaybg_git.bb
new file mode 100644
index 0000000..13c416e
--- /dev/null
+++ b/meta-citadel/recipes-sway/swaybg/swaybg_git.bb
@@ -0,0 +1,19 @@
+
+inherit meson pkgconfig
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b53d9ec16b9125995437ac9efab1b450"
+
+SRC_URI = "git://github.com/swaywm/swaybg;protocol=https"
+PV = "1.0+git${SRCPV}"
+PR = "r0"
+
+UPSTREAM_CHECK_COMMITS = "1"
+
+SRCREV = "a8f109af90353369e7e2e689efe8ce06eb9c60ac"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "wayland wayland-native wayland-protocols cairo"
+
+
diff --git a/meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb b/meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb
new file mode 100644
index 0000000..0918a96
--- /dev/null
+++ b/meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb
@@ -0,0 +1,22 @@
+
+inherit meson pkgconfig
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
+                    file://LICENSES/GPL-3.0-or-later.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+                    file://LICENSES/CC0-1.0.txt;md5=6fd064768b8d61c31ddd0540570fbd33 \
+                    file://LICENSES/CC-BY-SA-4.0.txt;md5=4b39cb11ffa11c92d3f7a3431390e0d9"
+
+SRC_URI = "git://github.com/cyclopsian/wdisplays;protocol=https"
+PV = "1.0+git${SRCPV}"
+PR = "r0"
+
+UPSTREAM_CHECK_COMMITS = "1"
+
+SRCREV = "dd7e1e22ee04cf37ecc8b48cdb0c103de18e8761"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "wayland wayland-native wayland-protocols glib-2.0-native gtk+3 libepoxy"
+
+FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/wdisplays.svg"
diff --git a/meta-citadel/recipes-sway/wlroots/wlroots_0.10.1.bb b/meta-citadel/recipes-sway/wlroots/wlroots_0.10.1.bb
new file mode 100644
index 0000000..08c7d7f
--- /dev/null
+++ b/meta-citadel/recipes-sway/wlroots/wlroots_0.10.1.bb
@@ -0,0 +1,15 @@
+
+inherit meson pkgconfig
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818"
+
+SRC_URI = "https://github.com/swaywm/wlroots/archive/${PV}.tar.gz \
+           "
+
+SRC_URI[md5sum] = "3d9736cfbfaf6661d36b6c788ac2c199"
+SRC_URI[sha256sum] = "b84baefbaff7bb04b3d2c43cbacef1a433e2cd65111f8fbf4bfc5faaa4b34b08"
+
+DEPENDS = "libx11 libdrm dbus libxcb xcb-util-wm xcb-util-image virtual/egl mesa wayland wayland-native libxkbcommon libinput systemd pixman"
+
+