mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2025-09-07 11:44:51 +00:00
meson: 2024-08-27
This commit is contained in:
sewn
parent
8ee19b4f1d
commit
e5d935fd72
@ -10,7 +10,7 @@ meson setup -Dwlroots:xwayland=enabled build
|
||||
|
||||
### Download
|
||||
- [git branch](/sewn/dwl/src/branch/meson)
|
||||
- [2024-08-06](/dwl/dwl-patches/raw/branch/main/patches/meson/meson.patch)
|
||||
- [2024-08-27](/dwl/dwl-patches/raw/branch/main/patches/meson/meson.patch)
|
||||
|
||||
### Authors
|
||||
- [sewn](/sewn)
|
||||
|
||||
@ -1,124 +1,35 @@
|
||||
From 69b0ce2a2e45bb3e55347125fcd5b640cb7834f3 Mon Sep 17 00:00:00 2001
|
||||
From 4432b56f57face8516a93f4aa14e78db11a3ff85 Mon Sep 17 00:00:00 2001
|
||||
From: sewn <sewn@disroot.org>
|
||||
Date: Tue, 6 Aug 2024 00:37:43 +0300
|
||||
Subject: [PATCH] add meson
|
||||
|
||||
---
|
||||
.gitignore | 5 +--
|
||||
Makefile | 78 ----------------------------------
|
||||
.gitignore | 1 +
|
||||
meson.build | 91 ++++++++++++++++++++++++++++++++++++++++
|
||||
subprojects/wlroots.wrap | 5 +++
|
||||
4 files changed, 97 insertions(+), 82 deletions(-)
|
||||
delete mode 100644 Makefile
|
||||
3 files changed, 97 insertions(+)
|
||||
create mode 100644 meson.build
|
||||
create mode 100644 subprojects/wlroots.wrap
|
||||
|
||||
diff --git a/.gitignore b/.gitignore
|
||||
index 0dde90e..861ff45 100644
|
||||
index 0dde90e..9246a31 100644
|
||||
--- a/.gitignore
|
||||
+++ b/.gitignore
|
||||
@@ -1,6 +1,3 @@
|
||||
-dwl
|
||||
-*.o
|
||||
-*-protocol.c
|
||||
-*-protocol.h
|
||||
@@ -4,3 +4,4 @@ dwl
|
||||
*-protocol.h
|
||||
.ccls-cache
|
||||
config.h
|
||||
+subprojects/wlroots
|
||||
diff --git a/Makefile b/Makefile
|
||||
deleted file mode 100644
|
||||
index f955e7b..0000000
|
||||
--- a/Makefile
|
||||
+++ /dev/null
|
||||
@@ -1,78 +0,0 @@
|
||||
-.POSIX:
|
||||
-.SUFFIXES:
|
||||
-
|
||||
-include config.mk
|
||||
-
|
||||
-# flags for compiling
|
||||
-DWLCPPFLAGS = -I. -DWLR_USE_UNSTABLE -D_POSIX_C_SOURCE=200809L \
|
||||
- -DVERSION=\"$(VERSION)\" $(XWAYLAND)
|
||||
-DWLDEVCFLAGS = -g -pedantic -Wall -Wextra -Wdeclaration-after-statement \
|
||||
- -Wno-unused-parameter -Wshadow -Wunused-macros -Werror=strict-prototypes \
|
||||
- -Werror=implicit -Werror=return-type -Werror=incompatible-pointer-types \
|
||||
- -Wfloat-conversion
|
||||
-
|
||||
-# CFLAGS / LDFLAGS
|
||||
-PKGS = wlroots-0.19 wayland-server xkbcommon libinput $(XLIBS)
|
||||
-DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
|
||||
-LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` -lm $(LIBS)
|
||||
-
|
||||
-all: dwl
|
||||
-dwl: dwl.o util.o
|
||||
- $(CC) dwl.o util.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@
|
||||
-dwl.o: dwl.c client.h config.h config.mk cursor-shape-v1-protocol.h \
|
||||
- pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h \
|
||||
- wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h
|
||||
-util.o: util.c util.h
|
||||
-
|
||||
-# wayland-scanner is a tool which generates C headers and rigging for Wayland
|
||||
-# protocols, which are specified in XML. wlroots requires you to rig these up
|
||||
-# to your build system yourself and provide them in the include path.
|
||||
-WAYLAND_SCANNER = `$(PKG_CONFIG) --variable=wayland_scanner wayland-scanner`
|
||||
-WAYLAND_PROTOCOLS = `$(PKG_CONFIG) --variable=pkgdatadir wayland-protocols`
|
||||
-
|
||||
-cursor-shape-v1-protocol.h:
|
||||
- $(WAYLAND_SCANNER) enum-header \
|
||||
- $(WAYLAND_PROTOCOLS)/staging/cursor-shape/cursor-shape-v1.xml $@
|
||||
-pointer-constraints-unstable-v1-protocol.h:
|
||||
- $(WAYLAND_SCANNER) enum-header \
|
||||
- $(WAYLAND_PROTOCOLS)/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml $@
|
||||
-wlr-layer-shell-unstable-v1-protocol.h:
|
||||
- $(WAYLAND_SCANNER) enum-header \
|
||||
- protocols/wlr-layer-shell-unstable-v1.xml $@
|
||||
-wlr-output-power-management-unstable-v1-protocol.h:
|
||||
- $(WAYLAND_SCANNER) server-header \
|
||||
- protocols/wlr-output-power-management-unstable-v1.xml $@
|
||||
-xdg-shell-protocol.h:
|
||||
- $(WAYLAND_SCANNER) server-header \
|
||||
- $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
|
||||
-
|
||||
-config.h:
|
||||
- cp config.def.h $@
|
||||
-clean:
|
||||
- rm -f dwl *.o *-protocol.h
|
||||
-
|
||||
-dist: clean
|
||||
- mkdir -p dwl-$(VERSION)
|
||||
- cp -R LICENSE* Makefile CHANGELOG.md README.md client.h config.def.h \
|
||||
- config.mk protocols dwl.1 dwl.c util.c util.h dwl.desktop \
|
||||
- dwl-$(VERSION)
|
||||
- tar -caf dwl-$(VERSION).tar.gz dwl-$(VERSION)
|
||||
- rm -rf dwl-$(VERSION)
|
||||
-
|
||||
-install: dwl
|
||||
- mkdir -p $(DESTDIR)$(PREFIX)/bin
|
||||
- cp -f dwl $(DESTDIR)$(PREFIX)/bin
|
||||
- chmod 755 $(DESTDIR)$(PREFIX)/bin/dwl
|
||||
- mkdir -p $(DESTDIR)$(MANDIR)/man1
|
||||
- cp -f dwl.1 $(DESTDIR)$(MANDIR)/man1
|
||||
- chmod 644 $(DESTDIR)$(MANDIR)/man1/dwl.1
|
||||
- mkdir -p $(DESTDIR)$(DATADIR)/wayland-sessions
|
||||
- cp -f dwl.desktop $(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop
|
||||
- chmod 644 $(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop
|
||||
-uninstall:
|
||||
- rm -f $(DESTDIR)$(PREFIX)/bin/dwl $(DESTDIR)$(MANDIR)/man1/dwl.1 \
|
||||
- $(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop
|
||||
-
|
||||
-.SUFFIXES: .c .o
|
||||
-.c.o:
|
||||
- $(CC) $(CPPFLAGS) $(DWLCFLAGS) -o $@ -c $<
|
||||
diff --git a/meson.build b/meson.build
|
||||
new file mode 100644
|
||||
index 0000000..d533eea
|
||||
index 0000000..fb8d4ac
|
||||
--- /dev/null
|
||||
+++ b/meson.build
|
||||
@@ -0,0 +1,91 @@
|
||||
+project(
|
||||
+ 'dwl',
|
||||
+ 'c',
|
||||
+ version: run_command('git', 'describe', '--tags', '--dirty').stdout().strip(),
|
||||
+ version: run_command('git', 'describe', '--tags', '--dirty', check: false).stdout().strip(),
|
||||
+ license: [ 'GPL-3.0-only', 'CC0-1.0', 'MIT' ],
|
||||
+ meson_version: '>=1.3',
|
||||
+ default_options: [
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user