Quantcast

Upgrade of xorg-server to 1.12.0,1 fails with dtrace error

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Upgrade of xorg-server to 1.12.0,1 fails with dtrace error

Conrad J. Sabatier
Just retrieved the xorg-dev/trunk tonight.  Everything installed OK
except for xorg-server.  Well, that and libglut, which failed to
install due to non-existent files in the do-install: target:

do-install:
    cd ${WRKSRC}/src/glut/glx; ${GMAKE} install
    ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
        ${WRKSRC}/include/GL/glutf90.h \
        ${PREFIX}/include/GL

Neither the src/glut/glx directory nor include/GL/glutf90.h exist in
the latest Mesa directory hierarchy.  I managed to upgrade mesa-demos
nonetheless by letting it install freeglut instead.

But the xorg-server errors have me totally confounded.  Anyone have any
clues as to what's going on here?

Making all in dix
gmake[1]: Entering directory
`/usr/ports/x11-servers/xorg-server/work/xorg-server-1.12.0/dix'
 GEN Xserver-dtrace.h
dtrace: failed to compile script ./Xserver.d:
"/usr/lib/dtrace/psinfo.d", line 37: syntax error near "uid_t"
gmake all-am
gmake[2]: Entering directory
`/usr/ports/x11-servers/xorg-server/work/xorg-server-1.12.0/dix'
 CC atom.lo
 CC     colormap.lo
 CC     cursor.lo
 CC     devices.lo
 CC     dispatch.lo
dispatch.c:1635:5: warning: declaration shadows a local variable
[-Wshadow] VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pDst,
DixWriteAccess); ^
../include/dix.h:91:6: note: expanded from:
        int rc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY,
mode);\ ^
dispatch.c:1631:9: note: previous declaration is here
    int rc;
        ^
dispatch.c:1676:5: warning: declaration shadows a local variable
[-Wshadow] VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pdstDraw,
DixWriteAccess); ^
../include/dix.h:91:6: note: expanded from:
        int rc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY,
mode);\ ^
dispatch.c:1672:9: note: previous declaration is here
    int rc;
        ^
2 warnings generated.
  CC     dixfonts.lo
  CC     dixutils.lo
  CC     enterleave.lo
  CC     events.lo
events.c:2059:67: warning: declaration shadows a variable in the global
scope [-Wshadow]
                      xEvent *events, Mask filter, InputClients
                      **clients)
                                                                  ^
../include/dix.h:124:28: note: previous declaration is here
extern _X_EXPORT ClientPtr clients[MAXCLIENTS];
                           ^
events.c:2145:19: warning: declaration shadows a variable in the global
scope [-Wshadow]
    InputClients *clients;
                  ^
../include/dix.h:124:28: note: previous declaration is here
extern _X_EXPORT ClientPtr clients[MAXCLIENTS];
                           ^
2 warnings generated.
  CC     eventconvert.lo
  CC     extension.lo
  CC     ffs.lo
  CC     gc.lo
  CC     getevents.lo
  CC     globals.lo
  CC     glyphcurs.lo
  CC     grabs.lo
  CC     initatoms.lo
  CC     inpututils.lo
  CC     pixmap.lo
  CC     privates.lo
  CC     property.lo
  CC     ptrveloc.lo
  CC     region.lo
  CC     registry.lo
  CC     resource.lo
  CC     selection.lo
  CC     swaprep.lo
  CC     swapreq.lo
  CC     tables.lo
  CC     touch.lo
touch.c:109:17: warning: declaration shadows a local variable [-Wshadow]
            int i;
                ^
touch.c:81:9: note: previous declaration is here
    int i;
        ^
1 warning generated.
  CC     window.lo
  CCLD   libdix.la
  CC     main.lo
  CCLD   libmain.la
  GEN    dtrace-dix.o
dtrace: failed to compile script ../dix/Xserver.d:
"/usr/lib/dtrace/psinfo.d", line 37: syntax error near "uid_t"
gmake[2]: *** [dtrace-dix.o] Error 1 gmake[2]: Leaving directory
`/usr/ports/x11-servers/xorg-server/work/xorg-server-1.12.0/dix'
gmake[1]: *** [all] Error 2 gmake[1]: Leaving directory
`/usr/ports/x11-servers/xorg-server/work/xorg-server-1.12.0/dix' gmake:
*** [all-recursive] Error 1 *** [do-build] Error code 1

Stop in /usr/ports/x11-servers/xorg-server.
*** [build] Error code 1

Stop in /usr/ports/x11-servers/xorg-server.

--
Conrad J. Sabatier
[hidden email]
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: Upgrade of xorg-server to 1.12.0,1 fails with dtrace error

Niclas Zeising-4
On 2012-04-12 06:23, Conrad J. Sabatier wrote:

> Just retrieved the xorg-dev/trunk tonight.  Everything installed OK
> except for xorg-server.  Well, that and libglut, which failed to
> install due to non-existent files in the do-install: target:
>
> do-install:
>     cd ${WRKSRC}/src/glut/glx; ${GMAKE} install
>     ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
>         ${WRKSRC}/include/GL/glutf90.h \
>         ${PREFIX}/include/GL
>
> Neither the src/glut/glx directory nor include/GL/glutf90.h exist in
> the latest Mesa directory hierarchy.  I managed to upgrade mesa-demos
> nonetheless by letting it install freeglut instead.

I have no clue about the dtrace errors, all I can say is that when I
last compiled the xorg-dev trunk it worked for me.  Be aware however
that the only supported implementation of GLUT in this tree is freeglut,
so you have to use that.
Regards!
--
Niclas
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: Upgrade of xorg-server to 1.12.0,1 fails with dtrace error

meowthink
In reply to this post by Conrad J. Sabatier
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
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: Upgrade of xorg-server to 1.12.0,1 fails with dtrace error

Conrad J. Sabatier
In reply to this post by Niclas Zeising-4
On Thu, 12 Apr 2012 11:35:00 +0200
Niclas Zeising <[hidden email]> wrote:

> On 2012-04-12 06:23, Conrad J. Sabatier wrote:
> > Just retrieved the xorg-dev/trunk tonight.  Everything installed OK
> > except for xorg-server.  Well, that and libglut, which failed to
> > install due to non-existent files in the do-install: target:
> >
> > do-install:
> >     cd ${WRKSRC}/src/glut/glx; ${GMAKE} install
> >     ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
> >         ${WRKSRC}/include/GL/glutf90.h \
> >         ${PREFIX}/include/GL
> >
> > Neither the src/glut/glx directory nor include/GL/glutf90.h exist in
> > the latest Mesa directory hierarchy.  I managed to upgrade
> > mesa-demos nonetheless by letting it install freeglut instead.
>
> I have no clue about the dtrace errors, all I can say is that when I
> last compiled the xorg-dev trunk it worked for me.  Be aware however
> that the only supported implementation of GLUT in this tree is
> freeglut, so you have to use that.
> Regards!

Well, thanks for confirming that part of it for me, at least.  :-)

I am clueless as to how to fix those weird errors involving dtrace
scripts.  I've never encountered those before and have no idea how to
proceed.

Oh, well, X is working, just not at the current trunk version.  I'll
live.  :-)

Take care,

Conrad

--
Conrad J. Sabatier
[hidden email]
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: Upgrade of xorg-server to 1.12.0,1 fails with dtrace error

Conrad J. Sabatier
In reply to this post by meowthink
On Thu, 12 Apr 2012 07:01:50 -0700 (PDT)
meowthink <[hidden email]> 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

Oh, thank you very much!  I was completely at a loss here.

I'll try that.

--
Conrad J. Sabatier
[hidden email]
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: Upgrade of xorg-server to 1.12.0,1 fails with dtrace error

Conrad J. Sabatier
In reply to this post by meowthink
On Thu, 12 Apr 2012 07:01:50 -0700 (PDT)
meowthink <[hidden email]> 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
[hidden email]
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: Upgrade of xorg-server to 1.12.0,1 fails with dtrace error

Conrad J. Sabatier
On Fri, 13 Apr 2012 03:29:21 -0500
"Conrad J. Sabatier" <[hidden email]> wrote:

> On Thu, 12 Apr 2012 07:01:50 -0700 (PDT)
> meowthink <[hidden email]> 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.  :-(

Well, after a bit more bit-twiddling, I finally managed to compile it.
I wound up using a hybrid of the files in the xorg-dev trunk and the
patchset posted earlier by "meowthink".

I love Happy Endings.  :-)

--
Conrad J. Sabatier
[hidden email]
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Loading...