pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove swc, wld, velox - imported
Module Name: pkgsrc-wip
Committed By: nia <nia%NetBSD.org@localhost>
Pushed By: nee
Date: Thu Dec 12 22:15:35 2019 +0000
Changeset: e0be399cf249dcfa68db762af27aff1929e793da
Modified Files:
Makefile
Removed Files:
swc/DESCR
swc/Makefile
swc/PLIST
swc/buildlink3.mk
swc/distinfo
swc/patches/patch-Makefile
swc/patches/patch-config.mk
swc/patches/patch-launch_launch.c
swc/patches/patch-launch_protocol.h
swc/patches/patch-libswc_drm.c
swc/patches/patch-libswc_keyboard.c
swc/patches/patch-libswc_local.mk
swc/patches/patch-libswc_seat-ws.c
swc/patches/patch-libswc_seat.c
swc/patches/patch-libswc_shm.c
velox/DESCR
velox/Makefile
velox/PLIST
velox/distinfo
velox/patches/patch-config.c
velox/patches/patch-config.mk
wld/DESCR
wld/Makefile
wld/PLIST
wld/buildlink3.mk
wld/distinfo
wld/patches/patch-config.mk
wld/patches/patch-drm.c
Log Message:
Remove swc, wld, velox - imported
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e0be399cf249dcfa68db762af27aff1929e793da
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 3 -
swc/DESCR | 8 -
swc/Makefile | 28 ---
swc/PLIST | 9 -
swc/buildlink3.mk | 17 --
swc/distinfo | 16 --
swc/patches/patch-Makefile | 20 --
swc/patches/patch-config.mk | 11 -
swc/patches/patch-launch_launch.c | 192 -----------------
swc/patches/patch-launch_protocol.h | 16 --
swc/patches/patch-libswc_drm.c | 13 --
swc/patches/patch-libswc_keyboard.c | 17 --
swc/patches/patch-libswc_local.mk | 22 --
swc/patches/patch-libswc_seat-ws.c | 337 -----------------------------
swc/patches/patch-libswc_seat.c | 411 ------------------------------------
swc/patches/patch-libswc_shm.c | 40 ----
velox/DESCR | 17 --
velox/Makefile | 30 ---
velox/PLIST | 5 -
velox/distinfo | 8 -
velox/patches/patch-config.c | 31 ---
velox/patches/patch-config.mk | 13 --
wld/DESCR | 1 -
wld/Makefile | 28 ---
wld/PLIST | 10 -
wld/buildlink3.mk | 17 --
wld/distinfo | 8 -
wld/patches/patch-config.mk | 15 --
wld/patches/patch-drm.c | 34 ---
29 files changed, 1377 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 2e28a8c018..b620b5c518 100644
--- a/Makefile
+++ b/Makefile
@@ -4584,7 +4584,6 @@ SUBDIR+= svnup
SUBDIR+= svrcore
SUBDIR+= swami
SUBDIR+= swarp
-SUBDIR+= swc
SUBDIR+= swfmill
SUBDIR+= swftools
SUBDIR+= swift
@@ -4853,7 +4852,6 @@ SUBDIR+= vche
SUBDIR+= vcsh
SUBDIR+= vdesk
SUBDIR+= vee
-SUBDIR+= velox
SUBDIR+= verbiste
SUBDIR+= vgo
SUBDIR+= vhdtool-git
@@ -4928,7 +4926,6 @@ SUBDIR+= wkhtmltopdf
SUBDIR+= wl-git
SUBDIR+= wla-dx
SUBDIR+= wla-dx-git
-SUBDIR+= wld
SUBDIR+= wmc2d
SUBDIR+= wmii-devel
SUBDIR+= wmname
diff --git a/swc/DESCR b/swc/DESCR
deleted file mode 100644
index 5b6adf7046..0000000000
--- a/swc/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-swc is a small Wayland compositor implemented as a library.
-
-It has been designed primary with tiling window managers in mind.
-Additionally, notable features include:
-
- Easy to follow code base
- XWayland support
- Can place borders around windows
diff --git a/swc/Makefile b/swc/Makefile
deleted file mode 100644
index c3903ee0cb..0000000000
--- a/swc/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2018/08/22 09:43:57 wiz Exp $
-
-GIT_COMMIT= a98426ae69b43396cb22bb62316e270fb1f9d8f1
-DISTNAME= ${GIT_COMMIT}
-PKGNAME= swc-0.0.20190810
-CATEGORIES= wm
-MASTER_SITES= ${MASTER_SITE_GITHUB:=michaelforney/swc/archive/}
-EXTRACT_SUFX= .zip
-DIST_SUBDIR= swc-${GIT_COMMIT}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://github.com/michaelforney/swc
-COMMENT= small Wayland compositor implemented as a library
-LICENSE= mit
-
-USE_TOOLS+= gmake pkg-config
-
-WRKSRC= ${WRKDIR}/swc-${GIT_COMMIT}
-
-PKGCONFIG_OVERRIDE+= swc.pc.in
-
-.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/libxkbcommon/buildlink3.mk"
-.include "../../devel/wayland/buildlink3.mk"
-.include "../../devel/wayland-protocols/buildlink3.mk"
-.include "../../wip/wld/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/swc/PLIST b/swc/PLIST
deleted file mode 100644
index 24e128ca86..0000000000
--- a/swc/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD$
-bin/swc-launch
-include/swc.h
-lib/libswc.a
-lib/libswc.so
-lib/libswc.so.0
-lib/libswc.so.0.0
-lib/pkgconfig/swc.pc
-share/swc/swc.xml
diff --git a/swc/buildlink3.mk b/swc/buildlink3.mk
deleted file mode 100644
index 37d4929f00..0000000000
--- a/swc/buildlink3.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= swc
-
-.if !defined(SWC_BUILDLINK3_MK)
-SWC_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.swc+= swc>=0.0.20190810
-BUILDLINK_PKGSRCDIR.swc?= ../../wip/swc
-
-.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/libxkbcommon/buildlink3.mk"
-.include "../../devel/wayland/buildlink3.mk"
-.include "../../wip/wld/buildlink3.mk"
-.endif # SWC_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -swc
diff --git a/swc/distinfo b/swc/distinfo
deleted file mode 100644
index 5abfa3f55f..0000000000
--- a/swc/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-SHA1 (swc-a98426ae69b43396cb22bb62316e270fb1f9d8f1/a98426ae69b43396cb22bb62316e270fb1f9d8f1.zip) = 5d2e9830510a70b53019ddc8ffc20bd82495be02
-RMD160 (swc-a98426ae69b43396cb22bb62316e270fb1f9d8f1/a98426ae69b43396cb22bb62316e270fb1f9d8f1.zip) = 6c51e820cae04d81ec6879575340632a483d9317
-SHA512 (swc-a98426ae69b43396cb22bb62316e270fb1f9d8f1/a98426ae69b43396cb22bb62316e270fb1f9d8f1.zip) = aa68875ee90a1e815684d67e12b4373071cd6bb81761117b513be0aa872f93948fc48ee5ada5e2e5fdda9a8d9b25db003bb1c4b4995879344a516df44a37326a
-Size (swc-a98426ae69b43396cb22bb62316e270fb1f9d8f1/a98426ae69b43396cb22bb62316e270fb1f9d8f1.zip) = 146116 bytes
-SHA1 (patch-Makefile) = 7b79ca023fb6986fff44967169edd6499ffeb825
-SHA1 (patch-config.mk) = df6ba39cbd0cb082ec29cd7e917dde061dd0ba54
-SHA1 (patch-launch_launch.c) = e6569aa14c8b1169439fd6edee5737b081a2d510
-SHA1 (patch-launch_protocol.h) = b9c8ef5acfc177178f630ac97c27d8b2914c9499
-SHA1 (patch-libswc_drm.c) = a1df17103b418a0ff8980ff5e6ce7becda1eaf55
-SHA1 (patch-libswc_keyboard.c) = e0c181190d75db7bf5efca2ee27d0bea1b970f16
-SHA1 (patch-libswc_local.mk) = d42b7958c058d0a67008d21b869c0ebfc2908beb
-SHA1 (patch-libswc_seat-ws.c) = 2b757d932e7951de8876640cc4ebec137a781113
-SHA1 (patch-libswc_seat.c) = d63660b6dc358b2c9d6d5437323af4dc8e2d8548
-SHA1 (patch-libswc_shm.c) = 6f524957bcd863e8112470160f3d0b07562b1437
diff --git a/swc/patches/patch-Makefile b/swc/patches/patch-Makefile
deleted file mode 100644
index 8f94b763d0..0000000000
--- a/swc/patches/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
---- Makefile.orig 2019-07-11 06:33:41.000000000 +0000
-+++ Makefile
-@@ -28,7 +28,6 @@ include config.mk
- # Dependencies
- PACKAGES := \
- libdrm \
-- libinput \
- pixman-1 \
- wayland-server \
- wayland-protocols \
-@@ -39,7 +38,6 @@ ifeq ($(ENABLE_LIBUDEV),1)
- PACKAGES += libudev
- endif
-
--libinput_CONSTRAINTS := --atleast-version=0.4
- wayland-server_CONSTRAINTS := --atleast-version=1.6.0
-
- define check
diff --git a/swc/patches/patch-config.mk b/swc/patches/patch-config.mk
deleted file mode 100644
index eefc64b82f..0000000000
--- a/swc/patches/patch-config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
---- config.mk.orig 2019-07-11 06:33:41.000000000 +0000
-+++ config.mk
-@@ -16,5 +16,5 @@
- ENABLE_DEBUG = 1
- ENABLE_STATIC = 1
- ENABLE_SHARED = 1
--ENABLE_LIBUDEV = 1
-+ENABLE_LIBUDEV = 0
-
diff --git a/swc/patches/patch-launch_launch.c b/swc/patches/patch-launch_launch.c
deleted file mode 100644
index c074c5db86..0000000000
--- a/swc/patches/patch-launch_launch.c
+++ /dev/null
@@ -1,192 +0,0 @@
-$NetBSD$
-
---- launch/launch.c.orig 2019-07-11 06:33:41.000000000 +0000
-+++ launch/launch.c
-@@ -38,21 +38,31 @@
- #include <stdnoreturn.h>
- #include <string.h>
- #include <unistd.h>
-+#include <signal.h>
-
--#include <sys/socket.h>
--#include <sys/stat.h>
--#include <sys/wait.h>
--#include <sys/ioctl.h>
--#include <sys/sysmacros.h>
-+#ifdef __NetBSD__
-+#include <dev/wscons/wsconsio.h>
-+#include <dev/wscons/wsdisplay_usl_io.h>
-+extern char **environ;
-+#define TTY_MAJOR (47)
-+#define WSKBD_MAJOR (48)
-+#define WSMOUSE_MAJOR (49)
-+#define DRM_MAJOR (180)
-+#else
- #include <linux/input.h>
- #include <linux/kd.h>
- #include <linux/major.h>
- #include <linux/vt.h>
--#include <xf86drm.h>
--
- #ifndef DRM_MAJOR
- #define DRM_MAJOR 226
- #endif
-+#endif
-+
-+#include <sys/socket.h>
-+#include <sys/stat.h>
-+#include <sys/wait.h>
-+#include <sys/ioctl.h>
-+#include <xf86drm.h>
-
- #define ARRAY_LENGTH(array) (sizeof(array) / sizeof(array)[0])
-
-@@ -116,8 +126,10 @@ stop_devices(bool fatal)
- die("drmDropMaster:");
- }
- for (i = 0; i < num_input_fds; ++i) {
-+#ifdef EVIOCREVOKE
- if (ioctl(input_fds[i], EVIOCREVOKE, 0) < 0 && errno != ENODEV && fatal)
- die("ioctl EVIOCREVOKE:");
-+#endif
- close(input_fds[i]);
- }
- num_input_fds = 0;
-@@ -126,20 +138,16 @@ stop_devices(bool fatal)
- static void
- cleanup(void)
- {
-- struct vt_mode mode = {.mode = VT_AUTO};
--
-- if (!original_vt_state.altered)
-- return;
--
- /* Cleanup VT */
-- ioctl(tty_fd, VT_SETMODE, &mode);
- ioctl(tty_fd, KDSETMODE, original_vt_state.console_mode);
- ioctl(tty_fd, KDSKBMODE, original_vt_state.kb_mode);
-
- /* Stop devices before switching the VT to make sure we have released the DRM
- * device before the next session tries to claim it. */
- stop_devices(false);
-- ioctl(tty_fd, VT_ACTIVATE, original_vt_state.vt);
-+
-+ int dispmode = WSDISPLAYIO_MODE_EMUL;
-+ ioctl(tty_fd, WSDISPLAYIO_SMODE, &dispmode);
-
- kill(0, SIGTERM);
- }
-@@ -208,7 +216,12 @@ handle_socket_data(int socket)
- }
-
- switch (major(st.st_rdev)) {
-+#ifdef INPUT_MAJOR
- case INPUT_MAJOR:
-+#else
-+ case WSKBD_MAJOR:
-+ case WSMOUSE_MAJOR:
-+#endif
- if (!active)
- goto fail;
- if (num_input_fds == ARRAY_LENGTH(input_fds)) {
-@@ -235,7 +248,12 @@ handle_socket_data(int socket)
- }
-
- switch (major(st.st_rdev)) {
-+#ifdef INPUT_MAJOR
- case INPUT_MAJOR:
-+#else
-+ case WSKBD_MAJOR:
-+ case WSMOUSE_MAJOR:
-+#endif
- input_fds[num_input_fds++] = fd;
- break;
- case DRM_MAJOR:
-@@ -275,16 +293,16 @@ find_vt(char *vt, size_t size)
- /* If we are running from an existing X or wayland session, always open a new
- * VT instead of using the current one. */
- if (getenv("DISPLAY") || getenv("WAYLAND_DISPLAY") || !(vtnr = getenv("XDG_VTNR"))) {
-- tty0_fd = open("/dev/tty0", O_RDWR);
-+ tty0_fd = open("/dev/ttyE0", O_RDWR);
- if (tty0_fd == -1)
-- die("open /dev/tty0:");
-+ die("open /dev/ttyE0:");
- if (ioctl(tty0_fd, VT_OPENQRY, &vt_num) != 0)
- die("VT open query failed:");
- close(tty0_fd);
-- if (snprintf(vt, size, "/dev/tty%d", vt_num) >= size)
-+ if (snprintf(vt, size, "/dev/ttyE%d", vt_num) >= size)
- die("VT number is too large");
- } else {
-- if (snprintf(vt, size, "/dev/tty%s", vtnr) >= size)
-+ if (snprintf(vt, size, "/dev/ttyE%s", vtnr) >= size)
- die("XDG_VTNR is too long");
- }
- }
-@@ -311,12 +329,6 @@ setup_tty(int fd)
- {
- struct stat st;
- int vt;
-- struct vt_stat state;
-- struct vt_mode mode = {
-- .mode = VT_PROCESS,
-- .relsig = SIGUSR1,
-- .acqsig = SIGUSR2
-- };
-
- if (fstat(fd, &st) == -1)
- die("failed to stat TTY fd:");
-@@ -324,50 +336,10 @@ setup_tty(int fd)
- if (major(st.st_rdev) != TTY_MAJOR || vt == 0)
- die("not a valid VT");
-
-- if (ioctl(fd, VT_GETSTATE, &state) == -1)
-- die("failed to get the current VT state:");
-- original_vt_state.vt = state.v_active;
-- if (ioctl(fd, KDGKBMODE, &original_vt_state.kb_mode))
-- die("failed to get keyboard mode:");
-- if (ioctl(fd, KDGETMODE, &original_vt_state.console_mode))
-- die("failed to get console mode:");
--
-- if (ioctl(fd, KDSKBMODE, K_OFF) == -1)
-- die("failed to set keyboard mode to K_OFF:");
-- if (ioctl(fd, KDSETMODE, KD_GRAPHICS) == -1) {
-- perror("failed to set console mode to KD_GRAPHICS");
-- goto error0;
-- }
-- if (ioctl(fd, VT_SETMODE, &mode) == -1) {
-- perror("failed to set VT mode");
-- goto error1;
-- }
--
-- if (vt == original_vt_state.vt) {
-- activate();
-- } else if (!nflag) {
-- if (ioctl(fd, VT_ACTIVATE, vt) == -1) {
-- perror("failed to activate VT");
-- goto error2;
-- }
--
-- if (ioctl(fd, VT_WAITACTIVE, vt) == -1) {
-- perror("failed to wait for VT to become active");
-- goto error2;
-- }
-- }
--
-- original_vt_state.altered = true;
--
-- return;
-+ int dispmode = WSDISPLAYIO_MODE_DUMBFB;
-+ if (ioctl(fd, WSDISPLAYIO_SMODE, &dispmode) < 0)
-+ die("Failed to set wsdisplay mode");
-
--error2:
-- mode = (struct vt_mode){.mode = VT_AUTO };
-- ioctl(fd, VT_SETMODE, &mode);
--error1:
-- ioctl(fd, KDSETMODE, original_vt_state.console_mode);
--error0:
-- ioctl(fd, KDSKBMODE, original_vt_state.kb_mode);
- exit(EXIT_FAILURE);
- }
-
diff --git a/swc/patches/patch-launch_protocol.h b/swc/patches/patch-launch_protocol.h
deleted file mode 100644
index 7ee6803341..0000000000
--- a/swc/patches/patch-launch_protocol.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- launch/protocol.h.orig 2019-07-11 06:33:41.000000000 +0000
-+++ launch/protocol.h
-@@ -24,9 +24,10 @@
- #ifndef SWC_LAUNCH_PROTOCOL_H
- #define SWC_LAUNCH_PROTOCOL_H
-
-+#include <sys/types.h>
-+#include <sys/uio.h>
- #include <stdbool.h>
- #include <stdint.h>
--#include <sys/types.h>
-
- #define SWC_LAUNCH_SOCKET_ENV "SWC_LAUNCH_SOCKET"
-
diff --git a/swc/patches/patch-libswc_drm.c b/swc/patches/patch-libswc_drm.c
deleted file mode 100644
index af31696577..0000000000
--- a/swc/patches/patch-libswc_drm.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- libswc/drm.c.orig 2019-07-11 06:33:41.000000000 +0000
-+++ libswc/drm.c
-@@ -196,7 +196,7 @@ find_available_crtc(drmModeRes *resource
- static bool
- find_available_id(uint32_t *id)
- {
-- int index = ffsl(~drm.taken_ids);
-+ int index = __builtin_ffsl(~drm.taken_ids);
-
- if (index == 0)
- return false;
diff --git a/swc/patches/patch-libswc_keyboard.c b/swc/patches/patch-libswc_keyboard.c
deleted file mode 100644
index 2e908d1ab8..0000000000
--- a/swc/patches/patch-libswc_keyboard.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
---- libswc/keyboard.c.orig 2019-07-11 06:33:41.000000000 +0000
-+++ libswc/keyboard.c
-@@ -150,10 +150,12 @@ update_keymap(struct xkb *xkb)
-
- unlink(keymap_path);
-
-+#ifndef __NetBSD__
- if (posix_fallocate(xkb->keymap.fd, 0, xkb->keymap.size) != 0) {
- WARNING("Could not resize XKB keymap file\n");
- goto error2;
- }
-+#endif
-
- xkb->keymap.area = mmap(NULL, xkb->keymap.size, PROT_READ | PROT_WRITE, MAP_SHARED, xkb->keymap.fd, 0);
-
diff --git a/swc/patches/patch-libswc_local.mk b/swc/patches/patch-libswc_local.mk
deleted file mode 100644
index 5c90bebb07..0000000000
--- a/swc/patches/patch-libswc_local.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- libswc/local.mk.orig 2019-07-11 06:33:41.000000000 +0000
-+++ libswc/local.mk
-@@ -17,7 +17,7 @@ $(dir)_TARGETS += \
- $(dir)/$(LIBSWC_LINK)
- endif
-
--$(dir)_PACKAGES := libdrm libinput pixman-1 wayland-server wld xkbcommon
-+$(dir)_PACKAGES := libdrm pixman-1 wayland-server wld xkbcommon
- $(dir)_CFLAGS += -Iprotocol
-
- SWC_SOURCES = \
-@@ -40,7 +40,7 @@ SWC_SOURCES = \
- libswc/primary_plane.c \
- libswc/region.c \
- libswc/screen.c \
-- libswc/seat.c \
-+ libswc/seat-ws.c \
- libswc/shell.c \
- libswc/shell_surface.c \
- libswc/shm.c \
diff --git a/swc/patches/patch-libswc_seat-ws.c b/swc/patches/patch-libswc_seat-ws.c
deleted file mode 100644
index 4386e15624..0000000000
--- a/swc/patches/patch-libswc_seat-ws.c
+++ /dev/null
@@ -1,337 +0,0 @@
-$NetBSD$
-
---- libswc/seat-ws.c.orig 2019-08-11 16:54:52.381600368 +0000
-+++ libswc/seat-ws.c
-@@ -0,0 +1,332 @@
-+/* swc: libswc/seat-ws.c
-+ *
-+ * Copyright (c) 2013, 2014 Michael Forney
-+ * Copyright (c) 2019 Nia Alarie
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ */
-+
-+#include "seat.h"
-+#include "compositor.h"
-+#include "data_device.h"
-+#include "event.h"
-+#include "internal.h"
-+#include "keyboard.h"
-+#include "launch.h"
-+#include "pointer.h"
-+#include "screen.h"
-+#include "surface.h"
-+#include "util.h"
-+
-+#include <dev/wscons/wsconsio.h>
-+
-+#include <stdbool.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+
-+static struct {
-+ char *name;
-+ uint32_t capabilities;
-+
-+ int mouse_fd;
-+ int kbd_fd;
-+ bool ignore;
-+
-+ struct wl_event_source *mouse_source;
-+ struct wl_event_source *kbd_source;
-+
-+ struct wl_listener swc_listener;
-+
-+ struct keyboard keyboard;
-+ struct pointer pointer;
-+ struct data_device data_device;
-+
-+ struct wl_global *global;
-+ struct wl_list resources;
-+} seat;
-+
-+const struct swc_seat swc_seat = {
-+ .pointer = &seat.pointer,
-+ .keyboard = &seat.keyboard,
-+ .data_device = &seat.data_device,
-+};
-+
-+static void
-+handle_keyboard_focus_event(struct wl_listener *listener, void *data)
-+{
-+ struct event *ev = data;
-+ struct input_focus_event_data *event_data = ev->data;
-+
-+ if (ev->type != INPUT_FOCUS_EVENT_CHANGED)
-+ return;
-+
-+ if (event_data->new) {
-+ struct wl_client *client = wl_resource_get_client(event_data->new->surface->resource);
-+
-+ /* Offer the selection to the new focus. */
-+ data_device_offer_selection(&seat.data_device, client);
-+ }
-+}
-+
-+static struct wl_listener keyboard_focus_listener = {
-+ .notify = handle_keyboard_focus_event,
-+};
-+
-+static void
-+handle_data_device_event(struct wl_listener *listener, void *data)
-+{
-+ struct event *ev = data;
-+
-+ if (ev->type != DATA_DEVICE_EVENT_SELECTION_CHANGED)
-+ return;
-+
-+ if (seat.keyboard.focus.client)
-+ data_device_offer_selection(&seat.data_device, seat.keyboard.focus.client);
-+}
-+
-+static struct wl_listener data_device_listener = {
-+ .notify = handle_data_device_event,
-+};
-+
-+static void
-+handle_swc_event(struct wl_listener *listener, void *data)
-+{
-+ struct event *ev = data;
-+
-+ switch (ev->type) {
-+ case SWC_EVENT_DEACTIVATED:
-+ seat.ignore = true;
-+ keyboard_reset(&seat.keyboard);
-+ break;
-+ case SWC_EVENT_ACTIVATED:
-+ seat.ignore = false;
-+ break;
-+ }
-+}
-+
-+/* Wayland Seat Interface */
-+static void
-+get_pointer(struct wl_client *client, struct wl_resource *resource, uint32_t id)
-+{
-+ pointer_bind(&seat.pointer, client, wl_resource_get_version(resource), id);
-+}
-+
-+static void
-+get_keyboard(struct wl_client *client, struct wl_resource *resource, uint32_t id)
-+{
-+ keyboard_bind(&seat.keyboard, client, wl_resource_get_version(resource), id);
-+}
-+
-+static void
-+get_touch(struct wl_client *client, struct wl_resource *resource, uint32_t id)
-+{
-+ /* XXX: Implement */
-+}
-+
-+static struct wl_seat_interface seat_implementation = {
-+ .get_pointer = get_pointer,
-+ .get_keyboard = get_keyboard,
-+ .get_touch = get_touch,
-+};
-+
-+static void
-+bind_seat(struct wl_client *client, void *data, uint32_t version, uint32_t id)
-+{
-+ struct wl_resource *resource;
-+
-+ if (version > 4)
-+ version = 4;
-+
-+ resource = wl_resource_create(client, &wl_seat_interface, version, id);
-+ wl_resource_set_implementation(resource, &seat_implementation, NULL, &remove_resource);
-+ wl_list_insert(&seat.resources, wl_resource_get_link(resource));
-+
-+ if (version >= 2)
-+ wl_seat_send_name(resource, seat.name);
-+
-+ wl_seat_send_capabilities(resource, seat.capabilities);
-+}
-+
-+static int
-+handle_ws_data(int fd, uint32_t mask, void *data)
-+{
-+ struct wscons_event ev;
-+
-+ while (!seat.ignore && (read(fd, &ev, sizeof(ev))) != -1) {
-+ uint32_t state, time;
-+ int key;
-+ wl_fixed_t pos;
-+
-+ time = ev.time.tv_sec + (ev.time.tv_nsec / 1000000L);
-+ switch (ev.type) {
-+ case WSCONS_EVENT_KEY_UP:
-+ state = WL_KEYBOARD_KEY_STATE_RELEASED;
-+ key = ev.value;
-+ keyboard_handle_key(&seat.keyboard, time, key, state);
-+ break;
-+ case WSCONS_EVENT_KEY_DOWN:
-+ state = WL_KEYBOARD_KEY_STATE_PRESSED;
-+ key = ev.value;
-+ keyboard_handle_key(&seat.keyboard, time, key, state);
-+ break;
-+ case WSCONS_EVENT_ALL_KEYS_UP:
-+ break;
-+ case WSCONS_EVENT_MOUSE_UP:
-+ state = WL_POINTER_BUTTON_STATE_RELEASED;
-+ key = ev.value;
-+ pointer_handle_button(&seat.pointer, time, key, state);
-+ break;
-+ case WSCONS_EVENT_MOUSE_DOWN:
-+ state = WL_POINTER_BUTTON_STATE_PRESSED;
-+ key = ev.value;
-+ pointer_handle_button(&seat.pointer, time, key, state);
-+ break;
-+ case WSCONS_EVENT_MOUSE_DELTA_X:
-+ pos = wl_fixed_from_int(ev.value);
-+ pointer_handle_relative_motion(&seat.pointer, time, pos, 0);
-+ break;
-+ case WSCONS_EVENT_MOUSE_DELTA_Y:
-+ pos = wl_fixed_from_int(ev.value);
-+ pointer_handle_relative_motion(&seat.pointer, time, 0, pos);
-+ break;
-+ case WSCONS_EVENT_MOUSE_DELTA_Z:
-+ pos = wl_fixed_from_int(ev.value);
-+ break;
-+ case WSCONS_EVENT_MOUSE_DELTA_W:
-+ pos = wl_fixed_from_int(ev.value);
-+ break;
-+ case WSCONS_EVENT_MOUSE_ABSOLUTE_X:
-+ pos = wl_fixed_from_int(ev.value);
-+ pointer_handle_absolute_motion(&seat.pointer, time, pos, 0);
-+ break;
-+ case WSCONS_EVENT_MOUSE_ABSOLUTE_Y:
-+ pos = wl_fixed_from_int(ev.value);
-+ pointer_handle_absolute_motion(&seat.pointer, time, 0, pos);
-+ break;
-+ case WSCONS_EVENT_MOUSE_ABSOLUTE_Z:
-+ pos = wl_fixed_from_int(ev.value);
-+ break;
-+ case WSCONS_EVENT_MOUSE_ABSOLUTE_W:
-+ pos = wl_fixed_from_int(ev.value);
-+ break;
-+
-+ }
-+ }
-+ return 0;
-+}
-+
-+static bool
-+initialize_wscons(void)
-+{
-+ if ((seat.mouse_fd = launch_open_device("/dev/wsmouse", O_RDONLY | O_NONBLOCK)) == -1) {
-+ goto error0;
-+ }
-+ if ((seat.kbd_fd = launch_open_device("/dev/wskbd", O_RDONLY | O_NONBLOCK)) == -1) {
-+ goto error1;
-+ }
-+
-+ seat.kbd_source = wl_event_loop_add_fd
-+ (swc.event_loop, seat.kbd_fd, WL_EVENT_READABLE,
-+ &handle_ws_data, NULL);
-+ seat.mouse_source = wl_event_loop_add_fd
-+ (swc.event_loop, seat.mouse_fd, WL_EVENT_READABLE,
-+ &handle_ws_data, NULL);
-+ return true;
-+error1:
-+ close(seat.mouse_fd);
-+error0:
-+ return false;
-+}
-+
-+bool
-+seat_initialize(const char *seat_name)
-+{
-+ if (!(seat.name = strdup(seat_name))) {
-+ ERROR("Could not allocate seat name string\n");
-+ goto error0;
-+ }
-+
-+ seat.capabilities = WL_SEAT_CAPABILITY_KEYBOARD | WL_SEAT_CAPABILITY_POINTER;
-+ seat.global = wl_global_create(swc.display, &wl_seat_interface, 4, NULL, &bind_seat);
-+
-+ if (!seat.global)
-+ goto error1;
-+
-+ wl_list_init(&seat.resources);
-+ seat.swc_listener.notify = &handle_swc_event;
-+ wl_signal_add(&swc.event_signal, &seat.swc_listener);
-+
-+ if (!data_device_initialize(&seat.data_device)) {
-+ ERROR("Could not initialize data device\n");
-+ goto error2;
-+ }
-+
-+ wl_signal_add(&seat.data_device.event_signal, &data_device_listener);
-+
-+ if (!keyboard_initialize(&seat.keyboard)) {
-+ ERROR("Could not initialize keyboard\n");
-+ goto error3;
-+ }
-+
-+ wl_signal_add(&seat.keyboard.focus.event_signal, &keyboard_focus_listener);
-+
-+ if (!pointer_initialize(&seat.pointer)) {
-+ ERROR("Could not initialize pointer\n");
-+ goto error4;
-+ }
-+
-+ if (!initialize_wscons())
-+ goto error5;
-+
-+ return true;
-+
-+error5:
-+ pointer_finalize(&seat.pointer);
-+error4:
-+ keyboard_finalize(&seat.keyboard);
-+error3:
-+ data_device_finalize(&seat.data_device);
-+error2:
-+ wl_global_destroy(seat.global);
-+error1:
-+ free(seat.name);
-+error0:
-+ return false;
-+}
-+
-+void
-+seat_finalize(void)
-+{
-+ wl_event_source_remove(seat.mouse_source);
-+ wl_event_source_remove(seat.kbd_source);
-+ close(seat.mouse_fd);
-+ seat.mouse_fd = -1;
-+ close(seat.kbd_fd);
-+ seat.kbd_fd = -1;
-+
-+ pointer_finalize(&seat.pointer);
-+ keyboard_finalize(&seat.keyboard);
-+ data_device_finalize(&seat.data_device);
-+
-+ wl_global_destroy(seat.global);
-+ free(seat.name);
-+}
diff --git a/swc/patches/patch-libswc_seat.c b/swc/patches/patch-libswc_seat.c
deleted file mode 100644
index da61b804fd..0000000000
--- a/swc/patches/patch-libswc_seat.c
+++ /dev/null
@@ -1,411 +0,0 @@
-$NetBSD$
-
---- libswc/seat.c.orig 2019-07-11 06:33:41.000000000 +0000
-+++ libswc/seat.c
-@@ -40,403 +40,26 @@
- #include <string.h>
- #include <unistd.h>
-
--#include <libinput.h>
--#include <linux/input.h>
--#ifdef ENABLE_LIBUDEV
--# include <libudev.h>
--#endif
--
--static struct {
-- char *name;
-- uint32_t capabilities;
--
-- struct libinput *libinput;
-- struct wl_event_source *libinput_source;
--
--#ifdef ENABLE_LIBUDEV
-- struct udev *udev;
--#endif
--
-- struct wl_listener swc_listener;
--
-- struct keyboard keyboard;
-- struct pointer pointer;
-- struct data_device data_device;
--
-- struct wl_global *global;
-- struct wl_list resources;
--} seat;
--
- const struct swc_seat swc_seat = {
-- .pointer = &seat.pointer,
-- .keyboard = &seat.keyboard,
-- .data_device = &seat.data_device,
--};
--
--static void
--handle_keyboard_focus_event(struct wl_listener *listener, void *data)
--{
-- struct event *ev = data;
-- struct input_focus_event_data *event_data = ev->data;
--
-- if (ev->type != INPUT_FOCUS_EVENT_CHANGED)
-- return;
--
-- if (event_data->new) {
-- struct wl_client *client = wl_resource_get_client(event_data->new->surface->resource);
--
-- /* Offer the selection to the new focus. */
-- data_device_offer_selection(&seat.data_device, client);
-- }
--}
--
--static struct wl_listener keyboard_focus_listener = {
-- .notify = handle_keyboard_focus_event,
--};
--
--static void
--handle_data_device_event(struct wl_listener *listener, void *data)
--{
-- struct event *ev = data;
--
-- if (ev->type != DATA_DEVICE_EVENT_SELECTION_CHANGED)
-- return;
--
-- if (seat.keyboard.focus.client)
-- data_device_offer_selection(&seat.data_device, seat.keyboard.focus.client);
--}
--
--static struct wl_listener data_device_listener = {
-- .notify = handle_data_device_event,
--};
--
--static void
--handle_swc_event(struct wl_listener *listener, void *data)
--{
-- struct event *ev = data;
--
-- switch (ev->type) {
-- case SWC_EVENT_DEACTIVATED:
-- libinput_suspend(seat.libinput);
-- keyboard_reset(&seat.keyboard);
-- break;
-- case SWC_EVENT_ACTIVATED:
-- if (libinput_resume(seat.libinput) != 0)
-- WARNING("Failed to resume libinput context\n");
-- break;
-- }
--}
--
--/* Wayland Seat Interface */
--static void
--get_pointer(struct wl_client *client, struct wl_resource *resource, uint32_t id)
--{
-- pointer_bind(&seat.pointer, client, wl_resource_get_version(resource), id);
--}
--
--static void
--get_keyboard(struct wl_client *client, struct wl_resource *resource, uint32_t id)
--{
-- keyboard_bind(&seat.keyboard, client, wl_resource_get_version(resource), id);
--}
--
--static void
--get_touch(struct wl_client *client, struct wl_resource *resource, uint32_t id)
--{
-- /* XXX: Implement */
--}
--
--static struct wl_seat_interface seat_implementation = {
-- .get_pointer = get_pointer,
-- .get_keyboard = get_keyboard,
-- .get_touch = get_touch,
--};
--
--static void
--bind_seat(struct wl_client *client, void *data, uint32_t version, uint32_t id)
--{
-- struct wl_resource *resource;
--
-- if (version > 4)
-- version = 4;
--
-- resource = wl_resource_create(client, &wl_seat_interface, version, id);
-- wl_resource_set_implementation(resource, &seat_implementation, NULL, &remove_resource);
-- wl_list_insert(&seat.resources, wl_resource_get_link(resource));
--
-- if (version >= 2)
-- wl_seat_send_name(resource, seat.name);
--
-- wl_seat_send_capabilities(resource, seat.capabilities);
--}
--
--static void
--update_capabilities(uint32_t capabilities)
--{
-- struct wl_resource *resource;
--
-- if (!(~seat.capabilities & capabilities))
-- return;
--
-- seat.capabilities |= capabilities;
-- wl_list_for_each(resource, &seat.resources, link)
-- wl_seat_send_capabilities(resource, seat.capabilities);
--}
--
--static int
--open_restricted(const char *path, int flags, void *user_data)
--{
-- return launch_open_device(path, flags);
--}
--
--static void
--close_restricted(int fd, void *user_data)
--{
-- close(fd);
--}
--
--const struct libinput_interface libinput_interface = {
-- .open_restricted = open_restricted,
-- .close_restricted = close_restricted,
-+ .pointer = NULL,
-+ .keyboard = NULL,
-+ .data_device = NULL,
- };
-
--static uint32_t
--device_capabilities(struct libinput_device *device)
--{
-- uint32_t capabilities = 0;
--
-- if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_KEYBOARD))
-- capabilities |= WL_SEAT_CAPABILITY_KEYBOARD;
-- if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_POINTER))
-- capabilities |= WL_SEAT_CAPABILITY_POINTER;
-- /* TODO: Add touch device support
-- * if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TOUCH))
-- * capabilities |= WL_SEAT_CAPABILITY_TOUCH;
-- */
--
-- return capabilities;
--}
--
--static void
--handle_libinput_axis_event(struct libinput_event_pointer *event, enum libinput_pointer_axis axis)
--{
-- wl_fixed_t amount;
--
-- if (!libinput_event_pointer_has_axis(event, axis))
-- return;
--
-- amount = wl_fixed_from_double(libinput_event_pointer_get_axis_value(event, axis));
-- pointer_handle_axis(&seat.pointer, libinput_event_pointer_get_time(event), axis, amount);
--}
--
--static int
--handle_libinput_data(int fd, uint32_t mask, void *data)
--{
-- struct screen *screen;
-- struct swc_rectangle *rect;
-- struct libinput_event *generic_event;
-- struct libinput_device *device;
-- union {
-- struct libinput_event_keyboard *k;
-- struct libinput_event_pointer *p;
-- } event;
-- wl_fixed_t x, y;
-- uint32_t time, key, state;
--
-- if (libinput_dispatch(seat.libinput) != 0) {
-- WARNING("libinput_dispatch failed: %s\n", strerror(errno));
-- return 0;
-- }
--
-- while ((generic_event = libinput_get_event(seat.libinput))) {
-- switch (libinput_event_get_type(generic_event)) {
-- case LIBINPUT_EVENT_DEVICE_ADDED:
-- device = libinput_event_get_device(generic_event);
-- update_capabilities(device_capabilities(device));
-- if (swc.manager->new_device)
-- swc.manager->new_device(device);
-- break;
-- case LIBINPUT_EVENT_KEYBOARD_KEY:
-- event.k = libinput_event_get_keyboard_event(generic_event);
-- time = libinput_event_keyboard_get_time(event.k);
-- key = libinput_event_keyboard_get_key(event.k);
-- state = libinput_event_keyboard_get_key_state(event.k);
-- keyboard_handle_key(&seat.keyboard, time, key, state);
-- break;
-- case LIBINPUT_EVENT_POINTER_MOTION:
-- event.p = libinput_event_get_pointer_event(generic_event);
-- time = libinput_event_pointer_get_time(event.p);
-- x = wl_fixed_from_double(libinput_event_pointer_get_dx(event.p));
-- y = wl_fixed_from_double(libinput_event_pointer_get_dy(event.p));
-- pointer_handle_relative_motion(&seat.pointer, time, x, y);
-- break;
-- case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE:
-- screen = wl_container_of(swc.screens.next, screen, link);
-- rect = &screen->base.geometry;
-- event.p = libinput_event_get_pointer_event(generic_event);
-- time = libinput_event_pointer_get_time(event.p);
-- x = wl_fixed_from_double(libinput_event_pointer_get_absolute_x_transformed(event.p, rect->width));
-- y = wl_fixed_from_double(libinput_event_pointer_get_absolute_y_transformed(event.p, rect->height));
-- pointer_handle_absolute_motion(&seat.pointer, time, x, y);
-- break;
-- case LIBINPUT_EVENT_POINTER_BUTTON:
-- event.p = libinput_event_get_pointer_event(generic_event);
-- time = libinput_event_pointer_get_time(event.p);
-- key = libinput_event_pointer_get_button(event.p);
-- state = libinput_event_pointer_get_button_state(event.p);
-- pointer_handle_button(&seat.pointer, time, key, state);
-- if (state == LIBINPUT_BUTTON_STATE_PRESSED) {
-- /* qemu generates GEAR_UP/GEAR_DOWN events on scroll, so pass
-- * those through as axis events. */
-- switch (key) {
-- case BTN_GEAR_DOWN:
-- pointer_handle_axis(&seat.pointer, time, WL_POINTER_AXIS_VERTICAL_SCROLL, wl_fixed_from_int(10));
-- break;
-- case BTN_GEAR_UP:
-- pointer_handle_axis(&seat.pointer, time, WL_POINTER_AXIS_VERTICAL_SCROLL, wl_fixed_from_int(-10));
-- break;
-- }
-- }
-- break;
-- case LIBINPUT_EVENT_POINTER_AXIS:
-- event.p = libinput_event_get_pointer_event(generic_event);
-- handle_libinput_axis_event(event.p, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
-- handle_libinput_axis_event(event.p, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
-- break;
-- default:
-- break;
-- }
--
-- libinput_event_destroy(generic_event);
-- }
--
-- return 0;
--}
--
- bool
- initialize_libinput(const char *seat_name)
- {
--#ifdef ENABLE_LIBUDEV
-- if (!(seat.udev = udev_new())) {
-- ERROR("Could not create udev context\n");
-- goto error0;
-- }
--
-- seat.libinput = libinput_udev_create_context(&libinput_interface, NULL, seat.udev);
--#else
-- seat.libinput = libinput_netlink_create_context(&libinput_interface, NULL);
--#endif
--
-- if (!seat.libinput) {
-- ERROR("Could not create libinput context\n");
-- goto error1;
-- }
--
--#ifdef ENABLE_LIBUDEV
-- if (libinput_udev_assign_seat(seat.libinput, seat_name) != 0) {
-- ERROR("Failed to assign seat to libinput context\n");
-- goto error2;
-- }
--#else
-- if (libinput_netlink_assign_seat(seat.libinput, seat_name) != 0) {
-- ERROR("Failed to assign seat to libinput context\n");
-- goto error2;
-- }
--#endif
--
-- seat.libinput_source = wl_event_loop_add_fd
-- (swc.event_loop, libinput_get_fd(seat.libinput), WL_EVENT_READABLE,
-- &handle_libinput_data, NULL);
--
-- if (!seat.libinput_source) {
-- ERROR("Could not create event source for libinput\n");
-- goto error2;
-- }
--
-- if (!swc.active)
-- libinput_suspend(seat.libinput);
--
-- return true;
--
--error2:
-- libinput_unref(seat.libinput);
--error1:
--#ifdef ENABLE_LIBUDEV
-- udev_unref(seat.udev);
--error0:
--#endif
- return false;
- }
-
- bool
- seat_initialize(const char *seat_name)
- {
-- if (!(seat.name = strdup(seat_name))) {
-- ERROR("Could not allocate seat name string\n");
-- goto error0;
-- }
--
-- seat.global = wl_global_create(swc.display, &wl_seat_interface, 4, NULL, &bind_seat);
--
-- if (!seat.global)
-- goto error1;
--
-- seat.capabilities = 0;
-- wl_list_init(&seat.resources);
-- seat.swc_listener.notify = &handle_swc_event;
-- wl_signal_add(&swc.event_signal, &seat.swc_listener);
--
-- if (!data_device_initialize(&seat.data_device)) {
-- ERROR("Could not initialize data device\n");
-- goto error2;
-- }
--
-- wl_signal_add(&seat.data_device.event_signal, &data_device_listener);
--
-- if (!keyboard_initialize(&seat.keyboard)) {
-- ERROR("Could not initialize keyboard\n");
-- goto error3;
-- }
--
-- wl_signal_add(&seat.keyboard.focus.event_signal, &keyboard_focus_listener);
--
-- if (!pointer_initialize(&seat.pointer)) {
-- ERROR("Could not initialize pointer\n");
-- goto error4;
-- }
--
-- if (!initialize_libinput(seat.name))
-- goto error5;
--
-- return true;
--
--error5:
-- pointer_finalize(&seat.pointer);
--error4:
-- keyboard_finalize(&seat.keyboard);
--error3:
-- data_device_finalize(&seat.data_device);
--error2:
-- wl_global_destroy(seat.global);
--error1:
-- free(seat.name);
--error0:
- return false;
- }
-
- void
- seat_finalize(void)
- {
-- wl_event_source_remove(seat.libinput_source);
-- libinput_unref(seat.libinput);
--#ifdef ENABLE_LIBUDEV
-- udev_unref(seat.udev);
--#endif
--
-- pointer_finalize(&seat.pointer);
-- keyboard_finalize(&seat.keyboard);
-- data_device_finalize(&seat.data_device);
-
-- wl_global_destroy(seat.global);
-- free(seat.name);
- }
diff --git a/swc/patches/patch-libswc_shm.c b/swc/patches/patch-libswc_shm.c
deleted file mode 100644
index 0c76bf1fab..0000000000
--- a/swc/patches/patch-libswc_shm.c
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
---- libswc/shm.c.orig 2019-07-11 06:33:41.000000000 +0000
-+++ libswc/shm.c
-@@ -47,7 +47,7 @@ static struct {
- struct pool {
- struct wl_resource *resource;
- void *data;
-- uint32_t size;
-+ size_t size;
- unsigned references;
- };
-
-@@ -144,12 +144,15 @@ destroy(struct wl_client *client, struct
- }
-
- static void
--resize(struct wl_client *client, struct wl_resource *resource, int32_t size)
-+resize(struct wl_client *client, struct wl_resource *resource, size_t size)
- {
- struct pool *pool = wl_resource_get_user_data(resource);
- void *data;
-
-- data = mremap(pool->data, pool->size, size, MREMAP_MAYMOVE);
-+#ifndef MREMAP_MAYMOVE
-+#define MREMAP_MAYMOVE 0
-+#endif
-+ data = mremap(pool->data, pool->size, size, MREMAP_MAYMOVE, NULL);
-
- if (data == MAP_FAILED) {
- wl_resource_post_error(resource, WL_SHM_ERROR_INVALID_FD, "mremap failed: %s", strerror(errno));
-@@ -167,7 +170,7 @@ static struct wl_shm_pool_interface shm_
- };
-
- static void
--create_pool(struct wl_client *client, struct wl_resource *resource, uint32_t id, int32_t fd, int32_t size)
-+create_pool(struct wl_client *client, struct wl_resource *resource, uint32_t id, int32_t fd, size_t size)
- {
- struct pool *pool;
-
diff --git a/velox/DESCR b/velox/DESCR
deleted file mode 100644
index b0d3a22fd7..0000000000
--- a/velox/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-velox is a simple window manager based on swc. It is inspired by
-dwm and xmonad.
-
-velox uses tag-based window management similar to dwm. This allows
-you to construct your workspace by selecting a set of tags to work
-with. However, in contrast with dwm, windows do not have any screen
-associated with them; they are shown on whichever screen has their
-tag selected, allowing you to easily move windows between screens
-by selecting their tag on a different screen. This is similar to
-the multi-monitor workspace switching in xmonad.
-
-To ensure that we never attempt to show a window in two places at
-once, we have to impose several constraints. First, each window
-must have exactly one tag. In practice, I've found that I rarely
-intentionally mark a window with more than one tag anyway. Second,
-when you select a tag that is currently display on a different
-screen, the tag is first deselected from that screen.
diff --git a/velox/Makefile b/velox/Makefile
deleted file mode 100644
index 20e1dba6b0..0000000000
--- a/velox/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2018/08/22 09:43:57 wiz Exp $
-
-GIT_COMMIT= 2d673e1a76c9e6fa504a03444ba53913f1ef872d
-DISTNAME= ${GIT_COMMIT}
-PKGNAME= velox-0.0.20190810
-CATEGORIES= wm
-MASTER_SITES= ${MASTER_SITE_GITHUB:=michaelforney/velox/archive/}
-EXTRACT_SUFX= .zip
-DIST_SUBDIR= velox-${GIT_COMMIT}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://github.com/michaelforney/velox
-COMMENT= simple window manager based on swc
-LICENSE= mit
-
-USE_TOOLS+= gmake pkg-config
-
-WRKSRC= ${WRKDIR}/velox-${GIT_COMMIT}
-
-PKGCONFIG_OVERRIDE+= velox.pc.in
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "Linux"
-CFLAGS+= -I${BUILDLINK_PREFIX.libepoll-shim}/include/libepoll-shim
-.include "../../wip/libepoll-shim/buildlink3.mk"
-.endif
-
-.include "../../wip/swc/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/velox/PLIST b/velox/PLIST
deleted file mode 100644
index 3775a1fece..0000000000
--- a/velox/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD$
-bin/velox
-lib/pkgconfig/velox.pc
-libexec/velox/status_bar
-share/velox/velox.xml
diff --git a/velox/distinfo b/velox/distinfo
deleted file mode 100644
index 27ea44e951..0000000000
--- a/velox/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD$
-
-SHA1 (velox-2d673e1a76c9e6fa504a03444ba53913f1ef872d/2d673e1a76c9e6fa504a03444ba53913f1ef872d.zip) = f7777e86201baa6b8918b6cd616cb7dafd21ec6a
-RMD160 (velox-2d673e1a76c9e6fa504a03444ba53913f1ef872d/2d673e1a76c9e6fa504a03444ba53913f1ef872d.zip) = 38d14174f488f244abc401fa82b3b8a390877dde
-SHA512 (velox-2d673e1a76c9e6fa504a03444ba53913f1ef872d/2d673e1a76c9e6fa504a03444ba53913f1ef872d.zip) = 72f98495a87171d061607af3108e562a27d3600a4b01d9b1a5667bc174210da93d3bf517a29d99efbd4b58c191afe404121af3fe8d879b4188411c8d857cf9aa
-Size (velox-2d673e1a76c9e6fa504a03444ba53913f1ef872d/2d673e1a76c9e6fa504a03444ba53913f1ef872d.zip) = 41088 bytes
-SHA1 (patch-config.c) = c01d37f038097063806d1bd370373dd6eb87a3d2
-SHA1 (patch-config.mk) = 578e979d3c6e967e5c1e4224f29a6c53ef009114
diff --git a/velox/patches/patch-config.c b/velox/patches/patch-config.c
deleted file mode 100644
index afd6be18f8..0000000000
--- a/velox/patches/patch-config.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
---- config.c.orig 2019-06-15 23:36:40.000000000 +0000
-+++ config.c
-@@ -27,7 +27,9 @@
- #include "velox.h"
-
- #include <fcntl.h>
-+#ifdef __linux__
- #include <linux/input.h>
-+#endif
- #include <spawn.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -291,6 +293,7 @@ parse_key(char *s, uint32_t *value)
- static bool
- parse_button(char *s, uint32_t *value)
- {
-+#ifndef __NetBSD__
- if (strcmp(s, "left") == 0)
- *value = BTN_LEFT;
- else if (strcmp(s, "right") == 0)
-@@ -303,7 +306,7 @@ parse_button(char *s, uint32_t *value)
- *value = BTN_EXTRA;
- else
- return false;
--
-+#endif
- return true;
- }
-
diff --git a/velox/patches/patch-config.mk b/velox/patches/patch-config.mk
deleted file mode 100644
index a830ca2494..0000000000
--- a/velox/patches/patch-config.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- config.mk.orig 2019-06-15 23:36:40.000000000 +0000
-+++ config.mk
-@@ -1,7 +1,7 @@
- # velox: config.mk
-
- CC = gcc
--CFLAGS = -pipe
-+CFLAGS ?= -pipe
-
- ENABLE_DEBUG = 1
-
diff --git a/wld/DESCR b/wld/DESCR
deleted file mode 100644
index c5ca3b412b..0000000000
--- a/wld/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-wld is a drawing library that targets Wayland.
diff --git a/wld/Makefile b/wld/Makefile
deleted file mode 100644
index 86cb639bfc..0000000000
--- a/wld/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2018/08/22 09:43:57 wiz Exp $
-
-GIT_COMMIT= dfa8f7981b612fb7d827776b1810f504dd6add10
-DISTNAME= ${GIT_COMMIT}
-PKGNAME= wld-0.0.20190810
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GITHUB:=michaelforney/wld/archive/}
-EXTRACT_SUFX= .zip
-DIST_SUBDIR= wld-${GIT_COMMIT}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://github.com/michaelforney/wld
-COMMENT= drawing library that targets Wayland
-LICENSE= mit
-
-USE_TOOLS+= gmake pkg-config
-
-WRKSRC= ${WRKDIR}/wld-${GIT_COMMIT}
-
-CFLAGS.NetBSD+= -D_NETBSD_SOURCE
-
-PKGCONFIG_OVERRIDE+= wld.pc.in
-
-.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/libdrm/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../devel/wayland/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/wld/PLIST b/wld/PLIST
deleted file mode 100644
index 7ec987b58f..0000000000
--- a/wld/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD$
-include/wld/drm.h
-include/wld/pixman.h
-include/wld/wayland.h
-include/wld/wld.h
-lib/libwld.a
-lib/libwld.so
-lib/libwld.so.0
-lib/libwld.so.0.0
-lib/pkgconfig/wld.pc
diff --git a/wld/buildlink3.mk b/wld/buildlink3.mk
deleted file mode 100644
index 984363bb8b..0000000000
--- a/wld/buildlink3.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= wld
-
-.if !defined(WLD_BUILDLINK3_MK)
-WLD_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.wld+= wld>=0.0.20190810
-BUILDLINK_PKGSRCDIR.wld?= ../../wip/wld
-
-.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/libdrm/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../devel/wayland/buildlink3.mk"
-.endif # WLD_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -wld
diff --git a/wld/distinfo b/wld/distinfo
deleted file mode 100644
index 8ee4d14268..0000000000
--- a/wld/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD$
-
-SHA1 (wld-dfa8f7981b612fb7d827776b1810f504dd6add10/dfa8f7981b612fb7d827776b1810f504dd6add10.zip) = 8cf522ee7ca8e523a431af75c820bd63a2046ba0
-RMD160 (wld-dfa8f7981b612fb7d827776b1810f504dd6add10/dfa8f7981b612fb7d827776b1810f504dd6add10.zip) = b3c2a090c17fd77734ce5d9a4af884ad27e47d8f
-SHA512 (wld-dfa8f7981b612fb7d827776b1810f504dd6add10/dfa8f7981b612fb7d827776b1810f504dd6add10.zip) = 5738167775131a74808f541474408d7d3725c74156ac922e8c0c926c6b64f2e46e49eaa0c6144f93ee40d18b6d7744eebaaa64cc133fd96ec238961bb635a7db
-Size (wld-dfa8f7981b612fb7d827776b1810f504dd6add10/dfa8f7981b612fb7d827776b1810f504dd6add10.zip) = 91237 bytes
-SHA1 (patch-config.mk) = ffdd5a50878aa5b502ead250cfdc37dbd9a6ddc5
-SHA1 (patch-drm.c) = 69eb599e731f9464f6dff228d9c33c5bda233e15
diff --git a/wld/patches/patch-config.mk b/wld/patches/patch-config.mk
deleted file mode 100644
index 98054fbb4e..0000000000
--- a/wld/patches/patch-config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Allow overriding CFLAGS. We need -D_NETBSD_SOURCE for mkostemp.
-
---- config.mk.orig 2019-07-11 05:37:37.000000000 +0000
-+++ config.mk
-@@ -1,7 +1,7 @@
- # wld: config.mk
-
- CC = gcc
--CFLAGS = -pipe
-+CFLAGS ?= -pipe
-
- ENABLE_DEBUG = 1
- ENABLE_STATIC = 1
diff --git a/wld/patches/patch-drm.c b/wld/patches/patch-drm.c
deleted file mode 100644
index 0b21375263..0000000000
--- a/wld/patches/patch-drm.c
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-Exclude sysmacros.h except on linux.
-Exclude code to decipher driver from fd on netbsd - TODO?
-
---- drm.c.orig 2019-07-11 05:37:37.000000000 +0000
-+++ drm.c
-@@ -24,7 +24,10 @@
- #include "drm.h"
- #include "drm-private.h"
-
-+#ifdef __linux__
- #include <sys/sysmacros.h>
-+#endif
-+#include <sys/types.h>
-
- const static struct drm_driver *drivers[] = {
- #if WITH_DRM_INTEL
-@@ -39,6 +42,7 @@ const static struct drm_driver *drivers[
- static const struct drm_driver *
- find_driver(int fd)
- {
-+#ifndef __NetBSD__ /* XXX */
- char path[64], id[32];
- uint32_t vendor_id, device_id;
- char *path_part;
-@@ -85,6 +89,7 @@ find_driver(int fd)
- return NULL;
-
- dumb:
-+#endif
- return &dumb_drm_driver;
- }
-
Home |
Main Index |
Thread Index |
Old Index