Date: Tue, 05 Feb 2019 04:23:51 +0000 From: bugzilla-noreply@freebsd.org To: x11@FreeBSD.org Subject: [Bug 196678] x11-servers/xorg-server: Update to 1.20.3 + make config/devd recognize /dev/input/eventX from multimedia/webcamd Message-ID: <bug-196678-7141-nyV6Hxwp0v@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-196678-7141@https.bugs.freebsd.org/bugzilla/> References: <bug-196678-7141@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D196678 --- Comment #108 from pete@nomadlogic.org --- (In reply to Vladimir Kondratyev from comment #101) Hi there, it looks like the ports tree has moved forward enough where this patch won't apply cleanly anymore. I've started to work through it, but I haven't made much progress.=20=20 I've identified these failure to patch issues: 1) net/tigervnc/Makefile: |Index: net/tigervnc/Makefile |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- net/tigervnc/Makefile (revision 483043) |+++ net/tigervnc/Makefile (working copy) -------------------------- Patching file net/tigervnc/Makefile using Plan A... Hunk #1 succeeded at 33 with fuzz 1 (offset -1 lines). Hunk #2 failed at 107. -- I've taken an initial look at this and am unsure as to the best course of action to move forward. it looks like the Makefile was updated to automagically determine the xorg-server version? 2) x11-server/xorg-server/Makefile |Index: x11-servers/xorg-server/Makefile |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- x11-servers/xorg-server/Makefile (revision 483043) |+++ x11-servers/xorg-server/Makefile (working copy) -------------------------- Patching file x11-servers/xorg-server/Makefile using Plan A... Hunk #1 failed at 2. Hunk #2 succeeded at 21. Hunk #3 succeeded at 68. Hunk #4 succeeded at 83. Hunk #5 succeeded at 93. -- This is easy enough, just a bump of PORTREVISION from "10" to "11" 2) x11-servers/xorg-server/files/patch-glamor_glamor__dash.c -------------------------- |Index: x11-servers/xorg-server/files/patch-glamor_glamor__dash.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- x11-servers/xorg-server/files/patch-glamor_glamor__dash.c (revision 483043) |+++ x11-servers/xorg-server/files/patch-glamor_glamor__dash.c (nonexisten= t) -------------------------- Patching file x11-servers/xorg-server/files/patch-glamor_glamor__dash.c usi= ng Plan A... Empty context always matches. Hunk #1 failed at 0. -- Not sure why this deletion is not working tbh. 3) x11-servers/xwayland/Makefile |Index: x11-servers/xwayland/Makefile |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- x11-servers/xwayland/Makefile (revision 483043) |+++ x11-servers/xwayland/Makefile (working copy) -------------------------- Patching file x11-servers/xwayland/Makefile using Plan A... Hunk #1 failed at 1. -- this is pretty trivial but haven't had a chance to update patch accordin= gly. we've just added some comments and a PORTREVISION line to the Makefile. Hope this helps someone if they can get to this before me :) --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-196678-7141-nyV6Hxwp0v>