Date: Thu, 26 Feb 2009 19:33:48 GMT From: bf <bf2006a@yahoo.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/132136: [PATCH] x11-drivers/xf86-video-nouveau: unbreak build after libdrm update Message-ID: <200902261933.n1QJXmls090132@www.freebsd.org> Resent-Message-ID: <200902261940.n1QJe3h2033622@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 132136 >Category: ports >Synopsis: [PATCH] x11-drivers/xf86-video-nouveau: unbreak build after libdrm update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Feb 26 19:40:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: bf >Release: 8-CURRENT i386 >Organization: - >Environment: >Description: The recent update to libdrm 2.45 broke the build because the check on line 263 of src/nv_dri.c now fails with the new libdrm headers. Either update to a later snapshot of the nouveau driver, or add a patch to change the check to != 12, as has been done in the later versions of the driver, or relax the check, as in the attached patch. The patch seems to yield a driver that doesn't work any worse than before, although I have not traced every change in the libdrm source to see if it will cause problems. b. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN xf86-video-nouveau.orig/files/patch-src_nv_dri.c xf86-video-nouveau/files/patch-src_nv_dri.c --- xf86-video-nouveau.orig/files/patch-src_nv_dri.c 1970-01-01 00:00:00.000000000 +0000 +++ xf86-video-nouveau/files/patch-src_nv_dri.c 2009-02-26 18:48:49.000000000 +0000 @@ -0,0 +1,11 @@ +--- src/nv_dri.c.orig 2009-02-26 18:47:01.000000000 +0000 ++++ src/nv_dri.c 2009-02-26 18:47:47.000000000 +0000 +@@ -259,7 +259,7 @@ + } + + /* temporary lock step versioning */ +-#if NOUVEAU_DRM_HEADER_PATCHLEVEL != 11 ++#if NOUVEAU_DRM_HEADER_PATCHLEVEL < 11 + #error nouveau_drm.h does not match expected patchlevel, update libdrm. + #endif + if (pNv->pKernelDRMVersion->version_patchlevel != >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902261933.n1QJXmls090132>