Re: [PATCH] Massage cpp output before passing to awk for generating sdksyms.c
Hi,
On 11-02-15 17:04, Alan Coopersmith wrote:
Fixes build errors when using Solaris Studio 12.4 from getting the wrong
strings (such as __attribute__) put into the sdksyms function list.
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
Hmm, have you seen my patch to sdksyms.sh to fix buildign with gcc5's
cpp ? It is not a very good patch, but at least it sticks to awk only,
I do not think adding sed to the mix makes things better.
What we really need is someone who knows awk to step in and help us
with both our problems and fix things properly.
So does anyone know anyone who may be able to help out with fixing
the awk stuff ?
Regards,
Hans
---
hw/xfree86/Makefile.am |3 ++-
hw/xfree86/sdksyms.sh |7 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 27f2cc6..a600a75 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -135,7 +135,8 @@ CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh
EXTRA_DIST += sdksyms.sh
sdksyms.dep sdksyms.c: sdksyms.sh
- $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh
$(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
+ $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' SED='$(SED)' $(SHELL) \
+$(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS)
$(AM_CPPFLAGS)
SDKSYMS_DEP = sdksyms.dep
-include $(SDKSYMS_DEP)
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 2305073..3b9363a 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -314,7 +314,12 @@ shift
LC_ALL=C
export LC_ALL
${CPP:-cpp} $@ sdksyms.c /dev/null || exit $?
-${CPP:-cpp} $@ sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
+# Some cpps add spaces in the middle of __attribute__((visibility(...)))
+# so we need to remove them for the following awk script to work.
+${CPP:-cpp} $@ sdksyms.c | \
+${SED:-sed} -e 's/( /(/g' -e 's/_ (/_(/g' -e 's/ )/)/g' \
+-e 's/visibility (/visibility(/' | \
+${AWK:-awk} -v topdir=$topdir '
BEGIN {
sdk = 0;
print(/*);
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH] Fix border tile origin when background is ParentRelative
According to
http://www.x.org/releases/X11R7.7/doc/xproto/x11protocol.html#requests:CreateWindow
The border tile origin is always the same as the background tile
origin.
ChangeWindowAttributes goes to some effort to make sure it repaints
the border tile whenever the background origin may have changed, but
miPaintWindow was ignoring the background origin.
Found by xts XChangeWindowAttributes-3
Signed-off-by: Peter Harris phar...@opentext.com
---
mi/miexpose.c | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/mi/miexpose.c b/mi/miexpose.c
index fc4dbc0..3e49f15 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -478,14 +478,21 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
else {
PixmapPtr pixmap;
-tile_x_off = drawable-x;
-tile_y_off = drawable-y;
+fill = pWin-border;
+solid = pWin-borderIsPixel;
/* servers without pixmaps draw their own borders */
if (!pScreen-GetWindowPixmap)
return;
pixmap = (*pScreen-GetWindowPixmap) ((WindowPtr) drawable);
drawable = pixmap-drawable;
+
+while (pWin-backgroundState == ParentRelative)
+pWin = pWin-parent;
+
+tile_x_off = pWin-drawable.x;
+tile_y_off = pWin-drawable.y;
+
#ifdef COMPOSITE
draw_x_off = pixmap-screen_x;
draw_y_off = pixmap-screen_y;
@@ -495,8 +502,6 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
draw_x_off = 0;
draw_y_off = 0;
#endif
-fill = pWin-border;
-solid = pWin-borderIsPixel;
}
gcval[0].val = GXcopy;
--
2.1.0
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[RFC 5/5] modesetting: Implement page flipping support for Present.
Hi guys, I'm testing the five patches Kenneth posted in January that result in pageflipping support for Present. I'm using Xserver git, plus Kenneth's five patches and the modesetting DDX. If I run World of Warcraft on Gallium Nine, load into the game, and alt-tab out, my Xserver crashes. If I don't use the five patches, there is no issue. Here is a backtrace obtained from gdb over ssh: http://pastebin.com/raw.php?i=nhRKPZzS Any ideas on this? Thanks, Nick Sarnie ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] Massage cpp output before passing to awk for generating sdksyms.c
On 02/13/15 12:37 AM, Hans de Goede wrote: Hi, On 11-02-15 17:04, Alan Coopersmith wrote: Fixes build errors when using Solaris Studio 12.4 from getting the wrong strings (such as __attribute__) put into the sdksyms function list. Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com Hmm, have you seen my patch to sdksyms.sh to fix buildign with gcc5's cpp ? It is not a very good patch, but at least it sticks to awk only, I do not think adding sed to the mix makes things better. I tried fixing this just in the awk, and it turned into a hairball that still didn't work. What we really need is someone who knows awk to step in and help us with both our problems and fix things properly. So does anyone know anyone who may be able to help out with fixing the awk stuff ? Do we need to stick to awk? Maybe python or perl would be better? Or do we still need sdksyms at all? I don't actually remember the details of why it even exists - did some compilers/linkers optimize out these functions even though they are marked as exported? -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - http://blogs.oracle.com/alanc ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] XDMCP options like -query etc. should imply -listen tcp
On 02/12/15 04:34 AM, Jon TURNEY wrote:
In X server 1.17, the default configuration is now -nolisten tcp. In this
configuration, XDMCP options don't work usefully, as the X server is not
listening on the port for the display that it tells the display manager to
connect to.
Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
---
os/xdmcp.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/os/xdmcp.c b/os/xdmcp.c
index b6e97c9..bc5a707 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -48,6 +48,11 @@
#include netdir.h
#endif
+#define XSERV_t
+#define TRANS_SERVER
+#define TRANS_REOPEN
+#include X11/Xtrans/Xtrans.h
+
#ifdef XDMCP
#undef REQUEST
@@ -242,6 +247,14 @@ XdmcpUseMsg(void)
ErrorF(-displayID display-id manufacturer display ID for request\n);
}
+static void
+XdmcpDefaultListen(void)
+{
+/* Even when configured --disable-listen-tcp, we should listen on tcp in
+ XDMCP modes */
+_XSERVTransListen(tcp);
+}
+
int
XdmcpOptions(int argc, char **argv, int i)
{
@@ -249,11 +262,13 @@ XdmcpOptions(int argc, char **argv, int i)
get_manager_by_name(argc, argv, i++);
XDM_INIT_STATE = XDM_QUERY;
AccessUsingXdmcp();
+XdmcpDefaultListen();
return i + 1;
}
if (strcmp(argv[i], -broadcast) == 0) {
XDM_INIT_STATE = XDM_BROADCAST;
AccessUsingXdmcp();
+XdmcpDefaultListen();
return i + 1;
}
#if defined(IPv6) defined(AF_INET6)
@@ -261,6 +276,7 @@ XdmcpOptions(int argc, char **argv, int i)
i = get_mcast_options(argc, argv, ++i);
XDM_INIT_STATE = XDM_MULTICAST;
AccessUsingXdmcp();
+XdmcpDefaultListen();
return i + 1;
}
#endif
@@ -268,6 +284,7 @@ XdmcpOptions(int argc, char **argv, int i)
get_manager_by_name(argc, argv, i++);
XDM_INIT_STATE = XDM_INDIRECT;
AccessUsingXdmcp();
+XdmcpDefaultListen();
return i + 1;
}
if (strcmp(argv[i], -port) == 0) {
Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
--
-Alan Coopersmith- alan.coopersm...@oracle.com
Oracle Solaris Engineering - http://blogs.oracle.com/alanc
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
