[CFT] xorg 7.7

[Waitman Gobble]

Niclas Zeising <zeising at freebsd.org> wrote ..
> The FreeBSD xorg team (x11@) presents this update of the FreeBSD xorg
> port to version 7.7.

> This CFT and any updates can either be obtained using SVN from
> https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7 .
> Once this ports overlay is obtained, it is necessary to run the
> xorgmerge script, obtainable here:
> http://people.freebsd.org/~miwi/xorg/xorgmerge .
> Please don't forget to update directories before running this script.

> 
> Once the patch is in your ports tree, to build the old xorg, just cd to
> /usr/ports/x11/xorg and run make install.
> To get the new xorg, first set WITH_NEW_XORG in /etc/make.conf then
> proceed as above.
> 
> Niclas Zeising
> on behalf of the FreeBSD x11@ team


Hi, I am trying the xorgmerge w/ svn (after svn update ports)

I'm getting 'touch' errors.

..
  CC       XExtInt.lo
XExtInt.c:125:27: error: unknown type name 'xXITouchOwnershipEvent'; did you
      mean 'XITouchOwnershipEvent'?
wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in,
                          ^~~~~~~~~~~~~~~~~~~~~~
                          XITouchOwnershipEvent
./include/X11/extensions/XInput2.h:339:3: note: 'XITouchOwnershipEvent'
      declared here
} XITouchOwnershipEvent;
  ^
XExtInt.c:128:20: error: unknown type name 'xXIBarrierEvent'; did you mean
      'XIBarrierEvent'?
wireToBarrierEvent(xXIBarrierEvent *in,
                   ^~~~~~~~~~~~~~~
                   XIBarrierEvent
./include/X11/extensions/XInput2.h:361:3: note: 'XIBarrierEvent' declared here
} XIBarrierEvent;
  ^
XExtInt.c:224:33: warning: passing 'const char *' to parameter of type 'char *'
      discards qualifiers [-Wincompatible-pointer-types]
                                xinput_extension_name,
                                ^~~~~~~~~~~~~~~~~~~~~
/usr/local/include/X11/extensions/extutil.h:126:26: note: passing argument to
      parameter here
    char*               /* ext_name */,
                                      ^
XExtInt.c:951:14: error: use of undeclared identifier 'XI_TouchBegin'; did you
      mean 'XIGrabTouchBegin'?
        case XI_TouchBegin:
             ^~~~~~~~~~~~~
             XIGrabTouchBegin
./include/X11/extensions/XInput2.h:546:12: note: 'XIGrabTouchBegin' declared
      here
extern int XIGrabTouchBegin(
           ^
XExtInt.c:951:14: error: expression is not an integer constant expression
        case XI_TouchBegin:
             ^~~~~~~~~~~~~
XExtInt.c:952:14: error: use of undeclared identifier 'XI_TouchUpdate'
        case XI_TouchUpdate:
             ^
XExtInt.c:953:14: error: use of undeclared identifier 'XI_TouchEnd'
        case XI_TouchEnd:
             ^
XExtInt.c:980:14: error: use of undeclared identifier 'XI_TouchOwnership'
        case XI_TouchOwnership:
             ^
XExtInt.c:982:45: error: use of undeclared identifier 'xXITouchOwnershipEvent';
      did you mean 'XITouchOwnershipEvent'?
            if (!wireToTouchOwnershipEvent((xXITouchOwnershipEvent*)event,
                                            ^
XExtInt.c:982:68: error: expected expression
            if (!wireToTouchOwnershipEvent((xXITouchOwnershipEvent*)event,
                                                                   ^
XExtInt.c:996:14: error: use of undeclared identifier 'XI_RawTouchBegin'; did
      you mean 'XIGrabTouchBegin'?
        case XI_RawTouchBegin:
             ^~~~~~~~~~~~~~~~
             XIGrabTouchBegin
./include/X11/extensions/XInput2.h:546:12: note: 'XIGrabTouchBegin' declared
      here
extern int XIGrabTouchBegin(
           ^
XExtInt.c:996:14: error: expression is not an integer constant expression
        case XI_RawTouchBegin:
             ^~~~~~~~~~~~~~~~
XExtInt.c:997:14: error: use of undeclared identifier 'XI_RawTouchUpdate'
        case XI_RawTouchUpdate:
             ^
XExtInt.c:998:14: error: use of undeclared identifier 'XI_RawTouchEnd'
        case XI_RawTouchEnd:
             ^
XExtInt.c:1028:14: error: use of undeclared identifier 'XI_BarrierHit'
        case XI_BarrierHit:
             ^
XExtInt.c:1029:14: error: use of undeclared identifier 'XI_BarrierLeave'
        case XI_BarrierLeave:
             ^
XExtInt.c:1031:38: error: use of undeclared identifier 'xXIBarrierEvent'; did
      you mean 'XIBarrierEvent'?
            if (!wireToBarrierEvent((xXIBarrierEvent*)event, cookie))
                                     ^
XExtInt.c:1031:54: error: expected expression
            if (!wireToBarrierEvent((xXIBarrierEvent*)event, cookie))
                                                     ^
XExtInt.c:1140:14: error: use of undeclared identifier 'XIScrollClass'
        case XIScrollClass:
             ^
XExtInt.c:1143:14: error: use of undeclared identifier 'XITouchClass'
        case XITouchClass:
             ^
fatal error: too many errors emitted, stopping now [-ferror-limit=]
1 warning and 20 errors generated.
*** [XExtInt.lo] Error code 1


[7] > uname -a
FreeBSD dx.burplex.com 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r248165: Mon Mar 11 18:20:30 PDT 2013     root at dx.burplex.com:/usr/obj/usr/src/sys/FURAHA  amd64



Thank you,



-- 
Waitman Gobble
San Jose California USA