Re: [PATCH xserver] Xext: fix build with --disable-xace

2015-10-27 Thread Andrew Eikum
Makes sense to me. Apologies for breaking your build.

Signed-off-by: Andrew Eikum 

On Tue, Oct 27, 2015 at 01:23:13PM +0100, Julien Cristau wrote:
> Regression from 990cf5b2828f73dc7a07f1e38f608af39acfd81d
> 
> Signed-off-by: Julien Cristau 
> Cc: Andrew Eikum 
> Cc: Peter Hutterer 
> ---
>  Xext/xace.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/Xext/xace.h b/Xext/xace.h
> index 3303f76..6a8d0c4 100644
> --- a/Xext/xace.h
> +++ b/Xext/xace.h
> @@ -112,6 +112,7 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
>  
>  #ifdef __GNUC__
>  #define XaceHook(args...) Success
> +#define XaceHookIsSet(args...) 0
>  #define XaceHookDispatch(args...) Success
>  #define XaceHookPropertyAccess(args...) Success
>  #define XaceHookSelectionAccess(args...) Success
> @@ -119,6 +120,7 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
>  #define XaceCensorImage(args...) { ; }
>  #else
>  #define XaceHook(...) Success
> +#define XaceHookIsSet(...) 0
>  #define XaceHookDispatch(...) Success
>  #define XaceHookPropertyAccess(...) Success
>  #define XaceHookSelectionAccess(...) Success
> -- 
> 2.6.1
> 
___
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 xserver] Xext: fix build with --disable-xace

2015-10-27 Thread Julien Cristau
Regression from 990cf5b2828f73dc7a07f1e38f608af39acfd81d

Signed-off-by: Julien Cristau 
Cc: Andrew Eikum 
Cc: Peter Hutterer 
---
 Xext/xace.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Xext/xace.h b/Xext/xace.h
index 3303f76..6a8d0c4 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -112,6 +112,7 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
 
 #ifdef __GNUC__
 #define XaceHook(args...) Success
+#define XaceHookIsSet(args...) 0
 #define XaceHookDispatch(args...) Success
 #define XaceHookPropertyAccess(args...) Success
 #define XaceHookSelectionAccess(args...) Success
@@ -119,6 +120,7 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
 #define XaceCensorImage(args...) { ; }
 #else
 #define XaceHook(...) Success
+#define XaceHookIsSet(...) 0
 #define XaceHookDispatch(...) Success
 #define XaceHookPropertyAccess(...) Success
 #define XaceHookSelectionAccess(...) Success
-- 
2.6.1

___
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 v2] Handle failures in setting a CRTC to a DRM mode properly

2015-10-27 Thread Emil Velikov
On 27 October 2015 at 02:07, Michel Dänzer  wrote:
> On 26.10.2015 20:01, Emil Velikov wrote:
>> On 26 October 2015 at 10:55, Daniel Martin  wrote:
>>> On 26 October 2015 at 10:39, Michel Dänzer  wrote:
> diff --git a/src/drmmode_display.c b/src/drmmode_display.c
> index 64e79d4..f0f121e 100644
> --- a/src/drmmode_display.c
> +++ b/src/drmmode_display.c
> @@ -760,12 +760,15 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, 
> DisplayModePtr mode,
>   radeon_bo_wait(drmmode_crtc->scanout[0].bo);
>   }
>   }
> - ret = drmModeSetCrtc(drmmode->fd, 
> drmmode_crtc->mode_crtc->crtc_id,
> -  fb_id, x, y, output_ids, output_count, 
> );
> - if (ret)
> + if (drmModeSetCrtc(drmmode->fd,
> +drmmode_crtc->mode_crtc->crtc_id,
> +fb_id, x, y, output_ids,
> +output_count, ) != 0) {
>   xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
>  "failed to set mode: %s", 
> strerror(-ret));

 errno must be passed instead of -ret to strerror. I pushed the patch
 with that fixed, thanks!
>>>
>>> While you're at it, can you add the missing linebreak to the message?
>>> Just hit it and it looks suspicious:
>>> (EE) modeset(0): failed to set mode: Invalid argument(--) RandR disabled
>>> or
>>> (EE) modeset(0): failed to set mode: Invalid argument(II)
>>> modeset(0): Setting screen physical size to 677 x 381
>>>
>> Mildly related:
>>  - Using -ret opposed to errno -> intel, nouveau, modeset ddx
>
> The -ret => errno change is only necessary because we're no longer
> assigning the return value of drmModeSetCrtc (which is -errno) to ret.
> This doesn't apply to intel or nouveau (or to modesetting without the
> fix above).
>
From my archaeology experiences in libdrm, not all of its APIs return
-errno on error. So I got a bit confused there.
The modeset case(s) those seems to be set and consistent afaict.

>
>>  - Incorrectly handled failure and missing \n -> modeset ddx
>
> Yep, in fact Daniel is using the modesetting driver, not radeon.
>
> Patches welcome for both cases. :)
>
... as does amdgpu. I'll let those using the said drivers to port the fix :-P

Cheers,
Emil
___
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 xserver] DRI2: Sync radeonsi_pci_ids.h from Mesa

2015-10-27 Thread Adam Jackson
On Tue, 2015-10-27 at 10:00 -0400, Alex Deucher wrote:
> On Mon, Oct 26, 2015 at 10:51 PM, Michel Dänzer 
> wrote:
> > From: Michel Dänzer 
> > 
> > Fixes DRI2 client driver name mapping for newer AMD GPUs with the
> > modesetting driver, allowing the DRI2 extension to initialize.
> > 
> > Signed-off-by: Michel Dänzer 
> 
> Reviewed-by: Alex Deucher 

remote: I: patch #62915 updated using rev 
ac2f27f1a9fa8cd88c5dbe7ec0f96238eecf2c3e.
remote: I: 1 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   d8b7a90..ac2f27f  master -> master

- ajax

___
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 xserver] Xext: fix build with --disable-xace

2015-10-27 Thread Adam Jackson
On Tue, 2015-10-27 at 08:19 -0500, Andrew Eikum wrote:
> Makes sense to me. Apologies for breaking your build.
> 
> Signed-off-by: Andrew Eikum 

remote: I: patch #62939 updated using rev 
524844c8c18e226aad30feb371b19ef491d83449.
remote: I: 1 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   ac2f27f..524844c  master -> master

- ajax

___
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] build: Remove stale miext/cw include paths

2015-10-27 Thread Emil Velikov
On 27 October 2015 at 17:28, Adam Jackson  wrote:
> Signed-off-by: Adam Jackson 
> ---
>  exa/Makefile.am   | 4 +---
>  hw/xfree86/Makefile.am| 2 +-
>  hw/xfree86/exa/Makefile.am| 3 +--
>  hw/xfree86/loader/Makefile.am | 2 +-
>  test/Makefile.am  | 2 +-
>  5 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/exa/Makefile.am b/exa/Makefile.am
> index 6a09966..00b28b1 100644
> --- a/exa/Makefile.am
> +++ b/exa/Makefile.am
> @@ -4,9 +4,7 @@ if XORG
>  sdk_HEADERS = exa.h
>  endif
>
> -AM_CPPFLAGS = \
> -   $(XORG_INCS) \
> -   -I$(srcdir)/../miext/cw
> +AM_CPPFLAGS = $(XORG_INCS)
>
>  AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
>
> diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
> index c45d8c9..64c4f74 100644
> --- a/hw/xfree86/Makefile.am
> +++ b/hw/xfree86/Makefile.am
> @@ -49,7 +49,7 @@ bin_PROGRAMS = Xorg
>  nodist_Xorg_SOURCES = sdksyms.c
>
>  AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
> -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
> +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser \
> -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
> -I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
>
> diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am
> index 1e42cda..ccbb305 100644
> --- a/hw/xfree86/exa/Makefile.am
> +++ b/hw/xfree86/exa/Makefile.am
> @@ -6,8 +6,7 @@ libexa_la_LDFLAGS = -module -avoid-version 
> $(LD_NO_UNDEFINED_FLAG)
>
>  AM_CPPFLAGS = \
> $(XORG_INCS) \
> -   -I$(srcdir)/../../../exa \
> -   -I$(srcdir)/../../../miext/cw
> +   -I$(srcdir)/../../../exa
>
>  AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
>
> diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am
> index a658ca5..9218cab 100644
> --- a/hw/xfree86/loader/Makefile.am
> +++ b/hw/xfree86/loader/Makefile.am
> @@ -1,6 +1,6 @@
>  noinst_LTLIBRARIES = libloader.la
>
> -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../parser -I$(top_srcdir)/miext/cw \
> +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../parser \
>-I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../modes \
>-I$(srcdir)/../ramdac -I$(srcdir)/../dri -I$(srcdir)/../dri2
>
> diff --git a/test/Makefile.am b/test/Makefile.am
> index 4d935a2..d151b02 100644
> --- a/test/Makefile.am
> +++ b/test/Makefile.am
> @@ -16,7 +16,7 @@ TESTS=$(noinst_PROGRAMS)
>  TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
>
>  AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
> -AM_CPPFLAGS = $(XORG_INCS) -I$(top_srcdir)/miext/cw
> +AM_CPPFLAGS = $(XORG_INCS)
>  if XORG
>  AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/parser \
> -I$(top_srcdir)/hw/xfree86/ddc \

Nicely spotted. miext/cw hasn't been around for a few years :-)

commit a44a379a2a4c198dbd6ffd6cc0db376f8fb64327
Author: Adam Jackson 
Date:   Thu Jul 19 15:00:03 2012 -0400

   cw: Remove

Fwiw the patch is:
Reviewed-by: Emil Velikov 

-Emil
___
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] build: Remove stale miext/cw include paths

2015-10-27 Thread Adam Jackson
Signed-off-by: Adam Jackson 
---
 exa/Makefile.am   | 4 +---
 hw/xfree86/Makefile.am| 2 +-
 hw/xfree86/exa/Makefile.am| 3 +--
 hw/xfree86/loader/Makefile.am | 2 +-
 test/Makefile.am  | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/exa/Makefile.am b/exa/Makefile.am
index 6a09966..00b28b1 100644
--- a/exa/Makefile.am
+++ b/exa/Makefile.am
@@ -4,9 +4,7 @@ if XORG
 sdk_HEADERS = exa.h
 endif
 
-AM_CPPFLAGS = \
-   $(XORG_INCS) \
-   -I$(srcdir)/../miext/cw
+AM_CPPFLAGS = $(XORG_INCS)
 
 AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
 
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index c45d8c9..64c4f74 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -49,7 +49,7 @@ bin_PROGRAMS = Xorg
 nodist_Xorg_SOURCES = sdksyms.c
 
 AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
-AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
+AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser \
-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
-I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
 
diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am
index 1e42cda..ccbb305 100644
--- a/hw/xfree86/exa/Makefile.am
+++ b/hw/xfree86/exa/Makefile.am
@@ -6,8 +6,7 @@ libexa_la_LDFLAGS = -module -avoid-version 
$(LD_NO_UNDEFINED_FLAG)
 
 AM_CPPFLAGS = \
$(XORG_INCS) \
-   -I$(srcdir)/../../../exa \
-   -I$(srcdir)/../../../miext/cw
+   -I$(srcdir)/../../../exa
 
 AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
 
diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am
index a658ca5..9218cab 100644
--- a/hw/xfree86/loader/Makefile.am
+++ b/hw/xfree86/loader/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libloader.la
 
-AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../parser -I$(top_srcdir)/miext/cw \
+AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../parser \
   -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../modes \
   -I$(srcdir)/../ramdac -I$(srcdir)/../dri -I$(srcdir)/../dri2
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 4d935a2..d151b02 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,7 @@ TESTS=$(noinst_PROGRAMS)
 TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
 
 AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
-AM_CPPFLAGS = $(XORG_INCS) -I$(top_srcdir)/miext/cw
+AM_CPPFLAGS = $(XORG_INCS)
 if XORG
 AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/parser \
-I$(top_srcdir)/hw/xfree86/ddc \
-- 
2.5.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

[PATCH:macros] XORG_MANPAGE_SECTIONS: limit SVR4 man page sections to Solaris 2.0-11

2015-10-27 Thread Alan Coopersmith
All others (including other SunOS/Solaris releases) use the
traditional Bell Labs / BSD / Linux section numbering.

Signed-off-by: Alan Coopersmith 
---
 xorg-macros.m4.in |   22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index f160a40..c62fae5 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -1,6 +1,6 @@
 dnl @configure_input@
 dnl
-dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights 
reserved.
+dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights 
reserved.
 dnl
 dnl Permission is hereby granted, free of charge, to any person obtaining a
 dnl copy of this software and associated documentation files (the "Software"),
@@ -130,8 +130,9 @@ fi
 
 if test x$FILE_MAN_SUFFIX = x; then
 case $host_os in
-   solaris*)   FILE_MAN_SUFFIX=4  ;;
-   *)  FILE_MAN_SUFFIX=5  ;;
+   # Solaris 2.0 - 11 use SVR4 man page sections
+   solaris2.?|solaris2.1[[01]])FILE_MAN_SUFFIX=4  ;;
+   *)  FILE_MAN_SUFFIX=5  ;;
 esac
 fi
 if test x$FILE_MAN_DIR = x; then
@@ -140,8 +141,9 @@ fi
 
 if test x$MISC_MAN_SUFFIX = x; then
 case $host_os in
-   solaris*)   MISC_MAN_SUFFIX=5  ;;
-   *)  MISC_MAN_SUFFIX=7  ;;
+   # Solaris 2.0 - 11 use SVR4 man page sections
+   solaris2.?|solaris2.1[[01]])MISC_MAN_SUFFIX=5  ;;
+   *)  MISC_MAN_SUFFIX=7  ;;
 esac
 fi
 if test x$MISC_MAN_DIR = x; then
@@ -150,8 +152,9 @@ fi
 
 if test x$DRIVER_MAN_SUFFIX = x; then
 case $host_os in
-   solaris*)   DRIVER_MAN_SUFFIX=7  ;;
-   *)  DRIVER_MAN_SUFFIX=4  ;;
+   # Solaris 2.0 - 11 use SVR4 man page sections
+   solaris2.?|solaris2.1[[01]])DRIVER_MAN_SUFFIX=7  ;;
+   *)  DRIVER_MAN_SUFFIX=4  ;;
 esac
 fi
 if test x$DRIVER_MAN_DIR = x; then
@@ -160,8 +163,9 @@ fi
 
 if test x$ADMIN_MAN_SUFFIX = x; then
 case $host_os in
-   solaris*)   ADMIN_MAN_SUFFIX=1m ;;
-   *)  ADMIN_MAN_SUFFIX=8  ;;
+   # Solaris 2.0 - 11 use SVR4 man page sections
+   solaris2.?|solaris2.1[[01]])ADMIN_MAN_SUFFIX=1m ;;
+   *)  ADMIN_MAN_SUFFIX=8  ;;
 esac
 fi
 if test x$ADMIN_MAN_DIR = x; then
-- 
1.7.9.2

___
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:xorg-docs 2/4] X.man: update program lists/info for modern era

2015-10-27 Thread Alan Coopersmith
We no longer have a monolithic X.Org distribution, nor a separate
user-contributed distribution from X.Org, but instead many OS distros.

Also stop recommending so much abandonware, but do point out the programs
we've added over the years and still maintain.

Signed-off-by: Alan Coopersmith 
---
 man/X.man |   53 +
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/man/X.man b/man/X.man
index 057a7b8..d07e69e 100644
--- a/man/X.man
+++ b/man/X.man
@@ -92,42 +92,37 @@ __datadir__/doc or on the X.Org Foundation website at
 .UE .
 .PP
 The number of programs that use \fIX\fP is quite large.
-Programs provided in the core X.Org Foundation distribution include:
+Sample programs provided by the X.Org Foundation include:
 a terminal emulator, \fIxterm\fP;
 a window manager, \fItwm\fP;
+a compositing manager, \fIxcompmgr\fP;
 a display manager, \fIxdm\fP;
 a console redirect program, \fIxconsole\fP;
-a mail interface, \fIxmh\fP;
-a bitmap editor, \fIbitmap\fP;
+utilities for managing input and output devices, \fIxinput\fP and \fIxrandr\fP;
 resource listing/manipulation tools, \fIappres\fP, \fIeditres\fP;
 access control programs, \fIxauth\fP, \fIxhost\fP, and \fIiceauth\fP;
-user preference setting programs, \fIxrdb\fP, \fIxcmsdb\fP,
+user preference setting programs, \fItransset\fP, \fIxrdb\fP, \fIxcmsdb\fP,
 \fIxset\fP, \fIxsetroot\fP, \fIxstdcmap\fP, and \fIxmodmap\fP;
 clocks, \fIxclock\fP and \fIoclock\fP;
-a font displayer, \fIxfd\fP;
-utilities for listing information about fonts, windows, and displays,
-\fIxlsfonts\fP, \fIxwininfo\fP, \fIxlsclients\fP,
-\fIxdpyinfo\fP, \fIxlsatoms\fP, and \fIxprop\fP;
+font display utilities, \fIxfd\fP and \fIxfontsel\fP;
+utilities for listing information about displays, extensions, and resources,
+\fIxdpyinfo\fP, \fIxdriinfo\fP, \fIxvinfo\fP, \fIxwininfo\fP, \fIxlsclients\fP,
+\fIxprop\fP, \fIxlsatoms\fP, \fIxlsclients\fP, and \fIxlsfonts\fP;
 screen image manipulation utilities, \fIxwd\fP, \fIxwud\fP, and \fIxmag\fP;
 a performance measurement utility, \fIx11perf\fP;
 a font compiler, \fIbdftopcf\fP;
-a font server and related utilities, \fIxfs\fP, \fIfsinfo\fP, \fIfslsfonts\fP, 
\fIfstobdf\fP;
+a font server and related utilities, \fIxfs\fP, \fIxfsinfo\fP, 
\fIfslsfonts\fP, \fIfstobdf\fP;
 a display server and related utilities, \fIXserver\fP, \fIrgb\fP, 
\fImkfontdir\fP;
 a clipboard manager, \fIxclipboard\fP;
 keyboard description compiler and related utilities, \fIxkbcomp\fP, 
\fIsetxkbmap\fP
 \fIxkbprint\fP, \fIxkbbell\fP, \fIxkbevd\fP, \fIxkbvleds\fP, and 
\fIxkbwatch\fP;
 a utility to terminate clients, \fIxkill\fP;
-a firewall security proxy, \fIxfwp\fP;
-a proxy manager to control them, \fIproxymngr\fP;
-a utility to find proxies, \fIxfindproxy\fP;
-web browser plug-ins, \fIlibxrx.so\fP and \fIlibxrxnest.so\fP;
-an RX MIME-type helper program, \fIxrx\fP;
 and a utility to cause part or all of the screen to be redrawn, \fIxrefresh\fP.
 .PP
 Many other utilities, window managers, games, toolkits, etc. are included
-as user-contributed software in the X.Org Foundation distribution, or are
+as packages in many operating system distributions, or are
 available on the Internet.
-See your site administrator for details.
+See your site administrator or distro package manager for details.
 .SH "STARTING UP"
 .PP
 There are two main ways of getting the X server and an initial set of
@@ -376,12 +371,12 @@ to explicitly draw the window's region on the screen with 
the pointer, for
 example).
 .PP
 Since window managers are regular (albeit complex) client programs,
-a variety of different user interfaces can be built.  The X.Org Foundation 
distribution
-comes with a window manager named \fItwm\fP which supports overlapping windows,
+a variety of different user interfaces can be built.  The X.Org Foundation
+provides a window manager named \fItwm\fP which supports overlapping windows,
 popup menus, point-and-click or click-to-type input models, title bars, nice
 icons (and an icon manager for those who don't like separate icon windows).
 .PP
-See the user-contributed software in the X.Org Foundation distribution for 
other
+See your distro package manager for other
 popular window managers.
 .SH "FONT NAMES"
 Collections of characters for displaying text and symbols in X are known as
@@ -1218,19 +1213,16 @@ the appropriate instance name can be placed before the 
asterisk:
 .BR bdftopcf (__appmansuffix__),
 .BR bitmap (__appmansuffix__),
 .BR editres (__appmansuffix__),
-.BR fsinfo (__appmansuffix__),
 .BR fslsfonts (__appmansuffix__),
 .BR fstobdf (__appmansuffix__),
 .BR iceauth (__appmansuffix__),
-.BR imake (__appmansuffix__),
-.BR makedepend (__appmansuffix__),
 .BR mkfontdir (__appmansuffix__),
+.BR mkfontscale (__appmansuffix__),
 .BR oclock (__appmansuffix__),
-.BR proxymngr (__appmansuffix__),
 .BR rgb (__appmansuffix__),
 .BR resize (__appmansuffix__),
-.BR rstart 

[PATCH:xorg-docs 4/4] X.man: move XLOCAL documentation from Xorg(1) man page

2015-10-27 Thread Alan Coopersmith
These settings affect clients, not server, so belong here, next to
the information about how to set $DISPLAY.

Also updated to drop ISC and correct description of Unix domain sockets.

Signed-off-by: Alan Coopersmith 
---
 man/X.man |   49 +
 1 file changed, 49 insertions(+)

diff --git a/man/X.man b/man/X.man
index a4f4614..8aa4014 100644
--- a/man/X.man
+++ b/man/X.man
@@ -260,6 +260,55 @@ addresses, and IPv6 addresses are all allowed.  For 
example:
 \fIx.org:0\fP, \fIexpo:0\fP, \fI[::1]:0\fP,
 \fI198.112.45.11:0\fP, \fIbigmachine:1\fP, and \fIhydra:0.1\fP.
 .PP
+.SH "LOCAL CONNECTIONS"
+For operating systems that support local connections other than Unix
+Domain sockets (SVR3 and SVR4), there is a compiled-in list specifying
+the order in which local connections should be attempted.  This list
+can be overridden by the
+.I XLOCAL
+environment variable described below.  If the display name indicates a
+best-choice connection should be made (e.g.
+.BR :0.0 ),
+each connection mechanism is tried until a connection succeeds or no
+more mechanisms are available.
+.PP
+The
+.I XLOCAL
+environment variable should contain a list of one more
+more of the following:
+.PP
+.RS 8
+.nf
+NAMED
+PTS
+SCO
+UNIX
+.fi
+.RE
+.PP
+which represent SVR4 Named Streams pipe, Old-style USL Streams pipe,
+SCO XSight Streams pipe, and Unix domain sockets, respectively.  You can
+select a single mechanism (e.g.
+.IR XLOCAL=NAMED ),
+or an ordered list (e.g. \fIXLOCAL="NAMED:PTS:SCO"\fP).
+This variable overrides the compiled-in defaults.  For SVR4 it is
+recommended that
+.I NAMED
+be the first preference connection.  The default setting is
+platform-dependent.
+.PP
+To globally override the compiled-in defaults, you should define (and
+export if using
+.B sh
+or
+.BR ksh )
+.I XLOCAL
+globally.  If you use startx(1) or xinit(1), the definition should be
+at the top of your
+.I .xinitrc
+file.  If you use xdm(1), the definitions should be early on in the
+.I __projectroot__/lib/X11/xdm/Xsession
+script.
 .SH "ACCESS CONTROL"
 An X server can use several types of access control.  Mechanisms provided
 in Release 7 are:
-- 
1.7.9.2

___
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:xorg-docs 3/4] X.man: document protocol/ syntax in display string

2015-10-27 Thread Alan Coopersmith
See 
http://www.x.org/releases/X11R7.7/doc/libX11/libX11/libX11.html#Opening_the_Display

Signed-off-by: Alan Coopersmith 
---
 man/X.man |   25 ++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/man/X.man b/man/X.man
index d07e69e..a4f4614 100644
--- a/man/X.man
+++ b/man/X.man
@@ -1,4 +1,4 @@
-.\" t
+'\" t
 .\"
 .\" Copyright (c) 1994, 2004  The Open Group
 .\" Copyright \(co 2000  The XFree86 Project, Inc.
@@ -165,15 +165,34 @@ form:
 .RS
 \fIhostname:displaynumber.screennumber\fP
 .RE
+or
+.RS
+\fIprotocol/hostname:displaynumber.screennumber\fP
+.RE
 .sp
 This information is used by the application to determine how it should
 connect to the server and which screen it should use by default
 (on displays with multiple monitors):
 .TP 8
+.I protocol
+The \fIprotocol\fP specifies the protocol to use for communication.
+Exactly which protocols are supported is platform dependent, but most
+commonly supported ones are:
+.TS
+l l.
+tcp TCP over IPv4 or IPv6
+inetTCP over IPv4 only
+inet6   TCP over IPv6 only
+unixUNIX Domain Sockets (same host only)
+local   Platform preferred local connection method
+.TE
+If the protocol is not specified, Xlib uses whatever it believes is the
+most efficient transport.
+.TP 8
 .I hostname
 The \fIhostname\fP specifies the name of the machine to which the display is
-physically connected.  If the hostname is not given, the most efficient way of
-communicating to a server on the same machine will be used.
+physically connected.  If the hostname is not given, a connection to a server
+on the same machine will be used.
 .TP 8
 .I displaynumber
 The phrase "display" is usually used to refer to a collection of monitors that
-- 
1.7.9.2

___
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:xserver 2/3] Xorg.man: update to reflect -nolisten tcp becoming default

2015-10-27 Thread Alan Coopersmith
Signed-off-by: Alan Coopersmith 
---
 hw/xfree86/man/Xorg.man |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
index b23db3d..def9bfc 100644
--- a/hw/xfree86/man/Xorg.man
+++ b/hw/xfree86/man/Xorg.man
@@ -53,8 +53,9 @@ listens on port
 .RI 6000+ n ,
 where
 .I n
-is the display number.  This connection type can be disabled with the
-.B \-nolisten
+is the display number.  This connection type is usually disabled by default,
+but may be enabled with the
+.B \-listen
 option (see the Xserver(1) man page for details).
 .SH OPTIONS
 .B Xorg
-- 
1.7.9.2

___
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:xorg-docs 1/4] X.man: give pointers to specs & other docs

2015-10-27 Thread Alan Coopersmith
Signed-off-by: Alan Coopersmith 
---
 man/X.man |   21 +
 1 file changed, 21 insertions(+)

diff --git a/man/X.man b/man/X.man
index bc9fc1a..057a7b8 100644
--- a/man/X.man
+++ b/man/X.man
@@ -76,6 +76,20 @@ the \fIXlib - C Language X Interface\fP manual,
 the \fIX Window System Protocol\fP specification,
 the \fIX Toolkit Intrinsics - C Language Interface\fP manual,
 and various toolkit documents.
+.\" Use .UR macro from groff's man(7) if available, otherwise just
+.\" display URL as plain text for other processors.
+.if !d UR \{
+.de UR
+.RI < \\$1 >
+..
+.de UE
+.RI \\$1
+.. \}
+.\"
+Those manuals, specifications, & documents may be found in
+__datadir__/doc or on the X.Org Foundation website at
+.UR "http://www.x.org/releases/current/doc/;
+.UE .
 .PP
 The number of programs that use \fIX\fP is quite large.
 Programs provided in the core X.Org Foundation distribution include:
@@ -1269,10 +1283,17 @@ the appropriate instance name can be placed before the 
asterisk:
 .BR Xvfb (__appmansuffix__),
 .BR Xvnc (__appmansuffix__),
 .BR XWin (__appmansuffix__).
+.PP
 .\" specifications
 .I "Xlib \- C Language X Interface\fR,\fP"
 and
 .I "X Toolkit Intrinsics \- C Language Interface"
+.PP
+Those specifications, and additional specifications & documentation for the
+X Window System may also be found in __datadir__/doc or on the X.Org Foundation
+website at
+.UR "http://www.x.org/releases/current/doc/;
+.UE .
 .SH TRADEMARKS
 .PP
 X Window System is a trademark of The Open Group.
-- 
1.7.9.2

___
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:macros] XORG_MANPAGE_SECTIONS: limit SVR4 man page sections to Solaris 2.0-11

2015-10-27 Thread Jeremy Huddleston Sequoia

> On Oct 27, 2015, at 16:06, Alan Coopersmith  
> wrote:
> 
> All others (including other SunOS/Solaris releases) use the
> traditional Bell Labs / BSD / Linux section numbering.
> 
> Signed-off-by: Alan Coopersmith 
> ---
> xorg-macros.m4.in |   22 +-
> 1 file changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
> index f160a40..c62fae5 100644
> --- a/xorg-macros.m4.in
> +++ b/xorg-macros.m4.in
> @@ -1,6 +1,6 @@
> dnl @configure_input@
> dnl
> -dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights 
> reserved.
> +dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights 
> reserved.

"-" rather than ","

Other than that,

Reviewed-by: Jeremy Huddleston Sequoia 

> dnl
> dnl Permission is hereby granted, free of charge, to any person obtaining a
> dnl copy of this software and associated documentation files (the "Software"),
> @@ -130,8 +130,9 @@ fi
> 
> if test x$FILE_MAN_SUFFIX = x; then
> case $host_os in
> - solaris*)   FILE_MAN_SUFFIX=4  ;;
> - *)  FILE_MAN_SUFFIX=5  ;;
> + # Solaris 2.0 - 11 use SVR4 man page sections
> + solaris2.?|solaris2.1[[01]])FILE_MAN_SUFFIX=4  ;;
> + *)  FILE_MAN_SUFFIX=5  ;;
> esac
> fi
> if test x$FILE_MAN_DIR = x; then
> @@ -140,8 +141,9 @@ fi
> 
> if test x$MISC_MAN_SUFFIX = x; then
> case $host_os in
> - solaris*)   MISC_MAN_SUFFIX=5  ;;
> - *)  MISC_MAN_SUFFIX=7  ;;
> + # Solaris 2.0 - 11 use SVR4 man page sections
> + solaris2.?|solaris2.1[[01]])MISC_MAN_SUFFIX=5  ;;
> + *)  MISC_MAN_SUFFIX=7  ;;
> esac
> fi
> if test x$MISC_MAN_DIR = x; then
> @@ -150,8 +152,9 @@ fi
> 
> if test x$DRIVER_MAN_SUFFIX = x; then
> case $host_os in
> - solaris*)   DRIVER_MAN_SUFFIX=7  ;;
> - *)  DRIVER_MAN_SUFFIX=4  ;;
> + # Solaris 2.0 - 11 use SVR4 man page sections
> + solaris2.?|solaris2.1[[01]])DRIVER_MAN_SUFFIX=7  ;;
> + *)  DRIVER_MAN_SUFFIX=4  ;;
> esac
> fi
> if test x$DRIVER_MAN_DIR = x; then
> @@ -160,8 +163,9 @@ fi
> 
> if test x$ADMIN_MAN_SUFFIX = x; then
> case $host_os in
> - solaris*)   ADMIN_MAN_SUFFIX=1m ;;
> - *)  ADMIN_MAN_SUFFIX=8  ;;
> + # Solaris 2.0 - 11 use SVR4 man page sections
> + solaris2.?|solaris2.1[[01]])ADMIN_MAN_SUFFIX=1m ;;
> + *)  ADMIN_MAN_SUFFIX=8  ;;
> esac
> fi
> if test x$ADMIN_MAN_DIR = x; then
> -- 
> 1.7.9.2
> 
> ___
> 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



smime.p7s
Description: S/MIME cryptographic signature
___
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 xserver] DRI2: Sync radeonsi_pci_ids.h from Mesa

2015-10-27 Thread Alex Deucher
On Mon, Oct 26, 2015 at 10:51 PM, Michel Dänzer  wrote:
> From: Michel Dänzer 
>
> Fixes DRI2 client driver name mapping for newer AMD GPUs with the
> modesetting driver, allowing the DRI2 extension to initialize.
>
> Signed-off-by: Michel Dänzer 

Reviewed-by: Alex Deucher 

> ---
>  hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h | 28 
>  1 file changed, 28 insertions(+)
>
> diff --git a/hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h 
> b/hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h
> index 571e863..bcf15a1 100644
> --- a/hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h
> +++ b/hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h
> @@ -63,6 +63,7 @@ CHIPSET(0x6608, OLAND_6608, OLAND)
>  CHIPSET(0x6610, OLAND_6610, OLAND)
>  CHIPSET(0x6611, OLAND_6611, OLAND)
>  CHIPSET(0x6613, OLAND_6613, OLAND)
> +CHIPSET(0x6617, OLAND_6617, OLAND)
>  CHIPSET(0x6620, OLAND_6620, OLAND)
>  CHIPSET(0x6621, OLAND_6621, OLAND)
>  CHIPSET(0x6623, OLAND_6623, OLAND)
> @@ -85,6 +86,7 @@ CHIPSET(0x6651, BONAIRE_6651, BONAIRE)
>  CHIPSET(0x6658, BONAIRE_6658, BONAIRE)
>  CHIPSET(0x665C, BONAIRE_665C, BONAIRE)
>  CHIPSET(0x665D, BONAIRE_665D, BONAIRE)
> +CHIPSET(0x665F, BONAIRE_665F, BONAIRE)
>
>  CHIPSET(0x9830, KABINI_9830, KABINI)
>  CHIPSET(0x9831, KABINI_9831, KABINI)
> @@ -155,3 +157,29 @@ CHIPSET(0x67B8, HAWAII_67B8, HAWAII)
>  CHIPSET(0x67B9, HAWAII_67B9, HAWAII)
>  CHIPSET(0x67BA, HAWAII_67BA, HAWAII)
>  CHIPSET(0x67BE, HAWAII_67BE, HAWAII)
> +
> +CHIPSET(0x6900, ICELAND_, ICELAND)
> +CHIPSET(0x6901, ICELAND_, ICELAND)
> +CHIPSET(0x6902, ICELAND_, ICELAND)
> +CHIPSET(0x6903, ICELAND_, ICELAND)
> +CHIPSET(0x6907, ICELAND_, ICELAND)
> +
> +CHIPSET(0x6920, TONGA_, TONGA)
> +CHIPSET(0x6921, TONGA_, TONGA)
> +CHIPSET(0x6928, TONGA_, TONGA)
> +CHIPSET(0x6929, TONGA_, TONGA)
> +CHIPSET(0x692B, TONGA_, TONGA)
> +CHIPSET(0x692F, TONGA_, TONGA)
> +CHIPSET(0x6930, TONGA_, TONGA)
> +CHIPSET(0x6938, TONGA_, TONGA)
> +CHIPSET(0x6939, TONGA_, TONGA)
> +
> +CHIPSET(0x9870, CARRIZO_, CARRIZO)
> +CHIPSET(0x9874, CARRIZO_, CARRIZO)
> +CHIPSET(0x9875, CARRIZO_, CARRIZO)
> +CHIPSET(0x9876, CARRIZO_, CARRIZO)
> +CHIPSET(0x9877, CARRIZO_, CARRIZO)
> +
> +CHIPSET(0x7300, FIJI_, FIJI)
> +
> +CHIPSET(0x98E4, STONEY_, STONEY)
> --
> 2.6.1
>
> ___
> 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
___
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