diff --git a/recipes-wlroots/wlroots/wlroots-0.16.bb b/recipes-wlroots/wlroots/wlroots-0.16.bb index 9493d93..c187f0a 100644 --- a/recipes-wlroots/wlroots/wlroots-0.16.bb +++ b/recipes-wlroots/wlroots/wlroots-0.16.bb @@ -5,9 +5,9 @@ going to write anyway." HOMEPAGE = "https://gitlab.freedesktop.org/wlroots" BUGTRACKER = "https://gitlab.freedesktop.org/wlroots/wlroots/-/issues" SECTION = "graphics" -LICENSE = "MIT" - +LICENSE = "MIT & CC0-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818" +LIC_FILES_CHKSUM += "file://tinywl/LICENSE;md5=d957da0415f5b0b974bfc6063afab2b5" REQUIRED_DISTRO_FEATURES = "wayland" @@ -22,7 +22,6 @@ DEPENDS += " \ wayland-protocols \ " -PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false,libpng ffmpeg" PACKAGECONFIG[opengl] = ",,virtual/egl virtual/libgles2" PACKAGECONFIG[gbm] = ",,virtual/libgbm" PACKAGECONFIG[libinput] = ",,libinput" @@ -38,13 +37,14 @@ PACKAGECONFIG ?= " \ " SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=0.16;protocol=https" -SRCREV = "0911a41f17df2f684c383923772994a3807ce416" +SRCREV = "0a32b5a74db06a27bee55a47205951bb277a9657" S = "${WORKDIR}/git" -PV = "0.16.1" +PV = "0.16.2" inherit meson pkgconfig features_check -EXTRA_OEMESON += "--buildtype release" - -BBCLASSEXTEND = "" +do_install:append() { + install -d ${D}${bindir} + install -m 0755 ${B}/tinywl/tinywl ${D}${bindir} +} diff --git a/recipes-wlroots/wlroots/wlroots-tinywl/Makefile b/recipes-wlroots/wlroots/wlroots-tinywl/Makefile deleted file mode 100644 index ac6bc7b..0000000 --- a/recipes-wlroots/wlroots/wlroots-tinywl/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -LIBS=\ - $(shell pkg-config --cflags --libs wlroots) \ - $(shell pkg-config --cflags --libs wayland-server) \ - $(shell pkg-config --cflags --libs xkbcommon) - -# 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. -xdg-shell-protocol.h: - $(WAYLAND_SCANNER) server-header \ - $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@ - -tinywl: tinywl.c xdg-shell-protocol.h - $(CC) $(CFLAGS) \ - -g -Werror -I. \ - -DWLR_USE_UNSTABLE \ - ${LDFLAGS} \ - -o $@ $< \ - $(LIBS) - -clean: - rm -f tinywl xdg-shell-protocol.h xdg-shell-protocol.c - -.DEFAULT_GOAL=tinywl -.PHONY: clean diff --git a/recipes-wlroots/wlroots/wlroots-tinywl_0.16.0.bb b/recipes-wlroots/wlroots/wlroots-tinywl_0.16.0.bb deleted file mode 100644 index fa649bb..0000000 --- a/recipes-wlroots/wlroots/wlroots-tinywl_0.16.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -LICENSE = "CCO-1.0" -LIC_FILES_CHKSUM = "file://tinywl/LICENSE;md5=d957da0415f5b0b974bfc6063afab2b5" - -SRC_URI = "\ - https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${PV}/wlroots-${PV}.tar.gz \ - file://Makefile \ -" -SRC_URI[sha256sum] = "cb867d0285cdc797ec6d127decd54a68b7166445632313b685f08ea016931044" - -DEPENDS += "\ - libxkbcommon \ - wayland \ - wayland-native \ - wayland-protocols \ - wlroots-0.16 \ -" - -S = "${WORKDIR}/wlroots-${PV}" - -inherit pkgconfig - -EXTRA_OEMAKE = "\ - 'CC=${CC}' \ - 'CFLAGS=${CFLAGS}' \ - 'LDFLAGS=${LDFLAGS}' \ - 'WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner' \ - 'WAYLAND_PROTOCOLS=${STAGING_DATADIR}/wayland-protocols' \ -" - -do_compile() { - cp ${WORKDIR}/Makefile ${S}/tinywl/ - - cd ${S}/tinywl - oe_runmake ${EXTRA_OEMAKE} tinywl VERBOSE=1 -} - -do_install() { - install -Dm0755 ${S}/tinywl/tinywl ${D}${bindir}/tinywl -} diff --git a/recipes-wlroots/wlroots/wlroots_git.bb b/recipes-wlroots/wlroots/wlroots_git.bb index ea0193c..2de589e 100644 --- a/recipes-wlroots/wlroots/wlroots_git.bb +++ b/recipes-wlroots/wlroots/wlroots_git.bb @@ -5,9 +5,9 @@ going to write anyway." HOMEPAGE = "https://gitlab.freedesktop.org/wlroots" BUGTRACKER = "https://gitlab.freedesktop.org/wlroots/wlroots/-/issues" SECTION = "graphics" -LICENSE = "MIT" - +LICENSE = "MIT & CC0-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818" +LIC_FILES_CHKSUM += "file://tinywl/LICENSE;md5=d957da0415f5b0b974bfc6063afab2b5" REQUIRED_DISTRO_FEATURES = "wayland" @@ -22,7 +22,6 @@ DEPENDS += " \ wayland-protocols \ " -PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false,libpng ffmpeg" PACKAGECONFIG[opengl] = ",,virtual/egl virtual/libgles2" PACKAGECONFIG[gbm] = ",,virtual/libgbm" PACKAGECONFIG[libinput] = ",,libinput" @@ -43,8 +42,10 @@ PV = "0.17.0-dev" S = "${WORKDIR}/git" + inherit meson pkgconfig features_check -EXTRA_OEMESON += "--buildtype release" - -BBCLASSEXTEND = "" +do_install:append() { + install -d ${D}${bindir} + install -m 0755 ${B}/tinywl/tinywl ${D}${bindir} +}