From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1IUJ6P-0005Vh-Do for garchives@archives.gentoo.org; Sun, 09 Sep 2007 09:29:14 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.0/8.14.0) with SMTP id l899MNBQ027649; Sun, 9 Sep 2007 09:22:23 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.0/8.14.0) with ESMTP id l899MLOx027635 for ; Sun, 9 Sep 2007 09:22:22 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 65EEBB4783 for ; Sun, 9 Sep 2007 09:22:21 +0000 (UTC) Received: from dberkholz by stork.gentoo.org with local (Exim 4.60) (envelope-from ) id 1IUIzk-0006F1-Qb for gentoo-commits@lists.gentoo.org; Sun, 09 Sep 2007 09:22:20 +0000 From: "dberkholz (dberkholz)" To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server/files: 1.4-fix-dmx-build.patch 1.4-document-new-font-catalogs.patch 1.4-fpic-libxf86config.patch 1.4-fix-xprint-build.patch 1.4-fix-xprint-link.patch 1.4-fix-dmx-link.patch 1.4-fix-xephyr-link.patch digest-xorg-server-1.4 X-VCS-Repository: gentoo-x86 X-VCS-Files: 1.4-fix-dmx-build.patch 1.4-document-new-font-catalogs.patch 1.4-fpic-libxf86config.patch 1.4-fix-xprint-build.patch 1.4-fix-xprint-link.patch 1.4-fix-dmx-link.patch 1.4-fix-xephyr-link.patch digest-xorg-server-1.4 X-VCS-Directories: x11-base/xorg-server/files X-VCS-Committer: dberkholz X-VCS-Committer-Name: dberkholz Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: dberkholz Date: Sun, 09 Sep 2007 09:22:20 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org Reply-To: gentoo-dev@lists.gentoo.org X-Archives-Salt: 8dd3f1c3-441f-4300-9a6c-bd6e8f18eca6 X-Archives-Hash: 9fd2a9b80023f3691590716df0c4ee7e dberkholz 07/09/09 09:22:20 Added: 1.4-fix-dmx-build.patch 1.4-document-new-font-catalogs.patch 1.4-fpic-libxf86config.patch 1.4-fix-xprint-build.patch 1.4-fix-xprint-link.patch 1.4-fix-dmx-link.patch 1.4-fix-xephyr-link.patch digest-xorg-server-1.4 Log: Bump. Contains input hotplugging, numerous EXA improvements, improvements to RandR 1.2, and more. Adds a new dependency on pixman for rendering and an optional dependency on hal/dbus for input hotplugging. A few of the fix-*-{build,link} patches still need to go upstream. (Portage version: 2.1.3.8) Revision Changes Path 1.1 x11-base/xorg-server/files/1.4-fix-dmx-build.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-fix-dmx-build.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-fix-dmx-build.patch?rev=1.1&content-type=text/plain Index: 1.4-fix-dmx-build.patch =================================================================== diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c index d644b5d..83f8a4a 100644 --- a/hw/dmx/dmxinput.c +++ b/hw/dmx/dmxinput.c @@ -105,3 +105,14 @@ void dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr pWindow) if (!dmxInput->detached && dmxInput->updateWindowInfo) dmxInput->updateWindowInfo(dmxInput, type, pWindow); } + +int +NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev) +{ + return BadRequest; +} + +void +DeleteInputDeviceRequest(DeviceIntPtr pDev) +{ +} 1.1 x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch?rev=1.1&content-type=text/plain Index: 1.4-document-new-font-catalogs.patch =================================================================== diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre index aac3b51..c9ee019 100644 --- a/doc/Xserver.man.pre +++ b/doc/Xserver.man.pre @@ -508,8 +508,7 @@ its parent process after it has set up the various connection schemes. \fIXdm\fP uses this feature to recognize when connecting to the server is possible. .SH FONTS -The X server -can obtain fonts from directories and/or from font servers. +The X server can obtain fonts from directories and/or from font servers. The list of directories and font servers the X server uses when trying to open a font is controlled by the \fIfont path\fP. @@ -517,8 +516,45 @@ by the \fIfont path\fP. The default font path is __default_font_path__ . .LP +A special kind of directory can be specified using the the \fBcatalogue\fP: +prefix. Directories specified this way can contain symlinks pointing to the +real font directories. See the FONTPATH.D section for details. +.LP The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1) after the server has started. +.SH "FONTPATH.D" +You can specify a special kind of font path in the form \fBcatalogue:\fR. +The directory specified after the catalogue: prefix will be scanned for symlinks +and each symlink destination will be added as a local fontfile FPE. +.PP +The symlink can be suffixed by attributes such as '\fBunscaled\fR', which +will be passed through to the underlying fontfile FPE. The only exception is +the newly introduced '\fBpri\fR' attribute, which will be used for ordering +the font paths specified by the symlinks. + +An example configuration: + +.nf + 75dpi:unscaled:pri=20 \-> /usr/share/X11/fonts/75dpi + ghostscript:pri=60 \-> /usr/share/fonts/default/ghostscript + misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc + type1:pri=40 \-> /usr/share/X11/fonts/Type1 + type1:pri=50 \-> /usr/share/fonts/default/Type1 +.fi + +This will add /usr/share/X11/fonts/misc as the first FPE with the attribute +'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with +the attribute unscaled etc. This is functionally equivalent to setting +the following font path: + +.nf + /usr/share/X11/fonts/misc:unscaled, + /usr/share/X11/fonts/75dpi:unscaled, + /usr/share/X11/fonts/Type1, + /usr/share/fonts/default/Type1, + /usr/share/fonts/default/ghostscript +.fi + .SH FILES .TP 30 .I /etc/X\fBn\fP.hosts diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index ce54ea9..54d8eaa 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -293,15 +293,50 @@ server searches for font databases. Multiple .B FontPath entries may be specified, and they will be concatenated to build up the -fontpath used by the server. Font path elements may be either absolute -directory paths, or a font server identifier. +fontpath used by the server. Font path elements can be absolute +directory paths, catalogue directories or a font server identifier. The +formats of the later two are explained below: +.PP +.RS 7 +Catalogue directories: +.PP +.RS 4 +Catalogue directories can be specified using the prefix \fBcatalogue:\fR +before the directory name. The directory can then be populated with +symlinks pointing to the real font directories, using the following +syntax in the symlink name: +.PP +.RS 4 +.IR : [attribute]: pri= +.RE +.PP +where +.I +is an alphanumeric identifier, +.I [attribute] +is an attribute wich will be passed to the underlying FPE and +.I +is a number used to order the fontfile FPEs. Examples: +.PP +.RS 4 +.nf +.I 75dpi:unscaled:pri=20 -> /usr/share/X11/fonts/75dpi +.I gscript:pri=60 -> /usr/share/fonts/default/ghostscript +.I misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc +.fi +.PP +.RE .RE .RE +.PP +.RS 7 +Font server identifiers: +.PP +.RS 4 Font server identifiers have the form: +.RS 4 .PP -.RS 11 .IR / : .RE .PP -.RS 7 where .I is the transport type to use to connect to the font server (e.g., @@ -313,10 +348,11 @@ for a TCP/IP connection), is the hostname of the machine running the font server, and .I is the port number that the font server is listening on (usually 7100). +.RE .PP When this entry is not specified in the config file, the server falls back to the compiled\-in default font path, which contains the following -font path elements: +font path elements (which can be set inside a catalogue directory): .PP .RS 4 .nf 1.1 x11-base/xorg-server/files/1.4-fpic-libxf86config.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch?rev=1.1&content-type=text/plain Index: 1.4-fpic-libxf86config.patch =================================================================== diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am index 849ee8b..1b49d48 100644 --- a/hw/xfree86/parser/Makefile.am +++ b/hw/xfree86/parser/Makefile.am @@ -25,7 +25,7 @@ libxf86config_a_SOURCES = \ DRI.c \ Extensions.c -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC EXTRA_DIST = \ Configint.h \ 1.1 x11-base/xorg-server/files/1.4-fix-xprint-build.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-fix-xprint-build.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-fix-xprint-build.patch?rev=1.1&content-type=text/plain Index: 1.4-fix-xprint-build.patch =================================================================== diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c index a465c4c..1e7652e 100644 --- a/hw/xprint/ddxInit.c +++ b/hw/xprint/ddxInit.c @@ -310,6 +310,17 @@ ChangeDeviceControl ( return BadMatch; } +int +NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) +{ + return BadValue; +} + +void +DeleteInputDeviceRequest(DeviceIntPtr dev) +{ +} + void OpenInputDevice ( DeviceIntPtr dev, 1.1 x11-base/xorg-server/files/1.4-fix-xprint-link.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-fix-xprint-link.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-fix-xprint-link.patch?rev=1.1&content-type=text/plain Index: 1.4-fix-xprint-link.patch =================================================================== diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am index dc8764a..728e69d 100644 --- a/hw/xprint/Makefile.am +++ b/hw/xprint/Makefile.am @@ -12,7 +12,7 @@ Xprt_LDFLAGS = -L$(top_srcdir) Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \ pcl/libpcl.la pcl-mono/libpcl.la $(top_builddir)/fb/libfb.la \ $(top_builddir)/render/librender.la $(top_builddir)/mi/libmi.la \ - $(top_builddir)/Xext/libXext.la @FREETYPE_LIBS@ + $(top_builddir)/Xext/libXext.la @FREETYPE_LIBS@ @XSERVER_LIBS@ miinitext-wrapper.c: echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@ 1.1 x11-base/xorg-server/files/1.4-fix-dmx-link.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-fix-dmx-link.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-fix-dmx-link.patch?rev=1.1&content-type=text/plain Index: 1.4-fix-dmx-link.patch =================================================================== diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index 002ea11..15dc281 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -87,6 +87,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \ $(GLX_LIBS) \ input/libdmxinput.a \ config/libdmxconfig.a \ + @XSERVER_LIBS@ \ @DMXMODULES_LIBS@ # Man page 1.1 x11-base/xorg-server/files/1.4-fix-xephyr-link.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-fix-xephyr-link.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/1.4-fix-xephyr-link.patch?rev=1.1&content-type=text/plain Index: 1.4-fix-xephyr-link.patch =================================================================== diff --git a/configure.ac b/configure.ac index 62fdd78..7a37590 100644 --- a/configure.ac +++ b/configure.ac @@ -1802,7 +1802,7 @@ if test "$KDRIVE" = yes; then XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS" fi - PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) + PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp $PIXMAN, [xephyr="yes"], [xephyr="no"]) if test "x$XEPHYR" = xauto; then XEPHYR=$xephyr fi diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am index cc3019f..1738d0f 100644 --- a/hw/kdrive/ephyr/Makefile.am +++ b/hw/kdrive/ephyr/Makefile.am @@ -28,6 +28,7 @@ Xephyr_LDADD = \ libxephyr-hostx.a \ ../../../exa/libexa.la \ @KDRIVE_LIBS@ \ + @XSERVER_LIBS@ \ @XEPHYR_LIBS@ Xephyr_DEPENDENCIES = \ 1.1 x11-base/xorg-server/files/digest-xorg-server-1.4 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/digest-xorg-server-1.4?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/files/digest-xorg-server-1.4?rev=1.1&content-type=text/plain Index: digest-xorg-server-1.4 =================================================================== MD5 c056abd763e899114bf745c9eedbf9ad MesaLib-7.0.1.tar.bz2 3343538 RMD160 b44fd8ebffd17aa72c3b6cca1c2924e66787aa78 MesaLib-7.0.1.tar.bz2 3343538 SHA256 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7 MesaLib-7.0.1.tar.bz2 3343538 MD5 a06d9fe4f9f1d459ae02657f9ce64220 xorg-server-1.4.tar.bz2 6179392 RMD160 74a274c880a9508be26b76acdb504a8e88b63a46 xorg-server-1.4.tar.bz2 6179392 SHA256 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 xorg-server-1.4.tar.bz2 6179392 -- gentoo-commits@gentoo.org mailing list