Hi, This breaks ARM builds for xorg in MeeGo:1.2:oss, could you please %ifarch the patch or fix it for ARM?
BR Carsten Munk 2011/5/23 Prajwal Mohan <[email protected]>: > Hi, > I have made the following changes to xorg-x11-server in project > MeeGo:1.2:oss. Please review and accept ASAP. > > Thank You, > Prajwal Mohan > > [This message was auto-generated] > > --- > > Request #18970: > > submit: MeeGo:1.2:oss:Testing/xorg-x11-server(r2) -> > MeeGo:1.2:oss/xorg-x11-server > > > Message: > Promoting to MeeGo:1.2:oss > > State: new 2011-05-23T09:51:38 praj > Comment: None > > > > changes files: > -------------- > --- xorg-x11-server.changes > +++ xorg-x11-server.changes > @@ -0,0 +1,3 @@ > +* Fri May 20 2011 Li Peng <[email protected]> - 1.9.0 > +- Fix BMC #7894 (High input event rate cause X crash) > + > > new: > ---- > handle-signal-in-xserver-better.patch > > spec files: > ----------- > --- xorg-x11-server.spec > +++ xorg-x11-server.spec > @@ -35,6 +35,7 @@ > Patch15: GetTimeInMillis-Use-CLOCK_MONOTONIC_COARSE.patch > Patch16: Suppress-exposures-and-implicit-painting-for-some-re.patch > Patch17: handle-device-change-event-properly.patch > +Patch18: handle-signal-in-xserver-better.patch > Requires: libdrm >= 2.4.0 > BuildRequires: pkgconfig(xorg-macros) > BuildRequires: pkgconfig(scrnsaverproto) > @@ -208,6 +209,8 @@ > %patch16 -p1 > # handle-device-change-event-properly.patch > %patch17 -p1 > +# handle-signal-in-xserver-better.patch > +%patch18 -p1 > # >> setup > # << setup > > > other changes: > -------------- > > ++++++ handle-signal-in-xserver-better.patch (new) > --- handle-signal-in-xserver-better.patch > +++ handle-signal-in-xserver-better.patch > +--- xorg-server-1.9.0/hw/xfree86/os-support/shared/sigio.c 2010-06-06 > 04:16:52.000000000 +0300 > ++++ xorg-server-1.9.0.new/hw/xfree86/os-support/shared/sigio.c 2011-05-19 > 20:43:23.601468691 +0300 > +@@ -63,6 +63,9 @@ > + # include "xf86_OSlib.h" > + # include "inputstr.h" > + > ++# include <fcntl.h> > ++# include <sys/syscall.h> > ++ > + #ifdef HAVE_STROPTS_H > + # include <stropts.h> > + #endif > +@@ -136,6 +139,20 @@ > + return S_ISFIFO(buf.st_mode); > + } > + > ++#ifndef F_SETOWN_EX > ++#define F_SETOWN_EX 15 > ++#define F_GETOWN_EX 16 > ++#endif > ++ > ++#define F_OWNER_TID 0 > ++#define F_OWNER_PID 1 > ++#define F_OWNER_PGRP 2 > ++ > ++struct f_owner_ex { > ++ int type; > ++ __kernel_pid_t pid; > ++}; > ++ > + int > + xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure) > + { > +@@ -160,8 +177,13 @@ > + xf86Msg(X_WARNING, "fcntl(%d, O_ASYNC): %s\n", > + fd, strerror(errno)); > + } else { > +- if (fcntl(fd, F_SETOWN, getpid()) == -1) { > +- xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n", > ++ struct f_owner_ex arg; > ++ > ++ arg.type = F_OWNER_TID; > ++ arg.pid = syscall(SYS_gettid); > ++ > ++ if (fcntl(fd, F_SETOWN_EX, &arg) == -1) { > ++ xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN_EX): %s\n", > + fd, strerror(errno)); > + } else { > + installed = TRUE; > > ++++++ xorg-x11-server.yaml > --- xorg-x11-server.yaml > +++ xorg-x11-server.yaml > @@ -26,6 +26,7 @@ > - GetTimeInMillis-Use-CLOCK_MONOTONIC_COARSE.patch > - Suppress-exposures-and-implicit-painting-for-some-re.patch > - handle-device-change-event-properly.patch > + - handle-signal-in-xserver-better.patch > > Requires: > - libdrm >= 2.4.0 > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits > _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
