/dev/drm0 -> /dev/dri/card0

This commit is contained in:
ajacoutot 2021-02-19 17:16:27 +00:00
parent eaf8dd1b35
commit 64129fdf86
6 changed files with 10 additions and 32 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2019/07/12 20:47:11 sthen Exp $
# $OpenBSD: Makefile,v 1.3 2021/02/19 17:16:27 ajacoutot Exp $
COMMENT= OpenGL API/window system abstraction
DISTNAME= waffle-1.5.2
@ -6,6 +6,7 @@ CATEGORIES= x11 graphics
HOMEPAGE= http://www.waffle-gl.org/
MASTER_SITES= ${HOMEPAGE}/files/release/${DISTNAME}/
EXTRACT_SUFX= .tar.xz
REVISION= 0
MAINTAINER= Jonathan Gray <jsg@openbsd.org>

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_waffle_gbm_wgbm_display_c,v 1.1.1.1 2015/12/26 03:00:13 jsg Exp $
$OpenBSD: patch-src_waffle_gbm_wgbm_display_c,v 1.2 2021/02/19 17:16:27 ajacoutot Exp $
--- src/waffle/gbm/wgbm_display.c.orig Wed Aug 26 07:05:10 2015
+++ src/waffle/gbm/wgbm_display.c Mon Dec 21 16:57:09 2015
@@ -29,11 +29,13 @@
@ -21,7 +21,7 @@ $OpenBSD: patch-src_waffle_gbm_wgbm_display_c,v 1.1.1.1 2015/12/26 03:00:13 jsg
wgbm_get_default_fd_for_pattern(const char *pattern)
{
+#ifdef __OpenBSD__
+ return open("/dev/drm0", O_RDWR, 0);
+ return open("/dev/dri/card0", O_RDWR, 0);
+#else
struct udev *ud;
struct udev_enumerate *en;

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.9 2019/07/12 20:51:09 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2021/02/19 17:16:27 ajacoutot Exp $
COMMENT = lightweight compositor for X, forked from xcompmgr-dana
V = 0.1_beta2
PKGNAME = compton-${V}
DISTNAME = compton-git-v0.1_beta2-2013-10-21
REVISION = 5
REVISION = 6
CATEGORIES = x11

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-src_compton_c,v 1.2 2019/05/24 17:43:05 thfr Exp $
$OpenBSD: patch-src_compton_c,v 1.3 2021/02/19 17:16:28 ajacoutot Exp $
Index: src/compton.c
--- src/compton.c.orig
+++ src/compton.c
@ -11,15 +12,6 @@ Index: src/compton.c
}
}
@@ -5825,7 +5827,7 @@ static bool
vsync_drm_init(session_t *ps) {
#ifdef CONFIG_VSYNC_DRM
// Should we always open card0?
- if (ps->drm_fd < 0 && (ps->drm_fd = open("/dev/dri/card0", O_RDWR)) < 0) {
+ if (ps->drm_fd < 0 && (ps->drm_fd = open("/dev/drm0", O_RDWR)) < 0) {
printf_errf("(): Failed to open device.");
return false;
}
@@ -6165,6 +6167,8 @@ init_filters(session_t *ps) {
return false;
}

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2020/11/24 16:28:32 kmos Exp $
# $OpenBSD: Makefile,v 1.5 2021/02/19 17:16:28 ajacoutot Exp $
COMMENT = lightweight compositor for X11
GH_ACCOUNT = yshui
GH_PROJECT = picom
GH_TAGNAME = v8.2
REVISION = 0
CATEGORIES = x11

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_vsync_c,v 1.1.1.1 2020/07/27 08:52:44 kirby Exp $
Use the correct drm(4) device node, found by Bryan Steele
Index: src/vsync.c
--- src/vsync.c.orig
+++ src/vsync.c
@@ -54,7 +54,7 @@ static int vsync_drm_wait(session_t *ps) {
*/
static bool vsync_drm_init(session_t *ps) {
// Should we always open card0?
- if (ps->drm_fd < 0 && (ps->drm_fd = open("/dev/dri/card0", O_RDWR)) < 0) {
+ if (ps->drm_fd < 0 && (ps->drm_fd = open("/dev/drm0", O_RDWR)) < 0) {
log_error("Failed to open device.");
return false;
}