Core: move to hyprgraphics (#570)

* core: move to hyprgraphics * Nix: add hyprgraphics --------- Co-authored-by: Mihai Fufezan <mihai@fufexan.net>
hyprwm · Nov 28, 2024 · 4667f72 · 4667f72
1 parent 578246b
commit 4667f72
Show file tree

Hide file tree

Showing 14 changed files with 82 additions and 254 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,7 +57,8 @@ pkg_check_modules(
   libdrm
   gbm
   hyprutils>=0.2.3
-  sdbus-c++>=2.0.0)
+  sdbus-c++>=2.0.0
+  hyprgraphics)
 
 file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
 add_executable(hyprlock ${SRCFILES})

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ yay -S hyprlock-git # compiles from latest source
 ## Building
 
 ### Deps
-You also need the following dependencies
+You need the following dependencies
 - wayland-client
 - wayland-protocols
 - mesa
@@ -37,6 +37,7 @@ And the development libraries for the following
 - pam
 - hyprlang
 - hyprutils
+- hyprgraphics
 - libmagic (file-devel on Fedora)
 
 Development libraries are usually suffixed with `-devel` or `-dev` in most distro repos.

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,6 +5,13 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     systems.url = "github:nix-systems/default-linux";
 
+    hyprgraphics = {
+      url = "github:hyprwm/hyprgraphics";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+      inputs.hyprutils.follows = "hyprutils";
+    };
+
     hyprutils = {
       url = "github:hyprwm/hyprutils";
       inputs.nixpkgs.follows = "nixpkgs";

diff --git a/nix/default.nix b/nix/default.nix
@@ -11,6 +11,7 @@
   libwebp,
   libxkbcommon,
   mesa,
+  hyprgraphics,
   hyprlang,
   hyprutils,
   pam,
@@ -43,6 +44,7 @@ stdenv.mkDerivation {
     libwebp
     libxkbcommon
     mesa
+    hyprgraphics
     hyprlang
     hyprutils
     pam

diff --git a/nix/overlays.nix b/nix/overlays.nix
@@ -13,6 +13,7 @@ in {
   default = inputs.self.overlays.hyprlock;
 
   hyprlock = lib.composeManyExtensions [
+    inputs.hyprgraphics.overlays.default
     inputs.hyprlang.overlays.default
     inputs.hyprutils.overlays.default
     inputs.self.overlays.sdbuscpp

diff --git a/src/defines.hpp b/src/defines.hpp
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <hyprutils/memory/WeakPtr.hpp>
+using namespace Hyprutils::Memory;
+#define SP CSharedPointer
+#define WP CWeakPointer
diff --git a/src/helpers/Jpeg.cpp b/src/helpers/Jpeg.cpp
diff --git a/src/helpers/Jpeg.hpp b/src/helpers/Jpeg.hpp
diff --git a/src/helpers/Webp.cpp b/src/helpers/Webp.cpp
diff --git a/src/helpers/Webp.hpp b/src/helpers/Webp.hpp