Cleaned up phinephone stuff
This commit is contained in:
@@ -1 +0,0 @@
|
||||
DIST wlroots-0.16.2.tar.gz 589804 BLAKE2B 49911556f1442b43b46e3ec7750706cabeeab915bc36b178b92dec7b66743f4c2f0e335c6e26e318a25ceda41170b20913987a94a3c516df580d379305df7cc2 SHA512 3c1d4fecb3b751987e7051e69849fd62bd4eed95f2d2e548f06e42e4829d0fc24f20c1bfe056a53ede2d1fd05e0c566269a7b9f2bab0de0057a32b55e826a7c0
|
||||
@@ -1,47 +0,0 @@
|
||||
From 663278d168152f990cf76a3df9d31ca4c6511604 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <663278d168152f990cf76a3df9d31ca4c6511604.1690371072.git.agx@sigxcpu.org>
|
||||
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
|
||||
Date: Fri, 1 Jan 2021 13:58:55 +0100
|
||||
Subject: [PATCH] Revert "layer-shell: error on 0 dimension without anchors"
|
||||
|
||||
This reverts commit 8dec751a6d84335fb04288b8efab6dd5c90288d3.
|
||||
|
||||
Revert this until phosh has a fixed release.
|
||||
---
|
||||
types/wlr_layer_shell_v1.c | 20 --------------------
|
||||
1 file changed, 20 deletions(-)
|
||||
|
||||
diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c
|
||||
index fa054d3c..062fa96d 100644
|
||||
--- a/types/wlr_layer_shell_v1.c
|
||||
+++ b/types/wlr_layer_shell_v1.c
|
||||
@@ -316,26 +316,6 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
|
||||
struct wlr_layer_surface_v1 *surface =
|
||||
wlr_layer_surface_v1_from_wlr_surface(wlr_surface);
|
||||
|
||||
- const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
|
||||
- ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
||||
- if (surface->pending.desired_width == 0 &&
|
||||
- (surface->pending.anchor & horiz) != horiz) {
|
||||
- wl_resource_post_error(surface->resource,
|
||||
- ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
|
||||
- "width 0 requested without setting left and right anchors");
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- const uint32_t vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
|
||||
- ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
|
||||
- if (surface->pending.desired_height == 0 &&
|
||||
- (surface->pending.anchor & vert) != vert) {
|
||||
- wl_resource_post_error(surface->resource,
|
||||
- ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
|
||||
- "height 0 requested without setting top and bottom anchors");
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
surface->current = surface->pending;
|
||||
surface->pending.committed = 0;
|
||||
|
||||
--
|
||||
2.40.1
|
||||
|
||||
@@ -1,97 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit meson
|
||||
|
||||
DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
|
||||
HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots"
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
|
||||
inherit git-r3
|
||||
SLOT="0/9999"
|
||||
else
|
||||
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
|
||||
KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
|
||||
SLOT="0/$(ver_cut 2)"
|
||||
fi
|
||||
|
||||
LICENSE="MIT"
|
||||
IUSE="+drm +libinput tinywl vulkan x11-backend X phoc"
|
||||
|
||||
DEPEND="
|
||||
>=dev-libs/wayland-1.21.0
|
||||
>=dev-libs/wayland-protocols-1.28
|
||||
drm? ( sys-apps/hwdata:= )
|
||||
libinput? ( >=dev-libs/libinput-1.14.0:0= )
|
||||
media-libs/mesa[egl(+),gles2]
|
||||
sys-auth/seatd:=
|
||||
virtual/libudev
|
||||
vulkan? (
|
||||
dev-util/glslang:0=
|
||||
dev-util/vulkan-headers:0=
|
||||
media-libs/vulkan-loader:0=
|
||||
)
|
||||
>=x11-libs/libdrm-2.4.114:0=
|
||||
x11-libs/libxkbcommon
|
||||
>=x11-libs/pixman-0.42.0:0=
|
||||
x11-backend? ( x11-libs/libxcb:0= )
|
||||
X? (
|
||||
x11-base/xwayland
|
||||
x11-libs/libxcb:0=
|
||||
x11-libs/xcb-util-image
|
||||
x11-libs/xcb-util-renderutil
|
||||
x11-libs/xcb-util-wm
|
||||
)
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
"
|
||||
BDEPEND="
|
||||
>=dev-libs/wayland-protocols-1.24
|
||||
>=dev-util/meson-0.60.0
|
||||
dev-util/wayland-scanner
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
if use phoc; then
|
||||
PATCHES+=( "${FILESDIR}"/0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch )
|
||||
fi
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local backends=(
|
||||
$(usev drm)
|
||||
$(usev libinput)
|
||||
$(usev x11-backend 'x11')
|
||||
)
|
||||
# Separate values with a comma with this evil floating point bit hack
|
||||
local meson_backends=$(IFS=','; echo "${backends[*]}")
|
||||
# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
|
||||
local emesonargs=(
|
||||
"-Dxcb-errors=disabled"
|
||||
$(meson_use tinywl examples)
|
||||
-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
|
||||
$(meson_feature X xwayland)
|
||||
-Dbackends=${meson_backends}
|
||||
)
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
if use tinywl; then
|
||||
dobin "${BUILD_DIR}"/tinywl/tinywl
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "You must be in the input group to allow your compositor"
|
||||
elog "to access input devices via libinput."
|
||||
}
|
||||
Reference in New Issue
Block a user