autogen.sh | 4 - configure.ac | 5 - debian/changelog | 16 ++++ debian/compat | 2 debian/control | 11 +-- debian/copyright | 2 debian/rules | 6 - debian/upstream/signing-key.asc | 137 ++++++++++++++++++++++++++++++++++++++++ debian/watch | 5 - src/dummy_driver.c | 72 +-------------------- 10 files changed, 177 insertions(+), 83 deletions(-)
New commits: commit 6839ae0d44fea1d6f00d8a6cb6ef3ac988d3af63 Author: Emilio Pozuelo Monfort <[email protected]> Date: Thu Dec 15 00:11:09 2016 +0100 Release to unstable diff --git a/debian/changelog b/debian/changelog index 56a90be..0b73fff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-dummy (1:0.3.8-1) UNRELEASED; urgency=medium +xserver-xorg-video-dummy (1:0.3.8-1) unstable; urgency=medium * New upstream release. - Uses dixChangeWindowProperty instead of ChangeWindowProperty, @@ -12,7 +12,7 @@ xserver-xorg-video-dummy (1:0.3.8-1) UNRELEASED; urgency=medium * Bump Standards-Version to 3.9.8. * Switch URLs to https. - -- Emilio Pozuelo Monfort <[email protected]> Wed, 14 Dec 2016 22:31:37 +0100 + -- Emilio Pozuelo Monfort <[email protected]> Thu, 15 Dec 2016 00:11:05 +0100 xserver-xorg-video-dummy (1:0.3.7-1) unstable; urgency=low commit 37314951e2c2b603cc0d858dcdd936e865fc0130 Author: Emilio Pozuelo Monfort <[email protected]> Date: Thu Dec 15 00:10:49 2016 +0100 Switch URLs to https diff --git a/debian/changelog b/debian/changelog index b4fbdba..56a90be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xserver-xorg-video-dummy (1:0.3.8-1) UNRELEASED; urgency=medium * debian/watch: check upstream signatures with... * debian/upstream/signing-key.asc: ...the upstream keys. * Bump Standards-Version to 3.9.8. + * Switch URLs to https. -- Emilio Pozuelo Monfort <[email protected]> Wed, 14 Dec 2016 22:31:37 +0100 diff --git a/debian/control b/debian/control index 085cfb4..15edb84 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ Build-Depends: x11proto-render-dev, xutils-dev Standards-Version: 3.9.8 -Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-dummy -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-dummy.git +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-dummy.git +Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-xorg/driver/xserver-xorg-video-dummy.git Package: xserver-xorg-video-dummy Architecture: any @@ -32,6 +32,6 @@ Description: X.Org X server -- dummy display driver display anything. . More information about X.Org can be found at: - <URL:http://www.X.org> + <URL:https://www.X.org> . This package is built from the X.org xf86-video-dummy driver module. diff --git a/debian/copyright b/debian/copyright index f6efdaf..2353155 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ This package was downloaded from -http://xorg.freedesktop.org/releases/individual/driver/ +https://xorg.freedesktop.org/releases/individual/driver/ Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. diff --git a/debian/watch b/debian/watch index dbcd03e..d9043af 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ #git=git://anongit.freedesktop.org/xorg/driver/xf86-video-dummy version=4 opts=pgpsigurlmangle=s/$/.sig/ \ -http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-dummy-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/driver/ xf86-video-dummy-(.*)\.tar\.gz commit 82a59a9be0092c114d8411e19fb22a3a6367d09b Author: Emilio Pozuelo Monfort <[email protected]> Date: Thu Dec 15 00:08:49 2016 +0100 Bump Standards-Version diff --git a/debian/changelog b/debian/changelog index 5af54b0..b4fbdba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xserver-xorg-video-dummy (1:0.3.8-1) UNRELEASED; urgency=medium * Don't pass --disable-silent-rules, debhelper does that for a while. * debian/watch: check upstream signatures with... * debian/upstream/signing-key.asc: ...the upstream keys. + * Bump Standards-Version to 3.9.8. -- Emilio Pozuelo Monfort <[email protected]> Wed, 14 Dec 2016 22:31:37 +0100 diff --git a/debian/control b/debian/control index fd92cff..085cfb4 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: x11proto-randr-dev, x11proto-render-dev, xutils-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.8 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-dummy Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-dummy.git commit d7f13cfe964b118a45a7fa7c85109913e0e8a22f Author: Emilio Pozuelo Monfort <[email protected]> Date: Thu Dec 15 00:05:38 2016 +0100 Set libdir to /usr/lib diff --git a/debian/changelog b/debian/changelog index b9f3b91..5af54b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xserver-xorg-video-dummy (1:0.3.8-1) UNRELEASED; urgency=medium as the latter is gone in the xserver. Closes: #845728. * Bump debhelper compat to 10. - Let debhelper call autoreconf for us. + - Set libdir to /usr/lib, which is where the xserver expects the drivers. * Don't pass --disable-silent-rules, debhelper does that for a while. * debian/watch: check upstream signatures with... * debian/upstream/signing-key.asc: ...the upstream keys. diff --git a/debian/rules b/debian/rules index 9325f51..50ca398 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ # Disable DGA support, it's been on the way out for a while already: override_dh_auto_configure: dh_auto_configure -- \ + --libdir=\$${exec_prefix}/lib \ --disable-dga # Install in debian/tmp to retain control through dh_install: commit 8d2835db58ac65bf11ece7afb1a58fe8fae6b68f Author: Emilio Pozuelo Monfort <[email protected]> Date: Wed Dec 14 23:58:39 2016 +0100 Add upstream keys to verify tarballs diff --git a/debian/changelog b/debian/changelog index 79e13b8..b9f3b91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ xserver-xorg-video-dummy (1:0.3.8-1) UNRELEASED; urgency=medium * Bump debhelper compat to 10. - Let debhelper call autoreconf for us. * Don't pass --disable-silent-rules, debhelper does that for a while. + * debian/watch: check upstream signatures with... + * debian/upstream/signing-key.asc: ...the upstream keys. -- Emilio Pozuelo Monfort <[email protected]> Wed, 14 Dec 2016 22:31:37 +0100 diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..283166c --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,137 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +RFczHk65xOzyEL2QBacv2vfoakwE +=dK2e +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index fcb8473..dbcd03e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ #git=git://anongit.freedesktop.org/xorg/driver/xf86-video-dummy -version=3 +version=4 +opts=pgpsigurlmangle=s/$/.sig/ \ http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-dummy-(.*)\.tar\.gz commit 0df1a82534ebd4a4aea46b573172651156882fac Author: Emilio Pozuelo Monfort <[email protected]> Date: Wed Dec 14 23:46:21 2016 +0100 Let debhelper pass --disable-silent-rules diff --git a/debian/changelog b/debian/changelog index 2a5a5a1..79e13b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xserver-xorg-video-dummy (1:0.3.8-1) UNRELEASED; urgency=medium as the latter is gone in the xserver. Closes: #845728. * Bump debhelper compat to 10. - Let debhelper call autoreconf for us. + * Don't pass --disable-silent-rules, debhelper does that for a while. -- Emilio Pozuelo Monfort <[email protected]> Wed, 14 Dec 2016 22:31:37 +0100 diff --git a/debian/rules b/debian/rules index ea48500..9325f51 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,7 @@ # Disable DGA support, it's been on the way out for a while already: override_dh_auto_configure: dh_auto_configure -- \ - --disable-dga \ - --disable-silent-rules + --disable-dga # Install in debian/tmp to retain control through dh_install: override_dh_auto_install: commit ac75c3bc264148f22f210cb410269ca421d6054e Author: Emilio Pozuelo Monfort <[email protected]> Date: Wed Dec 14 23:45:32 2016 +0100 Let debhelper call autoreconf for us diff --git a/debian/changelog b/debian/changelog index 9d30dde..2a5a5a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xserver-xorg-video-dummy (1:0.3.8-1) UNRELEASED; urgency=medium - Uses dixChangeWindowProperty instead of ChangeWindowProperty, as the latter is gone in the xserver. Closes: #845728. * Bump debhelper compat to 10. + - Let debhelper call autoreconf for us. -- Emilio Pozuelo Monfort <[email protected]> Wed, 14 Dec 2016 22:31:37 +0100 diff --git a/debian/control b/debian/control index 0765b83..fd92cff 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Debian X Strike Force <[email protected]> Uploaders: Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 10), - dh-autoreconf, quilt, pkg-config, xserver-xorg-dev (>= 2:1.11.99.901), diff --git a/debian/rules b/debian/rules index 43c034f..ea48500 100755 --- a/debian/rules +++ b/debian/rules @@ -20,4 +20,4 @@ override_dh_shlibdeps: dh_shlibdeps -- --warnings=6 %: - dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ + dh $@ --with quilt,xsf --builddirectory=build/ commit 69682a7c166bb8712c3f0f75b3be47696732a64c Author: Emilio Pozuelo Monfort <[email protected]> Date: Wed Dec 14 23:44:43 2016 +0100 Bump debhelper compat to 10 diff --git a/debian/changelog b/debian/changelog index 783bfe3..9d30dde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-video-dummy (1:0.3.8-1) UNRELEASED; urgency=medium * New upstream release. - Uses dixChangeWindowProperty instead of ChangeWindowProperty, as the latter is gone in the xserver. Closes: #845728. + * Bump debhelper compat to 10. -- Emilio Pozuelo Monfort <[email protected]> Wed, 14 Dec 2016 22:31:37 +0100 diff --git a/debian/compat b/debian/compat index 45a4fb7..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +10 diff --git a/debian/control b/debian/control index e6afe91..0765b83 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: Cyril Brulebois <[email protected]> Build-Depends: - debhelper (>= 8), + debhelper (>= 10), dh-autoreconf, quilt, pkg-config, commit f11cf0a6198eefd470266cbc3218ea9e54b96fbd Author: Emilio Pozuelo Monfort <[email protected]> Date: Wed Dec 14 23:43:59 2016 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index a8991e5..783bfe3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-dummy (1:0.3.8-1) UNRELEASED; urgency=medium + + * New upstream release. + - Uses dixChangeWindowProperty instead of ChangeWindowProperty, + as the latter is gone in the xserver. Closes: #845728. + + -- Emilio Pozuelo Monfort <[email protected]> Wed, 14 Dec 2016 22:31:37 +0100 + xserver-xorg-video-dummy (1:0.3.7-1) unstable; urgency=low [ Maarten Lankhorst ] commit 4a6df6b4eecae769771eba0136bf8271d01258fb Author: Julien Cristau <[email protected]> Date: Wed Dec 14 21:57:18 2016 +0100 xf86-video-dummy 0.3.8 Signed-off-by: Julien Cristau <[email protected]> diff --git a/configure.ac b/configure.ac index 30cf405..4eb7fae 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-dummy], - [0.3.7], + [0.3.8], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-dummy]) AC_CONFIG_SRCDIR([Makefile.am]) commit 52a6346c63c20c79f54c34e2950ccc5f1d2fb138 Author: Julien Cristau <[email protected]> Date: Wed Dec 14 21:59:29 2016 +0100 configure: require xorg-server 1.4.99.901 dixChangeWindowProperty was introduced in that release. Signed-off-by: Julien Cristau <[email protected]> diff --git a/configure.ac b/configure.ac index 005611d..30cf405 100644 --- a/configure.ac +++ b/configure.ac @@ -66,7 +66,7 @@ AC_SUBST([DGA]) AM_CONDITIONAL([DGA], [test "x$DGA" = xyes]) # Obtain compiler/linker options for the driver dependencies -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4.99.901] xproto fontsproto $REQUIRED_MODULES) # Checks for libraries. commit e434975017eb90fa702653592ae590bc22aa483c Author: Aaron Plattner <[email protected]> Date: Thu Sep 22 09:14:26 2016 -0700 Remove pointless empty functions These functions might be useful in a real driver, but with no hardware, they're pointless. Get rid of them. v2: Rebase, get rid of pointless calls to DUMMYAdjustFrame, return TRUE from DUMMYSwitchMode. Signed-off-by: Aaron Plattner <[email protected]> Reviewed-by: Antoine Martin <[email protected]> Tested-by: Antoine Martin <[email protected]> diff --git a/src/dummy_driver.c b/src/dummy_driver.c index cf15053..2656602 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -65,9 +65,6 @@ static ModeStatus DUMMYValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode); /* Internally used functions */ -static Bool dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); -static void dummySave(ScrnInfoPtr pScrn); -static void dummyRestore(ScrnInfoPtr pScrn, Bool restoreText); static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr); @@ -461,14 +458,6 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags) static Bool DUMMYEnterVT(VT_FUNC_ARGS_DECL) { - SCRN_INFO_PTR(arg); - - /* Should we re-save the text mode on each VT enter? */ - if(!dummyModeInit(pScrn, pScrn->currentMode)) - return FALSE; - - DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); - return TRUE; } @@ -476,8 +465,6 @@ DUMMYEnterVT(VT_FUNC_ARGS_DECL) static void DUMMYLeaveVT(VT_FUNC_ARGS_DECL) { - SCRN_INFO_PTR(arg); - dummyRestore(pScrn, TRUE); } static void @@ -535,15 +522,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL) if (!(dPtr->FBBase = malloc(pScrn->videoRam * 1024))) return FALSE; - - /* - * next we save the current state and setup the first mode - */ - dummySave(pScrn); - - if (!dummyModeInit(pScrn,pScrn->currentMode)) - return FALSE; - DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); /* * Reset visual list. @@ -665,8 +643,7 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL) Bool DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL) { - SCRN_INFO_PTR(arg); - return dummyModeInit(pScrn, mode); + return TRUE; } /* Mandatory */ @@ -683,7 +660,6 @@ DUMMYCloseScreen(CLOSE_SCREEN_ARGS_DECL) DUMMYPtr dPtr = DUMMYPTR(pScrn); if(pScrn->vtSema){ - dummyRestore(pScrn, TRUE); free(dPtr->FBBase); } @@ -725,24 +701,6 @@ DUMMYValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) return(MODE_OK); } -static void -dummySave(ScrnInfoPtr pScrn) -{ -} - -static void -dummyRestore(ScrnInfoPtr pScrn, Bool restoreText) -{ -} - -static Bool -dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) -{ - dummyRestore(pScrn, FALSE); - - return(TRUE); -} - Atom VFB_PROP = 0; #define VFB_PROP_NAME "VFB_IDENT" commit 367c778240b4266958f33cec3653d5389e283557 Author: Antoine Martin <[email protected]> Date: Tue Sep 20 13:34:40 2016 +0700 remove dead code in dummy driver Signed-off-by: Antoine Martin <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Aaron Plattner <[email protected]> Signed-off-by: Aaron Plattner <[email protected]> diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 9d4d5bf..cf15053 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -673,25 +673,6 @@ DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL) void DUMMYAdjustFrame(ADJUST_FRAME_ARGS_DECL) { - SCRN_INFO_PTR(arg); - int Base; - - Base = (y * pScrn->displayWidth + x) >> 2; - - /* Scale Base by the number of bytes per pixel. */ - switch (pScrn->depth) { - case 8 : - break; - case 15 : - case 16 : - Base *= 2; - break; - case 24 : - Base *= 3; - break; - default : - break; - } } /* Mandatory */ commit 8706f60ab457867c120dd44e812b8fadc2be7179 Author: Peter Hutterer <[email protected]> Date: Thu Jan 14 10:30:40 2016 +1000 Switch to using dixChangeWindowProperty eb36924ead40564325aa56d54a973dc8fb4eae83 removed ChangeWindowProperty from the server. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Jon Turney <[email protected]> diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 470e125..9d4d5bf 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -790,8 +790,9 @@ DUMMYCreateWindow(WindowPtr pWin) if (! ValidAtom(VFB_PROP)) VFB_PROP = MakeAtom(VFB_PROP_NAME, strlen(VFB_PROP_NAME), 1); - ret = ChangeWindowProperty(pWinRoot, VFB_PROP, XA_STRING, - 8, PropModeReplace, (int)4, (pointer)"TRUE", FALSE); + ret = dixChangeWindowProperty(serverClient, pWinRoot, VFB_PROP, + XA_STRING, 8, PropModeReplace, + (int)4, (pointer)"TRUE", FALSE); if( ret != Success) ErrorF("Could not set VFB root window property"); dPtr->prop = TRUE; commit 29433844c8b8989ea2ac64bd92b3ad61b6f9cf10 Author: Antoine Martin <[email protected]> Date: Thu Sep 17 10:55:25 2015 -0400 Honor DacSpeed setting in xorg.conf Reviewed-by: Adam Jackson <[email protected]> Signed-off-by: Antoine Martin <[email protected]> diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 6062c39..470e125 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -281,7 +281,7 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags) ClockRangePtr clockRanges; int i; DUMMYPtr dPtr; - int maxClock = 230000; + int maxClock = 300000; GDevPtr device = xf86GetEntityInfo(pScrn->entityList[0])->device; if (flags & PROBE_DETECT) @@ -391,7 +391,7 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags) clockRanges->next = NULL; clockRanges->ClockMulFactor = 1; clockRanges->minClock = 11000; /* guessed ยงยงยง */ - clockRanges->maxClock = 300000; + clockRanges->maxClock = maxClock; clockRanges->clockIndex = -1; /* programmable */ clockRanges->interlaceAllowed = TRUE; clockRanges->doubleScanAllowed = TRUE; commit 0e339b256a858bfd832c92e3c14619023dea826c Author: Alan Coopersmith <[email protected]> Date: Sat May 31 21:39:32 2014 -0700 autogen.sh: Honor NOCONFIGURE=1 See http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/autogen.sh b/autogen.sh index 354f254..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure "$@" +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi commit 85402253d0f9ca464d54336e48e9a7ac91fc39bb Author: Alan Coopersmith <[email protected]> Date: Sat May 31 21:38:41 2014 -0700 configure: Drop AM_MAINTAINER_MODE Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/autogen.sh b/autogen.sh index 904cd67..354f254 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,4 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +$srcdir/configure "$@" diff --git a/configure.ac b/configure.ac index 06e6d87..005611d 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,6 @@ AC_CONFIG_AUX_DIR(.) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION],
