Re: [ANNOUNCE] xorg-server 1.7.99.2
On Sun, Dec 20, 2009 at 11:58:08AM -0800, Dan Nicholson wrote:
> On Sun, Dec 20, 2009 at 11:24 AM, Stephan Raue
> wrote:
> > Zitat von Dan Nicholson :
> >
> >> On Sun, Dec 20, 2009 at 5:19 AM, Stephan Raue
> >> wrote:
> >>>
> >>> Hi all,
> >>>
> >>> when i am crosscompiling xorg-server i get an error from configure:
> >>> checking for /etc/X11/fontpath.d... configure: error: cannot check for
> >>> file existence when cross compiling
> >>>
> >>> is it possible to make this easyer for crosscompiling without patching
> >>> configure.ac and configure in an release?
> >>
> >> That's just the way AC_CHECK_FILE works. Since you're cross-compiling,
> >> it doesn't think it's appropriate to check for files on the build
> >> system to determine behavior. It continues, right? It should just give
> >> you the fallback behavior. If you want to specify the fontpath, use
> >> --with-default-font-path.
> >
> > no it doesnt continue, and i have already set --with-default-font-path ...
>
> It looks like there's multiple issues with this approach, but the
> attached should fix the cross compiling problem. We also need to
> address the fact the file test won't resolve all the way when
> $sysconfdir is not specified on the command line. E.g.,
> sysconfdir=${prefix}/etc by default, and then test -r
> "${sysconfdir}/X11/fontpath.d" fails:
>
> checking for ${prefix}/etc/X11/fontpath.d... no
>
> --
> Dan
> From fb76047a38eb1a5ce44ecbb68fd8206a60b7af7c Mon Sep 17 00:00:00 2001
> From: Dan Nicholson
> Date: Sun, 20 Dec 2009 11:50:25 -0800
> Subject: [PATCH] Don't use AC_CHECK_FILE for fontpath checks when cross
> compiling
>
> AC_CHECK_FILE chokes when cross compiling, so instead we set the default
> to the standard FONTROOTDIR directories in that case.
>
> Signed-off-by: Dan Nicholson
> ---
> configure.ac | 21 -
> 1 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 6cdef15..6e7c214 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -503,18 +503,21 @@ XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi)
> XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi)
>
> dnl Uses --default-font-path if set, otherwise checks for
> /etc/X11/fontpath.d,
> -dnl otherwise uses standard subdirectories of FONTROOTDIR
> -AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
> - [DEFAULT_FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d'],
> - [
> -
> DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
> - case $host_os in
> - darwin*)
> DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts"
> ;;
> - esac
> - ])
> +dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
> +dnl compiling, assume default font path uses standard FONTROOTDIR
> directories.
> +DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
> +if test "$cross_compiling" != yes; then
> + AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
> + [DEFAULT_FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d'],
> + [case $host_os in
> + darwin*)
> DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts"
> ;;
> + esac])
> +fi
> AC_ARG_WITH(default-font-path,
> AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font
> dirs]),
> [ FONTPATH="$withval" ],
> [ FONTPATH="${DEFAULT_FONT_PATH}" ])
> +AC_MSG_CHECKING([for default font path])
> +AC_MSG_RESULT([$FONTPATH])
>
> AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path
> to XKB base dir (default: ${datadir}/X11/xkb)]),
> [ XKBPATH="$withval" ],
> --
> 1.6.2.5
>
Reviewed-by: Peter Hutterer
Cheers,
Peter
___
xorg-announce mailing list
xorg-announce@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg-announce
[ANNOUNCE] xorg-server 1.7.99.2
Here's the second snapshot towards 1.8. Sorry for the long lag since the first snapshot; I was waiting to get the 'fb' issue resolved. Note that this release includes new ABI versions for version 1.8, affecting the input, video and extension interfaces as CreateNewResourceType has gotten an additional argument, while RegisterResourceName should no longer be needed outside of DIX. Thanks to all involved for their work and also for helping with the new release process. -keith Adam Jackson (9): dix: Fix up colormap fixup. modes: Decorate interlaced mode names with a trailing 'i' EDID: Fix interlaced detailed timings to be frame size, not field size modes: De-duplicate a clock range check. modes: Fix duplicate detection, and do it more consistently EDID: Extend the HDTV hack to handle "1368x769" randr: Turn on ModeDebug during server setup randr: Fill in errorValue when verifying outputs/crtcs/modes glx: swrast can do GLX 1.4 too Alan Coopersmith (14): Use $(MAKE) instead of "make" to build Solaris inline assembly Enable XF86PM on all Solaris platforms, not just x86/x64 Fix builds with --with-int10=stub Fix dtrace object builds of libos to link with SHA1_LIBS COPYING: Update license preamble Update Sun license notices to current X.Org standard form Add freetype & type1 to the LoadModules ignore list Convert checks for PC98 support from platform #ifdefs to configure flag Add platform compatibility defines for Sun Studio compilers Change sysconfdir brackets to avoid some shells trying to run it as a command Change default xkb model from pc104 to pc105 Check for failures from CreateNewResourceType Ensure all resource types created have names registered Add type name argument to CreateNewResourceType Chase Douglas (1): Move FD_CLR above pInfo->read_input Colin Harrison (6): Xming: Replace all the uses of deprecated functions in hw/xwin with current ones Xming: Add mouse motion events with flag POINTER_SCREEN in winEnqueueMotion() Xming: Add FORCEEXIT option to configuration file Xming: Fix UT8String and CompoundText clipboard text sharing with windows clipboard Xming: Tidy up code for initial native window positioning Xming: Make -auth option work in with -multiwindow Dave Airlie (1): loader: actually stat something that has some chance of existing. (v2) Gaetan Nadon (5): .gitignore: use common defaults with custom section #24239 Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 Deploy the new XORG_DEFAULT_OPTIONS #24242 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 configure.ac: error while checking for XDMXCONFIG_DEP Hans Nieser (1): Xinput: allow non-integer values again for Constant- and AdaptiveDeceleration Ingmar Vanhassel (2): Update COMPILEDDEFAULTFONTPATH to match the new default font path Update man-pages for new default font paths Jamey Sharp (5): Alloc/free drawables array for each ProcPanoramiXShmGetImage call. Add video driver flag to indicate that console access is not needed. Suppress GCC warnings like "the address of `u1' will always evaluate as `true'". Don't cast double to int: use default conversions or explicitly round. Suppress certain GCC warnings in auto-generated code. Jeremy Huddleston (17): XQuartz: Run xmodmap after programatically updating the keymap. dix: Properly detect if the other device is frozen XQuartz: Controller thread launches clients XQuartz: Don't weed out duplicates in generated keymap XQuartz: Use dixLookupResourceByType instead of LookupIDByType XQuartz: Cleanup X11Controller.m compilation warnings. SHA1: Add support for Common Crypto configure.ac: Notify user about which SHA1 implementation is being used XQuartz: Buildfix for Leopard and older XQuartz: pbproxy: Wait for the server to finish starting up, so display is valid. XQuartz: Explicitly pass a bellProc to make XBell() work again. XQuartz: Allow better compatability with older versions of xinit XQuartz: Drop calls to alloca Miscellaneous compilation warning fixes XQuartz: pbproxy: Fix building of standalone xpbproxy executable dtrace: Add Xserver-dtrace.h to CLEANFILES Xfake: Nuke -Wl,-undefined=InitExtensions from LDFLAGS Jon TURNEY (10): Resolve an inconsistency between libX11 and Xserver over GetModifierMapping dmx: Correctly compute DMXGetScreenAttributes reply length Cygwin/X: Remove a couple of extraneous '\n' in logged version info Cygwin/X: Fix typo in g_fAnotherWMRunning and tidy up WM detection code Cygwin/X: Add a workaround for a SWT/Motif bug to internal window manager Cygwin/X: Clearly diagnose a timeout while waiting for SelectionNotify eve
