Hello community, here is the log from the commit of package xorg-x11 checked in at Thu Dec 7 21:33:48 CET 2006. -------- --- xorg-x11/xorg-x11.changes 2006-11-24 15:46:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2006-12-06 00:20:02.000000000 +0100 @@ -1,0 +2,34 @@ +Wed Dec 6 00:19:10 CET 2006 - sndirsch@suse.de + +- removed /usr/%{_lib}/X11/xdm/libXdmGreet.a, + /usr/%{_lib}/X11/xdm/libXdmGreet.la (Bug #223734) + +------------------------------------------------------------------- +Tue Dec 5 10:47:08 CET 2006 - sndirsch@suse.de + +- updated setxkbmap to release 1.0.3 + * new "-device" option to specify device + +------------------------------------------------------------------- +Sun Dec 3 22:02:42 CET 2006 - sndirsch@suse.de + +- updated rendercheck to release 1.2 + * New version that adds one small new test, more command flags + to control what tests are run, and testing against more formats. + Now, bugs in Render code revealed by rendercheck may be slightly + less mysterious. +- updated sessreg to release 1.0.2 + * Fix grep pattern in Makefile.am + * include <time.h> before <utmp.h>. Required on some systems. + * obsoletes sessreg.diff +- updated twm to release 1.0.3 + * Fix system.twmrc handling +- updated xdm to release 1.1.2 + * Bug 7317: xfs doesn't build on some GLIBC based systems: + _XOPEN_SOURCE undefined +- updated xfs to release 1.0.4 + * Bug 7317: xfs doesn't build on some GLIBC based systems: + _XOPEN_SOURCE undefined +- removed deprecated mkcfm (X.Org Bug #5553) + +------------------------------------------------------------------- Old: ---- mkcfm-X11R7.0-1.0.1.tar.bz2 rendercheck-1.1.tar.bz2 sessreg-1.0.1.tar.bz2 sessreg.diff setxkbmap-X11R7.1-1.0.2.tar.bz2 twm-1.0.2.tar.bz2 xdm-1.1.1.tar.bz2 xfs-1.0.3.tar.bz2 New: ---- rendercheck-1.2.tar.bz2 sessreg-1.0.2.tar.bz2 setxkbmap-1.0.3.tar.bz2 twm-1.0.3.tar.bz2 xdm-1.1.2.tar.bz2 xfs-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.RvOewe/_old 2006-12-07 21:33:25.000000000 +0100 +++ /var/tmp/diff_new_pack.RvOewe/_new 2006-12-07 21:33:25.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 24 +Release: 26 License: X11/MIT, Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -35,7 +35,6 @@ Source10: lbxproxy-X11R7.0-1.0.1.tar.bz2 Source11: listres-X11R7.0-1.0.1.tar.bz2 Source12: luit-1.0.2.tar.bz2 -Source13: mkcfm-X11R7.0-1.0.1.tar.bz2 Source14: mkfontdir-X11R7.1-1.0.2.tar.bz2 Source15: mkfontscale-1.0.3.tar.bz2 Source16: oclock-X11R7.0-1.0.1.tar.bz2 @@ -43,11 +42,11 @@ Source18: rgb-X11R7.1-1.0.1.tar.bz2 Source19: rstart-X11R7.1-1.0.2.tar.bz2 Source20: scripts-X11R7.0-1.0.1.tar.bz2 -Source21: sessreg-1.0.1.tar.bz2 -Source22: setxkbmap-X11R7.1-1.0.2.tar.bz2 +Source21: sessreg-1.0.2.tar.bz2 +Source22: setxkbmap-1.0.3.tar.bz2 Source23: showfont-X11R7.0-1.0.1.tar.bz2 Source24: smproxy-X11R7.1-1.0.2.tar.bz2 -Source25: twm-1.0.2.tar.bz2 +Source25: twm-1.0.3.tar.bz2 Source26: viewres-X11R7.0-1.0.1.tar.bz2 Source27: x11perf-X11R7.1-1.4.1.tar.bz2 Source28: xauth-X11R7.0-1.0.1.tar.bz2 @@ -61,7 +60,7 @@ Source36: xcursorgen-X11R7.1-1.0.1.tar.bz2 Source37: xdbedizzy-1.0.2.tar.bz2 Source38: xditview-X11R7.0-1.0.1.tar.bz2 -Source39: xdm-1.1.1.tar.bz2 +Source39: xdm-1.1.2.tar.bz2 Source40: xdpyinfo-X11R7.0-1.0.1.tar.bz2 Source41: xdriinfo-X11R7.1-1.0.1.tar.bz2 Source42: xedit-X11R7.1-1.0.2.tar.bz2 @@ -71,7 +70,7 @@ Source46: xfd-X11R7.0-1.0.1.tar.bz2 Source47: xfindproxy-X11R7.0-1.0.1.tar.bz2 Source48: xfontsel-X11R7.0-1.0.1.tar.bz2 -Source49: xfs-1.0.3.tar.bz2 +Source49: xfs-1.0.4.tar.bz2 Source50: xfsinfo-X11R7.0-1.0.1.tar.bz2 Source51: xfwp-X11R7.0-1.0.1.tar.bz2 Source52: xgamma-X11R7.0-1.0.1.tar.bz2 @@ -116,7 +115,7 @@ Source91: xwininfo-X11R7.1-1.0.2.tar.bz2 Source92: xwud-X11R7.0-1.0.1.tar.bz2 Source93: mkcomposecache-1.1.tar.bz2 -Source94: rendercheck-1.1.tar.bz2 +Source94: rendercheck-1.2.tar.bz2 Source200: misc.tar.bz2 Source201: twm.tar.bz2 Source202: xdm.tar.bz2 @@ -140,7 +139,6 @@ Patch17: x11r6.9.0-setuid.diff Patch19: scripts.diff Patch20: xdm.diff -Patch22: sessreg.diff %description This package contains the X.Org core and sample applications. @@ -222,7 +220,6 @@ popd %patch17 patch -d scripts-* -p0 -s < %PATCH19 -patch -d sessreg-* -p0 -s < %PATCH22 %build @@ -235,7 +232,6 @@ pushd $dir #autoreconf -fi case $dir in - mkcfm-*) option="--with-ciddir=/usr/share/fonts/CID" ;; xdm-*) option="--with-pam --with-xdmconfigdir=/etc/X11/xdm --with-xdmscriptdir=/etc/X11/xdm" ;; xfs-*|lbxproxy-*|proxymngr-*|rstart-*|x11perf-*|xedit-*|xinit-*|xsm-*|scripts-*|sessreg-*) option=""; autoreconf -fi ;; @@ -321,6 +317,9 @@ $RPM_BUILD_ROOT/usr/sbin/rcxdm \ $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.displaymanager %endif + # Bug 223734 + rm $RPM_BUILD_ROOT/usr/%{_lib}/X11/xdm/libXdmGreet.a \ + $RPM_BUILD_ROOT/usr/%{_lib}/X11/xdm/libXdmGreet.la ;; xfs-*) pushd $RPM_BUILD_ROOT @@ -441,6 +440,31 @@ /var/lib/xdm/authdir/ %changelog -n xorg-x11 +* Wed Dec 06 2006 - sndirsch@suse.de +- removed /usr/%%{_lib}/X11/xdm/libXdmGreet.a, + /usr/%%{_lib}/X11/xdm/libXdmGreet.la (Bug #223734) +* Tue Dec 05 2006 - sndirsch@suse.de +- updated setxkbmap to release 1.0.3 + * new "-device" option to specify device +* Sun Dec 03 2006 - sndirsch@suse.de +- updated rendercheck to release 1.2 + * New version that adds one small new test, more command flags + to control what tests are run, and testing against more formats. + Now, bugs in Render code revealed by rendercheck may be slightly + less mysterious. +- updated sessreg to release 1.0.2 + * Fix grep pattern in Makefile.am + * include <time.h> before <utmp.h>. Required on some systems. + * obsoletes sessreg.diff +- updated twm to release 1.0.3 + * Fix system.twmrc handling +- updated xdm to release 1.1.2 + * Bug 7317: xfs doesn't build on some GLIBC based systems: + _XOPEN_SOURCE undefined +- updated xfs to release 1.0.4 + * Bug 7317: xfs doesn't build on some GLIBC based systems: + _XOPEN_SOURCE undefined +- removed deprecated mkcfm (X.Org Bug #5553) * Fri Nov 24 2006 - sndirsch@suse.de - added /usr/bin/X11 compatibility symlink (Bug #223524) * Mon Nov 20 2006 - sndirsch@suse.de ++++++ p_xauth.diff ++++++ --- /var/tmp/diff_new_pack.RvOewe/_old 2006-12-07 21:33:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RvOewe/_new 2006-12-07 21:33:26.000000000 +0100 @@ -174,7 +174,7 @@ extern int auth_finalize ( void ); extern int process_command ( char *inputfilename, int lineno, int argc, char **argv ); --- programs/xdm/auth.c.orig 2005-11-09 10:41:27.000000000 +0100 -+++ xdm-1.1.1/auth.c 2005-11-11 11:33:00.000000000 +0100 ++++ xdm-1.1.2/auth.c 2005-11-11 11:33:00.000000000 +0100 @@ -680,7 +680,7 @@ } ++++++ ps_suse.diff ++++++ --- /var/tmp/diff_new_pack.RvOewe/_old 2006-12-07 21:33:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RvOewe/_new 2006-12-07 21:33:26.000000000 +0100 @@ -1,5 +1,5 @@ --- twm-X11R7.0-1.0.1.orig/src/system.twmrc 2006-08-19 11:02:18.000000000 +0200 -+++ twm-1.0.2/src/system.twmrc 2006-08-19 11:02:35.000000000 +0200 ++++ twm-1.0.3/src/system.twmrc 2006-08-19 11:02:35.000000000 +0200 @@ -15,11 +15,11 @@ NoGrabServer RestartPreviousState ++++++ rendercheck-1.1.tar.bz2 -> rendercheck-1.2.tar.bz2 ++++++ ++++ 1617 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/Makefile.am new/rendercheck-1.2/Makefile.am --- old/rendercheck-1.1/Makefile.am 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/Makefile.am 2006-07-17 17:08:01.000000000 +0200 @@ -7,6 +7,7 @@ rendercheck.h \ tests.c \ t_blend.c \ + t_bug7366.c \ t_composite.c \ t_dstcoords.c \ t_fill.c \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/NEWS new/rendercheck-1.2/NEWS --- old/rendercheck-1.1/NEWS 2006-05-23 08:41:52.000000000 +0200 +++ new/rendercheck-1.2/NEWS 2006-11-27 18:45:18.000000000 +0100 @@ -1,3 +1,9 @@ +2006-11-27: + Version 1.2 released + Adds test for bug #7366 + Tests against more picture formats. + Allows testing against a subset of the operators and formats. + 2006-05-22: Version 1.1 released. Adds tests for triangles, gradients, and repeating sources. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/README new/rendercheck-1.2/README --- old/rendercheck-1.1/README 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/README 2006-11-27 18:42:15.000000000 +0100 @@ -9,3 +9,4 @@ repeating Pictures and 10x10 Pictures. - Linear gradients - Repeating sources/masks at POT and non-POT sizes +- Some regression tests for bugs from freedesktop.org bugzilla. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/configure.ac new/rendercheck-1.2/configure.ac --- old/rendercheck-1.1/configure.ac 2006-05-23 08:42:35.000000000 +0200 +++ new/rendercheck-1.2/configure.ac 2006-11-29 00:02:54.000000000 +0100 @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([rendercheck], - 1.1, + 1.2, [anholt@FreeBSD.org], rendercheck) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/main.c new/rendercheck-1.2/main.c --- old/rendercheck-1.1/main.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/main.c 2006-10-27 01:22:19.000000000 +0200 @@ -29,9 +29,12 @@ extern int num_ops; extern int num_colors; -int is_verbose = FALSE; +Bool is_verbose = FALSE, minimalrendering = FALSE; int enabled_tests = ~0; /* Enable all tests by default */ +int format_whitelist_len = 0; +char **format_whitelist; + /* Number of times to repeat operations so that pixmaps will tend to get moved * into offscreen memory and allow hardware acceleration. */ @@ -40,7 +43,7 @@ int win_width = 40; int win_height = 40; -static int +int bit_count(int i) { int count; @@ -104,9 +107,11 @@ usage (char *program) { fprintf(stderr, "usage: %s [-d|--display display] [-v|--verbose]\n" - "\t[-t test1,test2,...] [--sync]\n" - "\tAvailable tests: dcoors,scoords,mcoords,tscoords,\n" - "\t\ttmcoords,blend,composite,cacomposite,gradients,repeat,triangles\n", + "\t[-t test1,test2,...] [-o op1,op2,...] [-f format1,format2,...]\n" + "\t[--sync] [--minimalrendering]\n" + "\tAvailable tests: fill,dcoords,scoords,mcoords,tscoords,\n" + "\t\ttmcoords,blend,composite,cacomposite,gradients,repeat,triangles,\n" + "\t\tbug7366\n", program); exit(1); } @@ -121,18 +126,22 @@ XSetWindowAttributes as; picture_info window; char *display = NULL; - char *test, *nextname; + char *test, *format, *opname, *nextname; static struct option longopts[] = { { "display", required_argument, NULL, 'd' }, { "iterations", required_argument, NULL, 'i' }, + { "formats", required_argument, NULL, 'f' }, { "tests", required_argument, NULL, 't' }, + { "ops", required_argument, NULL, 'o' }, { "verbose", no_argument, NULL, 'v' }, { "sync", no_argument, &is_sync, 1}, + { "minimalrendering", no_argument, &minimalrendering, + TRUE}, { NULL, 0, NULL, 0 } }; - while ((o = getopt_long(argc, argv, "d:i:t:v", longopts, NULL)) != -1) { + while ((o = getopt_long(argc, argv, "d:i:f:t:o:v", longopts, NULL)) != -1) { switch (o) { case 'd': display = optarg; @@ -140,6 +149,46 @@ case 'i': pixmap_move_iter = atoi(optarg); break; + case 'o': + for (i = 0; i < num_ops; i++) + ops[i].disabled = TRUE; + + nextname = optarg; + while ((opname = strsep(&nextname, ",")) != NULL) { + for (i = 0; i < num_ops; i++) { + if (strcasecmp(ops[i].name, opname) != + 0) + continue; + ops[i].disabled = FALSE; + break; + } + if (i == num_ops) + usage(argv[0]); + } + break; + case 'f': + nextname = optarg; + for (format_whitelist_len = 0;;format_whitelist_len++) + { + if ((format = strsep(&nextname, ",")) == NULL) + break; + } + + format_whitelist = malloc(sizeof(char *) * + format_whitelist_len); + if (format_whitelist == NULL) + errx(1, "malloc"); + + /* Now the list is separated by \0s, so use strlen to + * step between entries. + */ + format = optarg; + for (i = 0; i < format_whitelist_len; i++) { + format_whitelist[i] = strdup(format); + format += strlen(format) + 1; + } + + break; case 't': nextname = optarg; @@ -171,6 +220,8 @@ enabled_tests |= TEST_REPEAT; } else if (strcmp(test, "triangles") == 0) { enabled_tests |= TEST_TRIANGLES; + } else if (strcmp(test, "bug7366") == 0) { + enabled_tests |= TEST_BUG7366; } else { usage(argv[0]); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/rendercheck.1 new/rendercheck-1.2/rendercheck.1 --- old/rendercheck-1.1/rendercheck.1 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/rendercheck.1 2006-10-26 21:57:01.000000000 +0200 @@ -5,7 +5,8 @@ .SH SYNOPSIS .nf .B rendercheck [\-d|\-\-display display] [\-i|\-\-iter] [\-\-sync] \ -[\-t|\-\-tests test1,test2,test3,...] [\-v|\-\-verbose] +[\-t|\-\-tests test1,test2,test3,...] [\-o|\-\-ops op1,op2,op3,...] +[\-v|\-\-verbose] [\-\-minimalrendering] .fi .SH DESCRIPTION .B rendercheck @@ -28,12 +29,25 @@ .BI \-t|\-\-tests\ test1,test2,test3... Enables only a specific subset of the possible tests. Test names include fill, dcoords, scoords, mcoords, tscoords, tmcoords, blend, composite, -cacomposite, gradients, repeat, and triangles. Names must be separated by +cacomposite, gradients, repeat, triangles, and bug7366. +Names must be separated by commas and have no spaces. .TP +.BI \-f|\-\-formats\ format1,format2,format3... +Enables only a specific subset of the possible formats. Only formats listed +in the server-supported format list are available. Names must be separated by +commas and have no spaces. +.TP +.BI \-o|\-\-ops +Enables only a specific subset of the Render operators. +.TP .BI \-v|\-\-verbose Enables verbose printing of information on tests run, and successes and failures. +.TP +.BI \-\-minimalrendering +Disables copying of offscreen destinations to the window, which is on by default +to provide the user with visual feedback. .SH BUGS Several limitations are documented in the TODO file accompanying the source. Please report any further bugs you find to http://bugs.freedesktop.org/. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/rendercheck.h new/rendercheck-1.2/rendercheck.h --- old/rendercheck-1.1/rendercheck.h 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/rendercheck.h 2006-10-27 01:22:43.000000000 +0200 @@ -64,6 +64,7 @@ struct op_info { int op; char *name; + Bool disabled; }; #define TEST_FILL 0x0001 @@ -78,19 +79,25 @@ #define TEST_GRADIENTS 0x0200 #define TEST_REPEAT 0x0400 #define TEST_TRIANGLES 0x0800 +#define TEST_BUG7366 0x1000 extern int pixmap_move_iter; extern int win_width, win_height; extern struct op_info ops[]; -extern Bool is_verbose; +extern Bool is_verbose, minimalrendering; extern color4d colors[]; extern int enabled_tests; +extern int format_whitelist_len; +extern char **format_whitelist; extern picture_info *argb32white, *argb32red, *argb32green, *argb32blue; /* main.c */ void describe_format(char *desc, int len, XRenderPictFormat *format); +int +bit_count(int i); + /* tests.c */ void color_correct(picture_info *pi, color4d *color); @@ -109,6 +116,10 @@ Bool do_tests(Display *dpy, picture_info *win); +void +copy_pict_to_win(Display *dpy, picture_info *pict, picture_info *win, + int width, int height); + /* ops.c */ void do_composite(int op, color4d *src, color4d *mask, color4d *dst, color4d *result, @@ -162,3 +173,6 @@ Bool trifan_test(Display *dpy, picture_info *win, picture_info *dst, int op, picture_info *src_color, picture_info *dst_color); + +Bool +bug7366_test(Display *dpy); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/t_blend.c new/rendercheck-1.2/t_blend.c --- old/rendercheck-1.1/t_blend.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_blend.c 2006-10-27 01:23:03.000000000 +0200 @@ -24,6 +24,9 @@ #include "rendercheck.h" +#define TEST_WIDTH 10 +#define TEST_HEIGHT 10 + /* Test a composite of a given operation, source, and destination picture. * Fills the window, and samples from the 0,0 pixel corner. */ @@ -36,16 +39,13 @@ int i; for (i = 0; i < pixmap_move_iter; i++) { - XRenderComposite(dpy, PictOpSrc, dst_color->pict, 0, dst->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); - XRenderComposite(dpy, ops[op].op, src_color->pict, 0, dst->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + XRenderComposite(dpy, PictOpSrc, dst_color->pict, 0, + dst->pict, 0, 0, 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); + XRenderComposite(dpy, ops[op].op, src_color->pict, 0, + dst->pict, 0, 0, 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); } get_pixel(dpy, dst, 0, 0, &tested); - /* Copy the output to the window, so the user sees something visual. */ - if (win != dst) - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + copy_pict_to_win(dpy, dst, win, TEST_WIDTH, TEST_HEIGHT); tdst = dst_color->color; color_correct(dst, &tdst); @@ -55,10 +55,14 @@ snprintf(testname, 20, "%s blend", ops[op].name); if (!eval_diff(testname, &expected, &tested, 0, 0, is_verbose)) { - printf("src color: %.2f %.2f %.2f %.2f\n" + char srcformat[20]; + + describe_format(srcformat, 20, src_color->format); + printf("src color: %.2f %.2f %.2f %.2f (%s)\n" "dst color: %.2f %.2f %.2f %.2f\n", src_color->color.r, src_color->color.g, src_color->color.b, src_color->color.a, + srcformat, dst_color->color.r, dst_color->color.g, dst_color->color.b, dst_color->color.a); printf("src: %s, dst: %s\n", src_color->name, dst->name); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/t_bug7366.c new/rendercheck-1.2/t_bug7366.c --- old/rendercheck-1.1/t_bug7366.c 1970-01-01 01:00:00.000000000 +0100 +++ new/rendercheck-1.2/t_bug7366.c 2006-10-27 01:22:19.000000000 +0200 @@ -0,0 +1,151 @@ +/* + * Copyright © 2006 Eric Anholt + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Eric Anholt not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Eric Anholt makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "rendercheck.h" + +int +expecting_error(Display *dpy, XErrorEvent *event) +{ + return TRUE; +} + +/** + * Check SetPictureTransform on a source picture causing a crash. + */ +static Bool +bug7366_test_set_picture_transform(Display *dpy) +{ + Picture source_pict; + XRenderColor color; + XTransform transform; + + memset(&color, 0, sizeof(color)); + source_pict = XRenderCreateSolidFill(dpy, &color); + + memset(&transform, 0, sizeof(transform)); + XRenderSetPictureTransform(dpy, source_pict, &transform); + + XSync(dpy, FALSE); + + XRenderFreePicture(dpy, source_pict); + + return TRUE; +} + +/** + * Check setting of AlphaMap to a source picture causing a crash. + */ +static Bool +bug7366_test_set_alpha_map(Display *dpy) +{ + Picture source_pict, pict; + XRenderColor color; + Drawable pixmap; + XRenderPictureAttributes pa; + + memset(&color, 0, sizeof(color)); + source_pict = XRenderCreateSolidFill(dpy, &color); + + pixmap = XCreatePixmap(dpy, RootWindow(dpy, 0), 1, 1, 32); + pict = XRenderCreatePicture(dpy, pixmap, + XRenderFindStandardFormat(dpy, PictStandardARGB32), 0, NULL); + + XSetErrorHandler(expecting_error); + pa.alpha_map = source_pict; + XRenderChangePicture(dpy, pict, CPAlphaMap, &pa); + XSync(dpy, FALSE); + XSetErrorHandler(NULL); + + XFreePixmap(dpy, pixmap); + XRenderFreePicture(dpy, pict); + XRenderFreePicture(dpy, source_pict); + + return TRUE; +} + +/** + * Check SetPictureClipRectangles on a source potentially causing a crash. + */ +static Bool +bug7366_test_set_picture_clip_rectangles(Display *dpy) +{ + Picture source_pict; + XRenderColor color; + XRectangle rectangle; + + memset(&color, 0, sizeof(color)); + source_pict = XRenderCreateSolidFill(dpy, &color); + + memset(&rectangle, 0, sizeof(rectangle)); + XSetErrorHandler(expecting_error); + XRenderSetPictureClipRectangles(dpy, source_pict, 0, 0, &rectangle, 1); + XSync(dpy, FALSE); + XSetErrorHandler(NULL); + + XRenderFreePicture(dpy, source_pict); + + return TRUE; +} + +/** + * Check SetPictureFilter on a source potentially causing a crash. + */ +static Bool +bug7366_test_set_picture_filter(Display *dpy) +{ + Picture source_pict; + XRenderColor color; + + memset(&color, 0, sizeof(color)); + source_pict = XRenderCreateSolidFill(dpy, &color); + + XRenderSetPictureFilter(dpy, source_pict, "bilinear", NULL, 0); + XSync(dpy, FALSE); + XSetErrorHandler(NULL); + + XRenderFreePicture(dpy, source_pict); + + return TRUE; +} + +Bool +bug7366_test(Display *dpy) +{ + int maj, min; + + /* Make sure we actually have gradients available */ + XRenderQueryVersion(dpy, &maj, &min); + if (maj != 0 || min < 10) + return TRUE; + + bug7366_test_set_picture_transform(dpy); + bug7366_test_set_alpha_map(dpy); + bug7366_test_set_picture_clip_rectangles(dpy); + bug7366_test_set_picture_filter(dpy); + + /* If the server isn't gone, then we've succeeded. */ + return TRUE; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/t_composite.c new/rendercheck-1.2/t_composite.c --- old/rendercheck-1.1/t_composite.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_composite.c 2006-10-27 01:23:35.000000000 +0200 @@ -24,6 +24,9 @@ #include "rendercheck.h" +#define TEST_WIDTH 10 +#define TEST_HEIGHT 10 + /* Test a composite of a given operation, source, mask, and destination picture. * Fills the window, and samples from the 0,0 pixel corner. */ @@ -45,16 +48,14 @@ } for (i = 0; i < pixmap_move_iter; i++) { XRenderComposite(dpy, PictOpSrc, dst_color->pict, 0, dst->pict, - 0, 0, 0, 0, 0, 0, win_width, win_height); + 0, 0, 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); XRenderComposite(dpy, ops[op].op, src_color->pict, mask_color->pict, dst->pict, 0, 0, 0, 0, 0, 0, - win_width, win_height); + TEST_WIDTH, TEST_HEIGHT); } get_pixel(dpy, dst, 0, 0, &tested); - /* Copy the output to the window, so the user sees something visual. */ - if (win != dst) - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + copy_pict_to_win(dpy, dst, win, TEST_WIDTH, TEST_HEIGHT); + if (componentAlpha) { pa.component_alpha = FALSE; XRenderChangePicture(dpy, mask_color->pict, CPComponentAlpha, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/t_dstcoords.c new/rendercheck-1.2/t_dstcoords.c --- old/rendercheck-1.1/t_dstcoords.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_dstcoords.c 2006-10-27 01:24:58.000000000 +0200 @@ -24,6 +24,9 @@ #include "rendercheck.h" +#define TEST_WIDTH 10 +#define TEST_HEIGHT 10 + /* Test destination coordinates by drawing a 3x3 picture offset one pixel. * XXX: This should be done with another operation, to catch issues with Render * acceleration in the non-CopyArea-equivalent case. @@ -38,13 +41,12 @@ for (i = 0; i < pixmap_move_iter; i++) { XRenderComposite(dpy, PictOpSrc, bg->pict, 0, dst->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); XRenderComposite(dpy, PictOpSrc, fg->pict, 0, dst->pict, 0, 0, 0, 0, 1, 1, 1, 1); } - /* Copy the output to the window, so the user sees something visual. */ - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, 0, 0, - 0, 0, win_width, win_height); + + copy_pict_to_win(dpy, dst, win, TEST_WIDTH, TEST_HEIGHT); for (x = 0; x < 3; x++) { for (y = 0; y < 3; y++) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/t_fill.c new/rendercheck-1.2/t_fill.c --- old/rendercheck-1.1/t_fill.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_fill.c 2006-10-27 01:25:13.000000000 +0200 @@ -35,9 +35,8 @@ char name[20]; get_pixel(dpy, src, 0, 0, &tested); - /* Copy the output to the window, so the user sees something visual. */ - XRenderComposite(dpy, PictOpSrc, src->pict, 0, win->pict, 0, 0, 0, 0, - 0, 0, win_width, win_height); + + copy_pict_to_win(dpy, src, win, win_width, win_height); strcpy(name, "fill "); describe_format(name, 20 - strlen(name), src->format); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/t_gradient.c new/rendercheck-1.2/t_gradient.c --- old/rendercheck-1.1/t_gradient.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_gradient.c 2006-10-27 01:25:43.000000000 +0200 @@ -216,10 +216,7 @@ XRenderComposite(dpy, ops[op].op, gradient, 0, dst->pict, 0, 0, 0, 0, 0, 0, win_width, win_height); - /* Copy the output to the window, so the user sees something visual. */ - if (win != dst) - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + copy_pict_to_win(dpy, dst, win, win_width, win_height); pix = test_pixels; while (pix->x >= 0) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/t_repeat.c new/rendercheck-1.2/t_repeat.c --- old/rendercheck-1.1/t_repeat.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_repeat.c 2006-10-27 01:26:11.000000000 +0200 @@ -96,15 +96,8 @@ 0, 0, 0, 0, 0, 0, win_width, win_height); } } - /* Copy the output to the window, so the user sees something - * visual. - */ - if (win != dst) { - XRenderComposite(dpy, PictOpSrc, - dst->pict, None, win->pict, - 0, 0, 0, 0, 0, 0, - win_width, win_height); - } + + copy_pict_to_win(dpy, dst, win, win_width, win_height); tdst = dst_color->color; color_correct(dst, &tdst); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/t_triangles.c new/rendercheck-1.2/t_triangles.c --- old/rendercheck-1.1/t_triangles.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_triangles.c 2006-10-27 01:27:29.000000000 +0200 @@ -29,6 +29,9 @@ #include "rendercheck.h" +#define TEST_WIDTH 10 +#define TEST_HEIGHT 10 + /* Test basic functionality of the triangle operations. We don't care that much * probably (nobody has used them yet), but we can trivially test by filling * doing two triangles that will exactly cover the rectangle from 2,2 to 4,4. @@ -58,14 +61,12 @@ /* Fill the dst to dst_color */ XRenderComposite(dpy, PictOpSrc, dst_color->pict, None, dst->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); /* Paint the triangles with src_color */ XRenderCompositeTriangles(dpy, ops[op].op, src_color->pict, dst->pict, XRenderFindStandardFormat(dpy, PictStandardA8), 0, 0, triangles, 2); - /* Copy the output to the window, so the user sees something visual. */ - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, 0, 0, - 0, 0, win_width, win_height); + copy_pict_to_win(dpy, dst, win, TEST_WIDTH, TEST_HEIGHT); /* Color expected outside of the triangles */ tdst = dst_color->color; @@ -126,14 +127,12 @@ /* Fill the dst to dst_color */ XRenderComposite(dpy, PictOpSrc, dst_color->pict, None, dst->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); /* Paint the triangles with src_color */ XRenderCompositeTriFan(dpy, ops[op].op, src_color->pict, dst->pict, XRenderFindStandardFormat(dpy, PictStandardA8), 0, 0, points, 4); - /* Copy the output to the window, so the user sees something visual. */ - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, 0, 0, - 0, 0, win_width, win_height); + copy_pict_to_win(dpy, dst, win, TEST_WIDTH, TEST_HEIGHT); /* Color expected outside of the triangles */ tdst = dst_color->color; @@ -194,14 +193,12 @@ /* Fill the dst to dst_color */ XRenderComposite(dpy, PictOpSrc, dst_color->pict, None, dst->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); /* Paint the triangles with src_color */ XRenderCompositeTriStrip(dpy, ops[op].op, src_color->pict, dst->pict, XRenderFindStandardFormat(dpy, PictStandardA8), 0, 0, points, 4); - /* Copy the output to the window, so the user sees something visual. */ - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, 0, 0, - 0, 0, win_width, win_height); + copy_pict_to_win(dpy, dst, win, TEST_WIDTH, TEST_HEIGHT); /* Color expected outside of the triangles */ tdst = dst_color->color; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/t_tsrccoords.c new/rendercheck-1.2/t_tsrccoords.c --- old/rendercheck-1.1/t_tsrccoords.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_tsrccoords.c 2006-10-27 01:22:20.000000000 +0200 @@ -63,6 +63,15 @@ free(p); } +static void init_transform (XTransform *t) +{ + int i, j; + + for (i = 0; i < 3; i++) + for (j = 0; j < 3; j++) + t->matrix[i][j] = XDoubleToFixed((i == j) ? 1 : 0); +} + /* Test drawing a 5x5 source image scaled 8x, as either a source or mask. */ Bool @@ -82,9 +91,9 @@ return FALSE; } - t.matrix[0][0] = 1.0; t.matrix[0][1] = 0.0; t.matrix[0][2] = 0.0; - t.matrix[1][0] = 0.0; t.matrix[1][1] = 1.0; t.matrix[1][2] = 0.0; - t.matrix[2][0] = 0.0; t.matrix[2][1] = 0.0; t.matrix[2][2] = 8.0; + init_transform(&t); + t.matrix[2][2] = XDoubleToFixed(8); + XRenderSetPictureTransform(dpy, src->pict, &t); if (!test_mask) @@ -137,9 +146,9 @@ printf("\n"); } } - t.matrix[0][0] = 1.0; t.matrix[0][1] = 0.0; t.matrix[0][2] = 0.0; - t.matrix[1][0] = 0.0; t.matrix[1][1] = 1.0; t.matrix[1][2] = 0.0; - t.matrix[2][0] = 0.0; t.matrix[2][1] = 0.0; t.matrix[2][2] = 1.0; + + init_transform(&t); + XRenderSetPictureTransform(dpy, src->pict, &t); destroy_dot_picture(dpy, src); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rendercheck-1.1/tests.c new/rendercheck-1.2/tests.c --- old/rendercheck-1.1/tests.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/tests.c 2006-10-27 01:22:20.000000000 +0200 @@ -27,18 +27,20 @@ #include "rendercheck.h" +XRenderPictFormat **format_list; +int nformats; +int argb32index; + /* Note: changing the order of these colors may disrupt tests that depend on - * specific colors. Just add to the end if you need. + * specific colors. Just add to the end if you need. These are + * not premultiplied, but will be in main(). */ color4d colors[] = { {1.0, 1.0, 1.0, 1.0}, {1.0, 0, 0, 1.0}, {0, 1.0, 0, 1.0}, {0, 0, 1.0, 1.0}, - {0.5, 0, 0, 0.25}, {0.5, 0, 0, .5}, - {0.0, .5, 1.0, .5}, - {0.0, .5, 1.0, 0} }; /* Convenience pointers to 1x1 repeating colors */ @@ -154,7 +156,7 @@ rscale = 1.0 * (1 << 5); gscale = 1.0 * (1 << 6); bscale = 1.0 * (1 << 5); - ascale = 1.0; + ascale = 1.0 * 32; rdiff = fabs(test->r - expected->r) * rscale; bdiff = fabs(test->g - expected->g) * gscale; gdiff = fabs(test->b - expected->b) * bscale; @@ -166,6 +168,7 @@ diff = max(max(max(rdiff, gdiff), bdiff), adiff); if (diff > 3.0) { printf("%s test error of %.4f at (%d, %d) --\n" + " R G B A\n" "got: %.2f %.2f %.2f %.2f\n" "expected: %.2f %.2f %.2f %.2f\n", name, diff, x, y, test->r, test->g, test->b, test->a, @@ -193,28 +196,108 @@ XRenderFillRectangle(dpy, PictOpSrc, p->pict, &rendercolor, x, y, w, h); } +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + +/* Create a set of direct format XRenderPictFormats for later use. This lets + * us get more formats than just the standard required set, and lets us attach + * names to them. + */ +void +create_formats_list(Display *dpy) +{ + int i; + int nformats_allocated = 5; + XRenderPictFormat templ; + + memset(&templ, 0, sizeof(templ)); + templ.type = PictTypeDirect; + + format_list = malloc(sizeof(XRenderPictFormat *) * nformats_allocated); + if (format_list == NULL) + errx(1, "malloc error"); + nformats = 0; + + argb32index = -1; + for (i = 0; ; i++) { + char name[20]; + int alphabits, redbits; + + if (nformats + 1 == nformats_allocated) { + nformats_allocated *= 2; + format_list = realloc(format_list, sizeof(XRenderPictFormat *) * + nformats_allocated); + if (format_list == NULL) + errx(1, "realloc error"); + } + + format_list[nformats] = XRenderFindFormat(dpy, PictFormatType, &templ, + i); + if (format_list[nformats] == NULL) + break; + + alphabits = bit_count(format_list[nformats]->direct.alphaMask); + redbits = bit_count(format_list[nformats]->direct.redMask); + + /* Our testing code isn't all that hot, so don't bother trying at + * the low depths yet. + */ + if ((redbits >= 1 && redbits <= 4) || + (alphabits >= 1 && alphabits <= 4)) + { + continue; + } + + describe_format(name, 20, format_list[nformats]); + + if (format_whitelist_len != 0) { + Bool ok = FALSE; + int j; + + for (j = 0; j < format_whitelist_len; j++) { + if (strcmp(format_whitelist[j], name) == 0) { + ok = TRUE; + break; + } + } + if (!ok) { + printf("Ignoring server-supported format: %s\n", name); + continue; + } + } + + if (format_list[nformats] == XRenderFindStandardFormat(dpy, + PictStandardARGB32)) + { + argb32index = nformats; + } + + printf("Found server-supported format: %s\n", name); + + nformats++; + } + if (argb32index == -1) { + errx(1, "required ARGB32 format not found"); + } +} + Bool do_tests(Display *dpy, picture_info *win) { int i, j, src, dst = 0, mask; - int num_dests, num_formats; + int num_dests; picture_info *dests, *pictures_1x1, *pictures_10x10, picture_3x3, *pictures_solid; int success_mask = 0, tests_passed = 0, tests_total = 0; + int num_tests; + + create_formats_list(dpy); - num_dests = 3; + num_dests = nformats; dests = (picture_info *)malloc(num_dests * sizeof(dests[0])); if (dests == NULL) errx(1, "malloc error"); - dests[0].format = XRenderFindStandardFormat(dpy, PictStandardARGB32); - dests[1].format = XRenderFindStandardFormat(dpy, PictStandardRGB24); - dests[2].format = XRenderFindStandardFormat(dpy, PictStandardA8); - /* - dests[3].format = XRenderFindStandardFormat(dpy, PictStandardA4); - dests[4].format = XRenderFindStandardFormat(dpy, PictStandardA1); - */ - for (i = 0; i < num_dests; i++) { + dests[i].format = format_list[i]; dests[i].d = XCreatePixmap(dpy, RootWindow(dpy, 0), win_width, win_height, dests[i].format->depth); dests[i].pict = XRenderCreatePicture(dpy, dests[i].d, @@ -226,20 +309,17 @@ describe_format(dests[i].name, 20, dests[i].format); } - num_formats = 3; - - pictures_1x1 = (picture_info *)malloc(num_colors * num_formats * + pictures_1x1 = (picture_info *)malloc(num_colors * nformats * sizeof(picture_info)); if (pictures_1x1 == NULL) errx(1, "malloc error"); - for (i = 0; i < num_colors * num_formats; i++) { + for (i = 0; i < num_colors * nformats; i++) { XRenderPictureAttributes pa; - color4d *c = &colors[i / num_formats]; + color4d *c = &colors[i / nformats]; /* The standard PictFormat numbers go from 0 to 4 */ - pictures_1x1[i].format = XRenderFindStandardFormat(dpy, - i % num_formats); + pictures_1x1[i].format = format_list[i % nformats]; pictures_1x1[i].d = XCreatePixmap(dpy, RootWindow(dpy, 0), 1, 1, pictures_1x1[i].format->depth); pa.repeat = TRUE; @@ -260,23 +340,22 @@ pictures_1x1[i].color = *c; color_correct(&pictures_1x1[i], &pictures_1x1[i].color); } - argb32white = &pictures_1x1[0 * num_formats]; - argb32red = &pictures_1x1[1 * num_formats]; - argb32green = &pictures_1x1[2 * num_formats]; - argb32blue = &pictures_1x1[3 * num_formats]; + argb32white = &pictures_1x1[0 * nformats + argb32index]; + argb32red = &pictures_1x1[1 * nformats + argb32index]; + argb32green = &pictures_1x1[2 * nformats + argb32index]; + argb32blue = &pictures_1x1[3 * nformats + argb32index]; - pictures_10x10 = (picture_info *)malloc(num_colors * num_formats * + pictures_10x10 = (picture_info *)malloc(num_colors * nformats * sizeof(picture_info)); if (pictures_10x10 == NULL) errx(1, "malloc error"); - for (i = 0; i < num_colors * num_formats; i++) { + for (i = 0; i < num_colors * nformats; i++) { XRenderPictureAttributes pa; - color4d *c = &colors[i / num_formats]; + color4d *c = &colors[i / nformats]; /* The standard PictFormat numbers go from 0 to 4 */ - pictures_10x10[i].format = XRenderFindStandardFormat(dpy, - i % num_formats); + pictures_10x10[i].format = format_list[i % nformats]; pictures_10x10[i].d = XCreatePixmap(dpy, RootWindow(dpy, 0), 10, 10, pictures_10x10[i].format->depth); pa.repeat = TRUE; @@ -320,6 +399,7 @@ c.green = (int)(colors[i].g*65535); c.blue = (int)(colors[i].b*65535); pictures_solid[i].pict = XRenderCreateSolidFill(dpy, &c); + pictures_solid[i].format = format_list[argb32index]; pictures_solid[i].name = "Solid"; } @@ -331,17 +411,19 @@ tests_total++; \ } while (0) + num_tests = num_colors * nformats; + if (enabled_tests & TEST_FILL) { Bool ok, group_ok = TRUE; printf("Beginning testing of filling of 1x1R pictures\n"); - for (i = 0; i < num_colors * num_formats; i++) { + for (i = 0; i < num_tests; i++) { ok = fill_test(dpy, win, &pictures_1x1[i]); RECORD_RESULTS(); } printf("Beginning testing of filling of 10x10 pictures\n"); - for (i = 0; i < num_colors * num_formats; i++) { + for (i = 0; i < num_tests; i++) { ok = fill_test(dpy, win, &pictures_10x10[i]); RECORD_RESULTS(); } @@ -353,9 +435,8 @@ Bool ok, group_ok = TRUE; printf("Beginning dest coords test\n"); - /* 0 and num_formats should result in ARGB8888 red on ARGB8888 white. */ - ok = dstcoords_test(dpy, win, &dests[0], &pictures_1x1[0], - &pictures_1x1[num_formats]); + ok = dstcoords_test(dpy, win, &dests[0], argb32white, + argb32red); RECORD_RESULTS(); if (group_ok) success_mask |= TEST_DSTCOORDS; @@ -365,7 +446,7 @@ Bool ok, group_ok = TRUE; printf("Beginning src coords test\n"); - ok = srccoords_test(dpy, win, &pictures_1x1[0], FALSE); + ok = srccoords_test(dpy, win, argb32white, FALSE); RECORD_RESULTS(); if (group_ok) success_mask |= TEST_SRCCOORDS; @@ -375,7 +456,7 @@ Bool ok, group_ok = TRUE; printf("Beginning mask coords test\n"); - ok = srccoords_test(dpy, win, &pictures_1x1[0], TRUE); + ok = srccoords_test(dpy, win, argb32white, TRUE); RECORD_RESULTS(); if (group_ok) success_mask |= TEST_MASKCOORDS; @@ -385,7 +466,7 @@ Bool ok, group_ok = TRUE; printf("Beginning transformed src coords test\n"); - ok = trans_coords_test(dpy, win, &pictures_1x1[0], FALSE); + ok = trans_coords_test(dpy, win, argb32white, FALSE); RECORD_RESULTS(); if (group_ok) success_mask |= TEST_TSRCCOORDS; @@ -395,7 +476,7 @@ Bool ok, group_ok = TRUE; printf("Beginning transformed mask coords test\n"); - ok = trans_coords_test(dpy, win, &pictures_1x1[0], TRUE); + ok = trans_coords_test(dpy, win, argb32white, TRUE); RECORD_RESULTS(); if (group_ok) success_mask |= TEST_TMASKCOORDS; @@ -405,6 +486,9 @@ Bool ok, group_ok = TRUE; for (i = 0; i < num_ops; i++) { + if (ops[i].disabled) + continue; + for (j = 0; j <= num_dests; j++) { picture_info *pi; @@ -415,8 +499,8 @@ printf("Beginning %s blend test on %s\n", ops[i].name, pi->name); - for (src = 0; src < num_colors * num_formats; src++) { - for (dst = 0; dst < num_colors; dst++) { + for (src = 0; src < num_tests; src++) { + for (dst = 0; dst < num_tests; dst++) { ok = blend_test(dpy, win, pi, i, &pictures_1x1[src], &pictures_1x1[dst]); @@ -443,6 +527,9 @@ Bool ok, group_ok = TRUE; for (i = 0; i < num_ops; i++) { + if (ops[i].disabled) + continue; + for (j = 0; j <= num_dests; j++) { picture_info *pi; @@ -453,9 +540,9 @@ printf("Beginning %s composite mask test on %s\n", ops[i].name, pi->name); - for (src = 0; src < num_colors; src++) { - for (mask = 0; mask < num_colors; mask++) { - for (dst = 0; dst < num_colors; dst++) { + for (src = 0; src < num_tests; src++) { + for (mask = 0; mask < num_tests; mask++) { + for (dst = 0; dst < num_tests; dst++) { ok = composite_test(dpy, win, pi, i, &pictures_10x10[src], &pictures_10x10[mask], @@ -489,6 +576,9 @@ Bool ok, group_ok = TRUE; for (i = 0; i < num_ops; i++) { + if (ops[i].disabled) + continue; + for (j = 0; j <= num_dests; j++) { picture_info *pi; @@ -499,9 +589,9 @@ printf("Beginning %s composite CA mask test on %s\n", ops[i].name, pi->name); - for (src = 0; src < num_colors; src++) { - for (mask = 0; mask < num_colors; mask++) { - for (dst = 0; dst < num_colors; dst++) { + for (src = 0; src < num_tests; src++) { + for (mask = 0; mask < num_tests; mask++) { + for (dst = 0; dst < num_tests; dst++) { ok = composite_test(dpy, win, pi, i, &pictures_10x10[src], &pictures_10x10[mask], @@ -535,6 +625,9 @@ Bool ok, group_ok = TRUE; for (i = 0; i < num_ops; i++) { + if (ops[i].disabled) + continue; + for (j = 0; j <= num_dests; j++) { picture_info *pi; @@ -545,8 +638,8 @@ printf("Beginning %s linear gradient test on %s\n", ops[i].name, pi->name); - for (src = 0; src < num_colors; src++) { - for (mask = 0; mask < num_colors; mask++) { + for (src = 0; src < num_tests; src++) { + for (mask = 0; mask < num_tests; mask++) { ok = linear_gradient_test(dpy, win, pi, i, &pictures_1x1[dst]); RECORD_RESULTS(); @@ -562,6 +655,9 @@ Bool ok, group_ok = TRUE; for (i = 0; i < num_ops; i++) { + if (ops[i].disabled) + continue; + for (j = 0; j <= num_dests; j++) { picture_info *pi; @@ -596,6 +692,9 @@ Bool ok, group_ok = TRUE; for (i = 0; i < num_ops; i++) { + if (ops[i].disabled) + continue; + for (j = 0; j <= num_dests; j++) { picture_info *pi; @@ -607,19 +706,19 @@ printf("Beginning %s Triangles test on %s\n", ops[i].name, pi->name); ok = triangles_test(dpy, win, pi, i, - &pictures_1x1[num_formats], &pictures_1x1[0]); + argb32red, argb32white); RECORD_RESULTS(); printf("Beginning %s TriStrip test on %s\n", ops[i].name, pi->name); ok = tristrip_test(dpy, win, pi, i, - &pictures_1x1[num_formats], &pictures_1x1[0]); + argb32red, argb32white); RECORD_RESULTS(); printf("Beginning %s TriFan test on %s\n", ops[i].name, pi->name); ok = trifan_test(dpy, win, pi, i, - &pictures_1x1[num_formats], &pictures_1x1[0]); + argb32red, argb32white); RECORD_RESULTS(); } } @@ -627,7 +726,35 @@ success_mask |= TEST_TRIANGLES; } + if (enabled_tests & TEST_BUG7366) { + Bool ok, group_ok = TRUE; + + ok = bug7366_test(dpy); + RECORD_RESULTS(); + + if (group_ok) + success_mask |= TEST_BUG7366; + } + printf("%d tests passed of %d total\n", tests_passed, tests_total); return tests_passed == tests_total; } + +/** + * \brief copies the contents of a picture to the window. + * + * This is used in tests so that the user sees flashing colors indicating that + * rendercheck is really doing things. The minimalrendering commandline option + * indicates that this behavior should be disabled. + */ +void +copy_pict_to_win(Display *dpy, picture_info *pict, picture_info *win, + int width, int height) +{ + if (pict == win || minimalrendering) + return; + + XRenderComposite(dpy, PictOpSrc, pict->pict, 0, win->pict, 0, 0, + 0, 0, 0, 0, width, height); +} ++++++ sessreg-1.0.1.tar.bz2 -> sessreg-1.0.2.tar.bz2 ++++++ ++++ 10861 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sessreg-1.0.1/ChangeLog new/sessreg-1.0.2/ChangeLog --- old/sessreg-1.0.1/ChangeLog 2006-11-09 00:35:46.000000000 +0100 +++ new/sessreg-1.0.2/ChangeLog 2006-11-08 15:33:56.000000000 +0100 @@ -1,14 +1,8 @@ -commit 82fbb553114e8d00b6b3886aee4554dfd178cb01 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Nov 8 13:51:50 2006 -0800 - - Improve formatting of file names in sessreg.man - -commit 02379845b074cb252c0cb42d18c6cb8effcdc9f5 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Nov 8 13:48:05 2006 -0800 +commit 2989b28529b964f12a1bb3dcdf77b87ae8effaf0 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Nov 8 16:32:56 2006 +0200 - Fix builds when $(srcdir) != $(objdir) + bump to 1.0.1 commit c472f5f9257e6dcb9e82042a99ef028e3390e93e Author: Alan Coopersmith <alan.coopersmith@sun.com> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sessreg-1.0.1/Makefile.am new/sessreg-1.0.2/Makefile.am --- old/sessreg-1.0.1/Makefile.am 2006-11-08 22:46:44.000000000 +0100 +++ new/sessreg-1.0.2/Makefile.am 2006-11-30 18:40:16.000000000 +0100 @@ -63,7 +63,7 @@ filenames.sed: filenames.sed.c $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(srcdir)/filenames.sed.c | grep 's\|__' > $@ + $(CPPFLAGS) $(srcdir)/filenames.sed.c | grep 's|__' > $@ if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sessreg-1.0.1/configure.ac new/sessreg-1.0.2/configure.ac --- old/sessreg-1.0.1/configure.ac 2006-11-09 00:33:45.000000000 +0100 +++ new/sessreg-1.0.2/configure.ac 2006-11-30 18:40:29.000000000 +0100 @@ -21,7 +21,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(sessreg, [1.0.1], +AC_INIT(sessreg, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], sessreg) AM_INIT_AUTOMAKE([dist-bzip2]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sessreg-1.0.1/sessreg.h new/sessreg-1.0.2/sessreg.h --- old/sessreg-1.0.1/sessreg.h 2006-11-08 02:28:49.000000000 +0100 +++ new/sessreg-1.0.2/sessreg.h 2006-11-30 18:40:16.000000000 +0100 @@ -55,6 +55,7 @@ #include "config.h" +#include <time.h> #include <utmp.h> #ifdef HAVE_UTMPX_H ++++++ setxkbmap-X11R7.1-1.0.2.tar.bz2 -> setxkbmap-1.0.3.tar.bz2 ++++++ ++++ 6156 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/setxkbmap-X11R7.1-1.0.2/configure.ac new/setxkbmap-1.0.3/configure.ac --- old/setxkbmap-X11R7.1-1.0.2/configure.ac 2006-03-10 10:09:12.000000000 +0100 +++ new/setxkbmap-1.0.3/configure.ac 2006-11-02 02:38:59.000000000 +0100 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(setxkbmap,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],setxkbmap) +AC_INIT(setxkbmap,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],setxkbmap) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/setxkbmap-X11R7.1-1.0.2/setxkbmap.c new/setxkbmap-1.0.3/setxkbmap.c --- old/setxkbmap-X11R7.1-1.0.2/setxkbmap.c 2006-03-10 10:09:12.000000000 +0100 +++ new/setxkbmap-1.0.3/setxkbmap.c 2006-10-15 20:10:40.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XdotOrg: app/setxkbmap/setxkbmap.c,v 1.3 2006/03/10 09:09:12 daniels Exp $ */ +/* $XdotOrg: app/setxkbmap/setxkbmap.c,v 1.2 2004/04/23 19:54:37 eich Exp $ */ /************************************************************ Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. @@ -47,7 +47,7 @@ #endif #ifndef DFLT_XKB_CONFIG_ROOT -#define DFLT_XKB_CONFIG_ROOT "/usr/X11R6/lib/X11/xkb" +#define DFLT_XKB_CONFIG_ROOT "/usr/share/X11/xkb" #endif #ifndef DFLT_XKB_RULES_FILE #define DFLT_XKB_RULES_FILE __XKBDEFRULES__ @@ -56,7 +56,7 @@ #define DFLT_XKB_LAYOUT "us" #endif #ifndef DFLT_XKB_MODEL -#define DFLT_XKB_MODEL "pc101" +#define DFLT_XKB_MODEL "pc105" #endif #define UNDEFINED 0 @@ -118,6 +118,8 @@ XkbDescPtr xkb= NULL; +int deviceSpec = XkbUseCoreKbd; + /***====================================================================***/ #define streq(s1,s2) (strcmp(s1,s2)==0) @@ -204,6 +206,7 @@ MSG("-?,-help Print this message\n"); MSG("-compat <name> Specifies compatibility map component name\n"); MSG("-config <file> Specifies configuration file to use\n"); + MSG("-device <deviceid> Specifies the device ID to use\n"); MSG("-display <dpy> Specifies display to use\n"); MSG("-geometry <name> Specifies geometry component name\n"); MSG("-I[<dir>] Add <dir> to list of directories to be used\n"); @@ -334,6 +337,8 @@ ok= setOptString(&i,argc,argv,COMPAT_NDX,FROM_CMD_LINE); else if (streq(argv[i],"-config")) ok= setOptString(&i,argc,argv,CONFIG_NDX,FROM_CMD_LINE); + else if (streq(argv[i],"-device")) + deviceSpec= atoi(argv[++i]); else if (streq(argv[i],"-display")) ok= setOptString(&i,argc,argv,DISPLAY_NDX,FROM_CMD_LINE); else if (streq(argv[i],"-geometry")) @@ -811,7 +816,7 @@ cmdNames.keycodes= svValue[KEYCODES_NDX]; cmdNames.geometry= svValue[GEOMETRY_NDX]; cmdNames.keymap= svValue[KEYMAP_NDX]; - xkb= XkbGetKeyboardByName(dpy,XkbUseCoreKbd,&cmdNames, + xkb= XkbGetKeyboardByName(dpy,deviceSpec,&cmdNames, XkbGBN_AllComponentsMask, XkbGBN_AllComponentsMask&(~XkbGBN_GeometryMask), True); ++++++ twm-1.0.2.tar.bz2 -> twm-1.0.3.tar.bz2 ++++++ ++++ 11319 lines of diff (skipped) ++++++ xdm-1.1.1.tar.bz2 -> xdm-1.1.2.tar.bz2 ++++++ ++++ 33452 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.1/ChangeLog new/xdm-1.1.2/ChangeLog --- old/xdm-1.1.1/ChangeLog 2006-11-13 23:52:15.000000000 +0100 +++ new/xdm-1.1.2/ChangeLog 2006-11-30 18:53:19.000000000 +0100 @@ -1,3 +1,17 @@ +commit 75a8fce621adecd50db129c839a578df630137db +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Nov 30 19:49:31 2006 +0200 + + bump to 1.1.2 + +commit c8612093ba0a67c1a161111d58aac9956b9c5320 +Author: J.P. Larocque <piranha-fdo-bz@thoughtcrime.us> +Date: Mon Nov 20 11:06:18 2006 -0800 + + Bug 7317: xfs doesn't build on some GLIBC based systems: _XOPEN_SOURCE undefined + + Bug 7317: <https://bugs.freedesktop.org/show_bug.cgi?id=7317> + commit 15e5c60cced750559853ca7e9bddcd6b7f1dd3f9 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Mon Nov 13 14:51:16 2006 -0800 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.1/config.h.in new/xdm-1.1.2/config.h.in --- old/xdm-1.1.1/config.h.in 2006-11-13 23:50:59.000000000 +0100 +++ new/xdm-1.1.2/config.h.in 2006-11-30 18:50:18.000000000 +0100 @@ -117,9 +117,6 @@ /* Support IPv6 for TCP connections */ #undef IPv6 -/* Support os-specific local connections */ -#undef LOCALCONN - /* Name of package */ #undef PACKAGE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.1/configure.ac new/xdm-1.1.2/configure.ac --- old/xdm-1.1.1/configure.ac 2006-11-13 23:50:10.000000000 +0100 +++ new/xdm-1.1.2/configure.ac 2006-11-30 18:49:23.000000000 +0100 @@ -24,7 +24,7 @@ dnl $XdotOrg: app/xdm/configure.ac,v 1.42 2006/06/03 01:01:21 alanc Exp $ AC_PREREQ([2.57]) -AC_INIT(xdm,[1.1.1],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm) +AC_INIT(xdm,[1.1.2],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -122,7 +122,7 @@ case $host_os in - linux*|gnu*) + linux*|gnu*|*-gnu) OS_CFLAGS="-D_XOPEN_SOURCE" SU="su" ;; ++++++ xfs-1.0.3.tar.bz2 -> xfs-1.0.4.tar.bz2 ++++++ ++++ 8128 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfs-1.0.3/configure.ac new/xfs-1.0.4/configure.ac --- old/xfs-1.0.3/configure.ac 2006-10-13 23:29:24.000000000 +0200 +++ new/xfs-1.0.4/configure.ac 2006-11-30 18:50:48.000000000 +0100 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xfs,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs) +AC_INIT(xfs,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -33,7 +33,7 @@ AC_CANONICAL_HOST case $host_os in - linux*) + linux*|gnu*|*-gnu) OS_CFLAGS="-D_XOPEN_SOURCE" ;; *) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org