Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Apr 2012 03:29:21 -0500
From:      "Conrad J. Sabatier" <conrads@cox.net>
To:        meowthink <meowthink@gmail.com>
Cc:        freebsd-x11@freebsd.org
Subject:   Re: Upgrade of xorg-server to 1.12.0,1 fails with dtrace error
Message-ID:  <20120413032921.0613b021@cox.net>
In-Reply-To: <1334239310395-5635729.post@n5.nabble.com>
References:  <20120411232308.5c2007d5@cox.net> <1334239310395-5635729.post@n5.nabble.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 12 Apr 2012 07:01:50 -0700 (PDT)
meowthink <meowthink@gmail.com> wrote:

> You need add
> #define zoneid_t id_t
> to get d script compiled properly
> 
> A patch can be found here:
> http://www.freebsd.org/cgi/query-pr.cgi?pr=158529&cat=ports

The patch doesn't quite apply cleanly against the version currently in
the xorg-dev trunk.  Even so, I went back and hand-patched the broken
sections, and stillget the same errors with the dtrace stuff.  :-(

Here's the output from running the patch:

root:/usr/ports# patch -p0 < ~conrads/Downloads/xorg-server.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: x11-servers/xorg-server/Makefile
|===================================================================
|RCS file: /a/.cvsup/ports/x11-servers/xorg-server/Makefile,v
|retrieving revision 1.80
|diff -u -p -r1.80 Makefile
|--- x11-servers/xorg-server/Makefile	27 Feb 2011 23:16:09
-0000	1.80 |+++ x11-servers/xorg-server/Makefile	30 Jun
2011 08:04:53 -0000 --------------------------
Patching file x11-servers/xorg-server/Makefile using Plan A...
Hunk #1 failed at 36.
Hunk #2 succeeded at 138 (offset 14 lines).
1 out of 2 hunks failed--saving rejects to
x11-servers/xorg-server/Makefile.rej Hmm...  The next patch looks like
a unified diff to me... The text leading up to this was:
--------------------------
|Index: x11-servers/xorg-server/files/patch-dix-Xserver.d
|===================================================================
|RCS file: x11-servers/xorg-server/files/patch-dix-Xserver.d
|diff -N x11-servers/xorg-server/files/patch-dix-Xserver.d
|--- /dev/null	1 Jan 1970 00:00:00 -0000
|+++ x11-servers/xorg-server/files/patch-dix-Xserver.d	25 Jun
2011 04:08:20 -0000 --------------------------
(Creating file x11-servers/xorg-server/files/patch-dix-Xserver.d...)
Patching file x11-servers/xorg-server/files/patch-dix-Xserver.d using
Plan A... Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: x11-servers/xorg-server/files/patch-hw-xfree86-Makefile.in
|===================================================================
|RCS file: x11-servers/xorg-server/files/patch-hw-xfree86-Makefile.in
|diff -N x11-servers/xorg-server/files/patch-hw-xfree86-Makefile.in
|--- /dev/null	1 Jan 1970 00:00:00 -0000
|+++ x11-servers/xorg-server/files/patch-hw-xfree86-Makefile.in
25 Jun 2011 04:08:20 -0000 --------------------------
(Creating file
x11-servers/xorg-server/files/patch-hw-xfree86-Makefile.in...) Patching
file x11-servers/xorg-server/files/patch-hw-xfree86-Makefile.in using
Plan A... Hunk #1 succeeded at 1. done
root:/usr/ports# 

-- 
Conrad J. Sabatier
conrads@cox.net



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120413032921.0613b021>