diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-06-30 12:55:29 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-06-30 12:55:29 +0000 |
| commit | d4e56ff4dc8a0528550eb8503956bdcddb2fe516 (patch) | |
| tree | 2d6f8114da90ab526a5d7595c55ad8559de64366 /package/x11r7 | |
| parent | af593cbceefb461c8c089395ff257c05cd290af7 (diff) | |
| download | buildroot-novena-d4e56ff4dc8a0528550eb8503956bdcddb2fe516.tar.gz buildroot-novena-d4e56ff4dc8a0528550eb8503956bdcddb2fe516.zip | |
packages: fix xorg to compile modular and tiny versions
Based on googlecode r558 by John Voltz.
Diffstat (limited to 'package/x11r7')
84 files changed, 1225 insertions, 146 deletions
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 140c508a5..c3bfc4e45 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -152,6 +152,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xapp_xwininfo/Config.in source package/x11r7/xapp_xwud/Config.in endmenu + if BR2_PACKAGE_XSERVER_xorg menu "X11R7 Drivers" source package/x11r7/openchrome/Config.in source package/x11r7/xdriver_xf86-input-acecad/Config.in @@ -178,6 +179,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-input-penmount/Config.in source package/x11r7/xdriver_xf86-input-spaceorb/Config.in source package/x11r7/xdriver_xf86-input-summa/Config.in + source package/x11r7/xdriver_xf86-input-synaptics/Config.in source package/x11r7/xdriver_xf86-input-tek4957/Config.in source package/x11r7/xdriver_xf86-input-ur98/Config.in source package/x11r7/xdriver_xf86-input-vmmouse/Config.in @@ -227,6 +229,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-video-vmware/Config.in source package/x11r7/xdriver_xf86-video-voodoo/Config.in endmenu + endif menu "X11R7 Fonts" source package/x11r7/xfont_font-util/Config.in source package/x11r7/xfont_encodings/Config.in @@ -311,7 +314,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdata_xbitmaps/Config.in source package/x11r7/xdata_xcursor-themes/Config.in source package/x11r7/xkeyboard-config/Config.in - source package/x11r7/xdata_xkbdata/Config.in endmenu endif diff --git a/package/x11r7/mcookie/mcookie.c b/package/x11r7/mcookie/mcookie.c new file mode 100644 index 000000000..902d92fc4 --- /dev/null +++ b/package/x11r7/mcookie/mcookie.c @@ -0,0 +1,425 @@ +/* mcookie.c -- Generates random numbers for xauth + * Created: Fri Feb 3 10:42:48 1995 by faith@cs.unc.edu + * Revised: Fri Mar 19 07:48:01 1999 by faith@acm.org + * Public Domain 1995, 1999 Rickard E. Faith (faith@acm.org) + * This program comes with ABSOLUTELY NO WARRANTY. + * + * $Id: mcookie.c,v 1.5 1997/07/06 00:13:06 aebr Exp $ + * + * This program gathers some random bits of data and used the MD5 + * message-digest algorithm to generate a 128-bit hexadecimal number for + * use with xauth(1). + * + * NOTE: Unless /dev/random is available, this program does not actually + * gather 128 bits of random information, so the magic cookie generated + * will be considerably easier to guess than one might expect. + * + * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL> + * - added Native Language Support + * 1999-03-21 aeb: Added some fragments of code from Colin Plumb. + * + */ + +#include <stdio.h> +#include <stdlib.h> +#include <fcntl.h> +#include <sys/time.h> +#include <time.h> +#include <unistd.h> + +#define BUFFERSIZE 4096 + + +#ifndef MD5_H +#define MD5_H + +#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) +typedef unsigned int uint32; +#else +typedef unsigned long uint32; +#endif + +struct MD5Context { + uint32 buf[4]; + uint32 bits[2]; + unsigned char in[64]; +}; + +void MD5Init(struct MD5Context *context); +void MD5Update(struct MD5Context *context, unsigned char const *buf, + unsigned len); +void MD5Final(unsigned char digest[16], struct MD5Context *context); +void MD5Transform(uint32 buf[4], uint32 const in[16]); + +/* + * This is needed to make RSAREF happy on some MS-DOS compilers. + */ +typedef struct MD5Context MD5_CTX; + +#endif /* !MD5_H */ + + + +/* + * This code implements the MD5 message-digest algorithm. + * The algorithm is due to Ron Rivest. This code was + * written by Colin Plumb in 1993, no copyright is claimed. + * This code is in the public domain; do with it what you wish. + * + * Equivalent code is available from RSA Data Security, Inc. + * This code has been tested against that, and is equivalent, + * except that you don't need to include two pages of legalese + * with every copy. + * + * To compute the message digest of a chunk of bytes, declare an + * MD5Context structure, pass it to MD5Init, call MD5Update as + * needed on buffers full of bytes, and then call MD5Final, which + * will fill a supplied 16-byte array with the digest. + */ +#include <string.h> /* for memcpy() */ +#include <endian.h> + +#if __BYTE_ORDER == __LITTLE_ENDIAN +#define byteReverse(buf, len) /* Nothing */ +#else +void byteReverse(unsigned char *buf, unsigned longs); + +/* + * Note: this code is harmless on little-endian machines. + */ +void byteReverse(unsigned char *buf, unsigned longs) +{ + uint32 t; + do { + t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 | + ((unsigned) buf[1] << 8 | buf[0]); + *(uint32 *) buf = t; + buf += 4; + } while (--longs); +} +#endif + +/* + * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious + * initialization constants. + */ +void MD5Init(struct MD5Context *ctx) +{ + ctx->buf[0] = 0x67452301; + ctx->buf[1] = 0xefcdab89; + ctx->buf[2] = 0x98badcfe; + ctx->buf[3] = 0x10325476; + + ctx->bits[0] = 0; + ctx->bits[1] = 0; +} + +/* + * Update context to reflect the concatenation of another buffer full + * of bytes. + */ +void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len) +{ + uint32 t; + + /* Update bitcount */ + + t = ctx->bits[0]; + if ((ctx->bits[0] = t + ((uint32) len << 3)) < t) + ctx->bits[1]++; /* Carry from low to high */ + ctx->bits[1] += len >> 29; + + t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */ + + /* Handle any leading odd-sized chunks */ + + if (t) { + unsigned char *p = (unsigned char *) ctx->in + t; + + t = 64 - t; + if (len < t) { + memcpy(p, buf, len); + return; + } + memcpy(p, buf, t); + byteReverse(ctx->in, 16); + MD5Transform(ctx->buf, (uint32 *) ctx->in); + buf += t; + len -= t; + } + /* Process data in 64-byte chunks */ + + while (len >= 64) { + memcpy(ctx->in, buf, 64); + byteReverse(ctx->in, 16); + MD5Transform(ctx->buf, (uint32 *) ctx->in); + buf += 64; + len -= 64; + } + + /* Handle any remaining bytes of data. */ + + memcpy(ctx->in, buf, len); +} + +/* + * Final wrapup - pad to 64-byte boundary with the bit pattern + * 1 0* (64-bit count of bits processed, MSB-first) + */ +void MD5Final(unsigned char digest[16], struct MD5Context *ctx) +{ + unsigned count; + unsigned char *p; + + /* Compute number of bytes mod 64 */ + count = (ctx->bits[0] >> 3) & 0x3F; + + /* Set the first char of padding to 0x80. This is safe since there is + always at least one byte free */ + p = ctx->in + count; + *p++ = 0x80; + + /* Bytes of padding needed to make 64 bytes */ + count = 64 - 1 - count; + + /* Pad out to 56 mod 64 */ + if (count < 8) { + /* Two lots of padding: Pad the first block to 64 bytes */ + memset(p, 0, count); + byteReverse(ctx->in, 16); + MD5Transform(ctx->buf, (uint32 *) ctx->in); + + /* Now fill the next block with 56 bytes */ + memset(ctx->in, 0, 56); + } else { + /* Pad block to 56 bytes */ + memset(p, 0, count - 8); + } + byteReverse(ctx->in, 14); + + /* Append length in bits and transform */ + ((uint32 *) ctx->in)[14] = ctx->bits[0]; + ((uint32 *) ctx->in)[15] = ctx->bits[1]; + + MD5Transform(ctx->buf, (uint32 *) ctx->in); + byteReverse((unsigned char *) ctx->buf, 4); + memcpy(digest, ctx->buf, 16); + memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ +} + +/* The four core functions - F1 is optimized somewhat */ + +/* #define F1(x, y, z) (x & y | ~x & z) */ +#define F1(x, y, z) (z ^ (x & (y ^ z))) +#define F2(x, y, z) F1(z, x, y) +#define F3(x, y, z) (x ^ y ^ z) +#define F4(x, y, z) (y ^ (x | ~z)) + +/* This is the central step in the MD5 algorithm. */ +#define MD5STEP(f, w, x, y, z, data, s) \ + ( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x ) + +/* + * The core of the MD5 algorithm, this alters an existing MD5 hash to + * reflect the addition of 16 longwords of new data. MD5Update blocks + * the data and converts bytes into longwords for this routine. + */ +void MD5Transform(uint32 buf[4], uint32 const in[16]) +{ + register uint32 a, b, c, d; + + a = buf[0]; + b = buf[1]; + c = buf[2]; + d = buf[3]; + + MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); + MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); + MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); + MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22); + MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7); + MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12); + MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17); + MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22); + MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7); + MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12); + MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); + MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); + MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); + MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); + MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); + MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); + + MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); + MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); + MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); + MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); + MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5); + MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); + MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); + MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); + MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5); + MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); + MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14); + MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20); + MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); + MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); + MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); + MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); + + MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); + MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); + MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); + MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); + MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4); + MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); + MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); + MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); + MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); + MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11); + MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16); + MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23); + MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4); + MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); + MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); + MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); + + MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); + MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); + MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); + MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21); + MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); + MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); + MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); + MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21); + MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); + MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); + MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15); + MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); + MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6); + MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); + MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); + MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); + + buf[0] += a; + buf[1] += b; + buf[2] += c; + buf[3] += d; +} + + + + +struct rngs { + const char *path; + int minlength, maxlength; +} rngs[] = { + { "/dev/random", 16, 16 }, /* 16 bytes = 128 bits suffice */ + { "/proc/interrupts", 0, 0 }, + { "/proc/slabinfo", 0, 0 }, + { "/proc/stat", 0, 0 }, + { "/dev/urandom", 32, 64 }, +}; +#define RNGS (sizeof(rngs)/sizeof(struct rngs)) + +int Verbose = 0; + +/* The basic function to hash a file */ +static off_t +hash_file(struct MD5Context *ctx, int fd) +{ + off_t count = 0; + ssize_t r; + unsigned char buf[BUFFERSIZE]; + + while ((r = read(fd, buf, sizeof(buf))) > 0) { + MD5Update(ctx, buf, r); + count += r; + } + /* Separate files with a null byte */ + buf[0] = 0; + MD5Update(ctx, buf, 1); + return count; +} + +int main( int argc, char **argv ) +{ + int i; + struct MD5Context ctx; + unsigned char digest[16]; + unsigned char buf[BUFFERSIZE]; + int fd; + int c; + pid_t pid; + char *file = NULL; + int r; + struct timeval tv; + struct timezone tz; + + while ((c = getopt( argc, argv, "vf:" )) != -1) + switch (c) { + case 'v': ++Verbose; break; + case 'f': file = optarg; break; + } + + MD5Init( &ctx ); + + gettimeofday( &tv, &tz ); + MD5Update( &ctx, (unsigned char *)&tv, sizeof( tv ) ); + pid = getppid(); + MD5Update( &ctx, (unsigned char *)&pid, sizeof( pid )); + pid = getpid(); + MD5Update( &ctx, (unsigned char *)&pid, sizeof( pid )); + + if (file) { + int count = 0; + + if (file[0] == '-' && !file[1]) + fd = fileno(stdin); + else + fd = open( file, O_RDONLY ); + + if (fd < 0) { + fprintf( stderr, "Could not open %s\n", file ); + } else { + count = hash_file( &ctx, fd ); + if (Verbose) + fprintf( stderr, "Got %d bytes from %s\n", count, file ); + + if (file[0] != '-' || file[1]) close( fd ); + } + } + + for (i = 0; i < RNGS; i++) { + if ((fd = open( rngs[i].path, O_RDONLY|O_NONBLOCK )) >= 0) { + int count = sizeof(buf); + + if (rngs[i].maxlength && count > rngs[i].maxlength) + count = rngs[i].maxlength; + r = read( fd, buf, count ); + if (r > 0) + MD5Update( &ctx, buf, r ); + else + r = 0; + close( fd ); + if (Verbose) + fprintf( stderr, "Got %d bytes from %s\n", r, rngs[i].path ); + if (rngs[i].minlength && r >= rngs[i].minlength) + break; + } else if (Verbose) + fprintf( stderr, "Could not open %s\n", rngs[i].path ); + } + + MD5Final( digest, &ctx ); + for (i = 0; i < 16; i++) printf( "%02x", digest[i] ); + putchar ( '\n' ); + + /* + * The following is important for cases like disk full, so shell scripts + * can bomb out properly rather than think they succeeded. + */ + if (fflush(stdout) < 0 || fclose(stdout) < 0) + return 1; + + return 0; +} diff --git a/package/x11r7/mcookie/mcookie.mk b/package/x11r7/mcookie/mcookie.mk index c26c9e519..67e2cd84e 100644 --- a/package/x11r7/mcookie/mcookie.mk +++ b/package/x11r7/mcookie/mcookie.mk @@ -4,8 +4,8 @@ # ############################################################# -$(TARGET_DIR)/usr/bin/mcookie: package/xorg/mcookie.c - $(TARGET_CC) -Wall -Os -s package/xorg/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie +$(TARGET_DIR)/usr/bin/mcookie: package/x11r7/mcookie/mcookie.c + $(TARGET_CC) -Wall -Os -s package/x11r7/mcookie/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie mcookie: $(TARGET_DIR)/usr/bin/mcookie diff --git a/package/x11r7/openchrome/openchrome-r355-cross-compile.patch b/package/x11r7/openchrome/openchrome-0.2.902-cross-compile.patch index de12e5493..c7bfc9350 100644 --- a/package/x11r7/openchrome/openchrome-r355-cross-compile.patch +++ b/package/x11r7/openchrome/openchrome-0.2.902-cross-compile.patch @@ -1,7 +1,7 @@ ---- openchrome-r355/configure.ac.orig 2007-06-10 15:07:43.000000000 +0200 -+++ openchrome-r355/configure.ac 2007-06-10 15:11:16.000000000 +0200 -@@ -69,12 +69,18 @@ - AC_HEADER_STDC +--- a/configure.ac 2008-04-09 15:42:55.000000000 -0400 ++++ b/configure.ac 2008-06-23 09:39:06.000000000 -0400 +@@ -87,12 +87,18 @@ if test x$XSERVER_LIBPCIACCESS = xyes; t + fi if test "$DRI" != no; then + if test "$cross_compiling" = "no" ; then @@ -19,17 +19,18 @@ fi AC_MSG_CHECKING([whether to include DRI support]) -@@ -113,8 +119,12 @@ +@@ -133,8 +139,12 @@ AC_MSG_RESULT([$XVMC]) AM_CONDITIONAL(XVMC, test x$XVMC = xyes) -AC_CHECK_FILE([${sdkdir}/xf86Module.h], +- [have_xf86Module_h="yes"], [have_xf86Module_h="no"]) +if test "$cross_compiling" = "no" ; then + AC_CHECK_FILE([${sdkdir}/xf86Module.h], - [have_xf86Module_h="yes"], [have_xf86Module_h="no"]) ++ [have_xf86Module_h="yes"], [have_xf86Module_h="no"]) +else + have_xf86Module_h="yes" +fi # Check the ABI_VIDEODRV_VERSION - SAVE_CPPFLAGS="$CPPFLAGS" + SAVE_CFLAGS="$CFLAGS" diff --git a/package/x11r7/openchrome/openchrome.mk b/package/x11r7/openchrome/openchrome.mk index 986eadf0e..65b470d72 100644 --- a/package/x11r7/openchrome/openchrome.mk +++ b/package/x11r7/openchrome/openchrome.mk @@ -3,13 +3,13 @@ # openchrome # ############################################################# -OPENCHROME_VERSION = r355 -OPENCHROME_SOURCE = openchrome-$(OPENCHROME_VERSION).tar.bz2 -OPENCHROME_SITE = http://bazaar.mezis.net/ +OPENCHROME_VERSION = 0.2.902 +OPENCHROME_SOURCE = xf86-video-openchrome-$(OPENCHROME_VERSION).tar.bz2 +OPENCHROME_SITE = http://www.openchrome.org/releases OPENCHROME_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto -OPENCHROME_AUTORECONF = NO +OPENCHROME_AUTORECONF = YES OPENCHROME_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,package/x11r7,openchrome)) diff --git a/package/x11r7/xdata_xkbdata/Config.in b/package/x11r7/xdata_xkbdata/Config.in deleted file mode 100644 index cd56f7473..000000000 --- a/package/x11r7/xdata_xkbdata/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XDATA_XKBDATA - bool "xkbdata" - default n - depends on !BR2_PACKAGE_XKEYBOARD_CONFIG - help - xkbdata 1.0.1 - No description available diff --git a/package/x11r7/xdata_xkbdata/xdata_xkbdata.mk b/package/x11r7/xdata_xkbdata/xdata_xkbdata.mk deleted file mode 100644 index 32b8dc634..000000000 --- a/package/x11r7/xdata_xkbdata/xdata_xkbdata.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xdata_xkbdata -- No description available -# -################################################################################ - -XDATA_XKBDATA_VERSION = 1.0.1 -XDATA_XKBDATA_SOURCE = xkbdata-$(XDATA_XBITMAPS_VERSION).tar.bz2 -XDATA_XKBDATA_SITE = http://xorg.freedesktop.org/releases/individual/data -XDATA_XKBDATA_AUTORECONF = NO -XDATA_XKBDATA_INSTALL_STAGING = YES -XDATA_XKBDATA_INSTALL_TARGET = YES -XDATA_XKBDATA_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install -XDATA_XKBDATA_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install - -$(eval $(call AUTOTARGETS,package/x11r7,xdata_xkbdata)) diff --git a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk index f0b7a8fbb..30538e297 100644 --- a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk +++ b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_ACECAD_VERSION = 1.2.0 +XDRIVER_XF86_INPUT_ACECAD_VERSION = 1.2.2 XDRIVER_XF86_INPUT_ACECAD_SOURCE = xf86-input-acecad-$(XDRIVER_XF86_INPUT_ACECAD_VERSION).tar.bz2 XDRIVER_XF86_INPUT_ACECAD_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_ACECAD_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk index 8c2447a14..67360d86b 100644 --- a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk +++ b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_AIPTEK_VERSION = 1.0.1 +XDRIVER_XF86_INPUT_AIPTEK_VERSION = 1.1.1 XDRIVER_XF86_INPUT_AIPTEK_SOURCE = xf86-input-aiptek-$(XDRIVER_XF86_INPUT_AIPTEK_VERSION).tar.bz2 XDRIVER_XF86_INPUT_AIPTEK_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_AIPTEK_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk b/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk index 98571553a..d34e2304b 100644 --- a/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk +++ b/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_CALCOMP_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_CALCOMP_VERSION = 1.1.2 XDRIVER_XF86_INPUT_CALCOMP_SOURCE = xf86-input-calcomp-$(XDRIVER_XF86_INPUT_CALCOMP_VERSION).tar.bz2 XDRIVER_XF86_INPUT_CALCOMP_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_CALCOMP_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk b/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk index 60e175ddc..720e3f56d 100644 --- a/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk +++ b/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_CITRON_VERSION = 2.2.0 +XDRIVER_XF86_INPUT_CITRON_VERSION = 2.2.1 XDRIVER_XF86_INPUT_CITRON_SOURCE = xf86-input-citron-$(XDRIVER_XF86_INPUT_CITRON_VERSION).tar.bz2 XDRIVER_XF86_INPUT_CITRON_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_CITRON_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk b/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk index 37206e874..b87040dbf 100644 --- a/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk +++ b/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_DMC_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_DMC_VERSION = 1.1.2 XDRIVER_XF86_INPUT_DMC_SOURCE = xf86-input-dmc-$(XDRIVER_XF86_INPUT_DMC_VERSION).tar.bz2 XDRIVER_XF86_INPUT_DMC_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_DMC_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk b/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk index 562562c5e..3f15c5a22 100644 --- a/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk +++ b/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_DYNAPRO_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_DYNAPRO_VERSION = 1.1.2 XDRIVER_XF86_INPUT_DYNAPRO_SOURCE = xf86-input-dynapro-$(XDRIVER_XF86_INPUT_DYNAPRO_VERSION).tar.bz2 XDRIVER_XF86_INPUT_DYNAPRO_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_DYNAPRO_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk b/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk index 64d7277c7..965423e8f 100644 --- a/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk +++ b/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_ELO2300_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_ELO2300_VERSION = 1.1.2 XDRIVER_XF86_INPUT_ELO2300_SOURCE = xf86-input-elo2300-$(XDRIVER_XF86_INPUT_ELO2300_VERSION).tar.bz2 XDRIVER_XF86_INPUT_ELO2300_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_ELO2300_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk b/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk index c036cb66f..42e44ca06 100644 --- a/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk +++ b/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION = 1.0.0.5 +XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION = 1.2.1 XDRIVER_XF86_INPUT_ELOGRAPHICS_SOURCE = xf86-input-elographics-$(XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION).tar.bz2 XDRIVER_XF86_INPUT_ELOGRAPHICS_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_ELOGRAPHICS_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-10-bitfield-fixes.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-10-bitfield-fixes.patch new file mode 100644 index 000000000..e2748724a --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-10-bitfield-fixes.patch @@ -0,0 +1,324 @@ +From: Zephaniah E. Hull <warp@aehallh.com> +Date: Sun, 14 May 2006 11:55:50 +0000 (+0000) +Subject: Tweak credits and references. +X-Git-Tag: xf86-video-impact-0_2_0 +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=e9c60da89a9c55b81b2dedcf6ee3d1aefb4ff591 + +Tweak credits and references. +Change the longs to unsigned longs in the bitfields. +Cleanup our includes. +Stop pulling in asm/types.h and asm/bitops.h. +Conditionally define the stuff that used to come from the above, including + our own test_bit, set_bit and clear_bit. +Change the longs to unsigned longs in the bitfields. +Change the longs to unsigned longs in the bitfields. +Use the bitop defines in evdev.h properly. +Change the longs to unsigned longs in the bitfields. +Change the longs to unsigned longs in the bitfields. +Use the bitop defines in evdev.h properly. +Change the longs to unsigned longs in the bitfields. +Use the bitop defines in evdev.h properly. +Add HPPA/HPPA64 entries. (Thanks to Fabio M. Di Nitto + <fabbione@ubuntu.com>) +--- + +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,37 @@ ++2006-05-14 Zephaniah E. Hull <warp@aehallh.com> ++ ++ * man/evdev.man: ++ Tweak credits and references. ++ * src/evdev.c: (EvdevParseBits), (EvdevParseBitOption), ++ (EvdevCorePreInit): ++ Change the longs to unsigned longs in the bitfields. ++ ++ Cleanup our includes. ++ * src/evdev.h: ++ Stop pulling in asm/types.h and asm/bitops.h. ++ ++ Conditionally define the stuff that used to come from ++ the above, including our own test_bit, set_bit and clear_bit. ++ ++ Change the longs to unsigned longs in the bitfields. ++ * src/evdev_axes.c: (EvdevAxisAbsNew), (EvdevAxisRelNew): ++ Change the longs to unsigned longs in the bitfields. ++ ++ Use the bitop defines in evdev.h properly. ++ * src/evdev_brain.c: (MatchAll), (MatchNot), (MatchAny): ++ Change the longs to unsigned longs in the bitfields. ++ * src/evdev_btn.c: (EvdevBtnNew): ++ Change the longs to unsigned longs in the bitfields. ++ ++ Use the bitop defines in evdev.h properly. ++ * src/evdev_key.c: (EvdevKeyNew): ++ Change the longs to unsigned longs in the bitfields. ++ ++ Use the bitop defines in evdev.h properly. ++ * src/inotify-syscalls.h: ++ Add HPPA/HPPA64 entries. (Thanks to Fabio M. Di Nitto ++ <fabbione@ubuntu.com>) ++ + 2006-04-30 Zephaniah E. Hull <warp@aehallh.com> + + * configure.ac: +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -61,8 +61,6 @@ + #include <X11/XF86keysym.h> + #include <X11/extensions/XIproto.h> + +-#include <string.h> +- + #include "evdev.h" + + #include <xf86.h> +@@ -328,7 +326,7 @@ EvdevNew(evdevDriverPtr driver, evdevDev + } + + static void +-EvdevParseBits (char *in, long *out, int len) ++EvdevParseBits (char *in, unsigned long *out, int len) + { + unsigned long v[2]; + int n, i, max_bits = len * BITS_PER_LONG; +@@ -351,7 +349,7 @@ EvdevParseBits (char *in, long *out, int + } + + static void +-EvdevParseBitOption (char *opt, long *all, long *not, long *any, int len) ++EvdevParseBitOption (char *opt, unsigned long *all, unsigned long *not, unsigned long *any, int len) + { + char *cur, *next; + +@@ -395,7 +393,7 @@ EvdevCorePreInit(InputDriverPtr drv, IDe + EvdevParseBitOption (tmp, pEvdev->all_bits.field, \ + pEvdev->not_bits.field, \ + pEvdev->any_bits.field, \ +- sizeof(pEvdev->not_bits.field) / sizeof (long)); \ ++ sizeof(pEvdev->not_bits.field) / sizeof (unsigned long)); \ + free (tmp); \ + } + bitoption(ev); +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -72,20 +72,29 @@ + #include <stdarg.h> + #include <xf86Xinput.h> + ++#ifndef BITS_PER_LONG + #define BITS_PER_LONG (sizeof(long) * 8) ++#endif ++ + #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) +-#define OFF(x) ((x)%BITS_PER_LONG) +-#define LONG(x) ((x)/BITS_PER_LONG) +-#define BIT(x) (1UL<<((x)%BITS_PER_LONG)) +-#define test_bit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1) ++#define LONG(x) ((x) >> (sizeof(unsigned long) + 1)) ++#define MASK(x) (1 << ((x) & (sizeof (unsigned long) * 8 - 1))) ++ ++#ifndef test_bit ++#define test_bit(bit, array) (array[LONG(bit)] & MASK(bit)) ++#endif ++#ifndef set_bit ++#define set_bit(bit, array) (array[LONG(bit)] |= MASK(bit)) ++#endif ++#ifndef clear_bit ++#define clear_bit(bit, array) (array[LONG(bit)] &= ~MASK(bit)) ++#endif + + /* 2.4 compatibility */ + #ifndef EVIOCGSW + + #include <sys/time.h> + #include <sys/ioctl.h> +-#include <asm/types.h> +-#include <asm/bitops.h> + + #define EVIOCGSW(len) _IOC(_IOC_READ, 'E', 0x1b, len) /* get all switch states */ + +@@ -128,14 +137,14 @@ + #define EVDEV_MAXBUTTONS 96 + + typedef struct { +- long ev[NBITS(EV_MAX)]; +- long key[NBITS(KEY_MAX)]; +- long rel[NBITS(REL_MAX)]; +- long abs[NBITS(ABS_MAX)]; +- long msc[NBITS(MSC_MAX)]; +- long led[NBITS(LED_MAX)]; +- long snd[NBITS(SND_MAX)]; +- long ff[NBITS(FF_MAX)]; ++ unsigned long ev[NBITS(EV_MAX)]; ++ unsigned long key[NBITS(KEY_MAX)]; ++ unsigned long rel[NBITS(REL_MAX)]; ++ unsigned long abs[NBITS(ABS_MAX)]; ++ unsigned long msc[NBITS(MSC_MAX)]; ++ unsigned long led[NBITS(LED_MAX)]; ++ unsigned long snd[NBITS(SND_MAX)]; ++ unsigned long ff[NBITS(FF_MAX)]; + } evdevBitsRec, *evdevBitsPtr; + + typedef struct { +--- a/src/evdev_axes.c ++++ b/src/evdev_axes.c +@@ -49,14 +49,6 @@ + + #include <xf86_OSproc.h> + +-#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0]))) +- +-#define BITS_PER_LONG (sizeof(long) * 8) +-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) +-#define OFF(x) ((x)%BITS_PER_LONG) +-#define LONG(x) ((x)/BITS_PER_LONG) +-#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1) +- + static char *rel_axis_names[] = { + "X", + "Y", +@@ -328,7 +320,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo) + + real_axes = 0; + for (i = 0; i < ABS_MAX; i++) +- if (TestBit (i, pEvdev->bits.abs)) ++ if (test_bit (i, pEvdev->bits.abs)) + real_axes++; + + if (!real_axes) +@@ -344,7 +336,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo) + pInfo->conversion_proc = EvdevConvert; + + for (i = 0, j = 0; i < ABS_MAX; i++) { +- if (!TestBit (i, pEvdev->bits.abs)) ++ if (!test_bit (i, pEvdev->bits.abs)) + continue; + + snprintf(option, sizeof(option), "%sAbsoluteAxisMap", abs_axis_names[i]); +@@ -389,7 +381,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo) + xf86Msg(X_CONFIG, "%s: Unknown Mode: %s.\n", pInfo->name, s); + } + +- if (TestBit (ABS_X, pEvdev->bits.abs) && TestBit (ABS_Y, pEvdev->bits.abs)) ++ if (test_bit (ABS_X, pEvdev->bits.abs) && test_bit (ABS_Y, pEvdev->bits.abs)) + k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0); + else + k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1); +@@ -417,7 +409,7 @@ EvdevAxisRelNew(InputInfoPtr pInfo) + + real_axes = 0; + for (i = 0; i < REL_MAX; i++) +- if (TestBit (i, pEvdev->bits.rel)) ++ if (test_bit (i, pEvdev->bits.rel)) + real_axes++; + + if (!real_axes && (!state->abs || state->abs->axes < 2)) +@@ -434,7 +426,7 @@ EvdevAxisRelNew(InputInfoPtr pInfo) + pInfo->conversion_proc = EvdevConvert; + + for (i = 0, j = 0; i < REL_MAX; i++) { +- if (!TestBit (i, pEvdev->bits.rel)) ++ if (!test_bit (i, pEvdev->bits.rel)) + continue; + + snprintf(option, sizeof(option), "%sRelativeAxisMap", rel_axis_names[i]); +--- a/src/evdev_brain.c ++++ b/src/evdev_brain.c +@@ -86,7 +86,7 @@ typedef struct { + } evdevDevInfoRec, *evdevDevInfoPtr; + + static Bool +-MatchAll (long *dev, long *match, int len) ++MatchAll (unsigned long *dev, unsigned long *match, int len) + { + int i; + +@@ -98,7 +98,7 @@ MatchAll (long *dev, long *match, int le + } + + static Bool +-MatchNot (long *dev, long *match, int len) ++MatchNot (unsigned long *dev, unsigned long *match, int len) + { + int i; + +@@ -110,7 +110,7 @@ MatchNot (long *dev, long *match, int le + } + + static Bool +-MatchAny (long *dev, long *match, int len) ++MatchAny (unsigned long *dev, unsigned long *match, int len) + { + int i, found = 0; + +--- a/src/evdev_btn.c ++++ b/src/evdev_btn.c +@@ -51,15 +51,6 @@ + + #include <xf86Module.h> + +- +-#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0]))) +- +-#define BITS_PER_LONG (sizeof(long) * 8) +-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) +-#define OFF(x) ((x)%BITS_PER_LONG) +-#define LONG(x) ((x)/BITS_PER_LONG) +-#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1) +- + void + EvdevBtnPostFakeClicks(InputInfoPtr pInfo, int button, int count) + { +@@ -186,7 +177,7 @@ EvdevBtnNew(InputInfoPtr pInfo) + state->btn = Xcalloc (sizeof (evdevBtnRec)); + + for (i = BTN_MISC; i < (KEY_OK - 1); i++) +- if (TestBit (i, pEvdev->bits.key)) { ++ if (test_bit (i, pEvdev->bits.key)) { + bit = i; + if ((bit >= BTN_MOUSE) && (bit < BTN_JOYSTICK)) { + bit -= BTN_MOUSE - BTN_MISC; +--- a/src/evdev_key.c ++++ b/src/evdev_key.c +@@ -81,11 +81,6 @@ + + + #define ArrayLength(a) (sizeof(a) / (sizeof((a)[0]))) +-#define BITS_PER_LONG (sizeof(long) * 8) +-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) +-#define OFF(x) ((x)%BITS_PER_LONG) +-#define LONG(x) ((x)/BITS_PER_LONG) +-#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1) + + #define MIN_KEYCODE 8 + #define GLYPHS_PER_KEY 2 +@@ -356,13 +351,13 @@ EvdevKeyNew (InputInfoPtr pInfo) + int i, keys = 0; + + for (i = 0; i <= KEY_UNKNOWN; i++) +- if (TestBit (i, pEvdev->bits.key)) { ++ if (test_bit (i, pEvdev->bits.key)) { + keys = 1; + break; + } + if (!keys) + for (i = KEY_OK; i <= KEY_MAX; i++) +- if (TestBit (i, pEvdev->bits.key)) { ++ if (test_bit (i, pEvdev->bits.key)) { + keys = 1; + break; + } +--- a/src/inotify-syscalls.h ++++ b/src/inotify-syscalls.h +@@ -39,6 +39,10 @@ + # define __NR_inotify_init 290 + # define __NR_inotify_add_watch 291 + # define __NR_inotify_rm_watch 292 ++#elif defined (__hppa__) || defined (__hppa64__) ++# define __NR_inotify_init 269 ++# define __NR_inotify_add_watch 270 ++# define __NR_inotify_rm_watch 271 + #else + # error "Unsupported architecture!" + #endif diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-11-bitops-fixes.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-11-bitops-fixes.patch new file mode 100644 index 000000000..91240faa3 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-11-bitops-fixes.patch @@ -0,0 +1,42 @@ +From: Zephaniah E. Hull <warp@aehallh.com> +Date: Mon, 15 May 2006 22:47:23 +0000 (+0000) +Subject: Hopefully fix the bitops stuff to actually _work_. +X-Git-Tag: xf86-video-impact-0_2_0 +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=1b03250797daa0ac98323a9f43e895dd0b5c7761 + +Hopefully fix the bitops stuff to actually _work_. +--- + +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2006-05-15 Zephaniah E. Hull,,, <warp@aehallh.com> ++ ++ * src/evdev.h: ++ Hopefully fix the bitops stuff to actually _work_. ++ + 2006-05-14 Zephaniah E. Hull <warp@aehallh.com> + + * man/evdev.man: +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -73,15 +73,15 @@ + #include <xf86Xinput.h> + + #ifndef BITS_PER_LONG +-#define BITS_PER_LONG (sizeof(long) * 8) ++#define BITS_PER_LONG (sizeof(unsigned long) * 8) + #endif + + #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) +-#define LONG(x) ((x) >> (sizeof(unsigned long) + 1)) +-#define MASK(x) (1 << ((x) & (sizeof (unsigned long) * 8 - 1))) ++#define LONG(x) ((x)/BITS_PER_LONG) ++#define MASK(x) (1UL << ((x) & (BITS_PER_LONG - 1))) + + #ifndef test_bit +-#define test_bit(bit, array) (array[LONG(bit)] & MASK(bit)) ++#define test_bit(bit, array) (!!(array[LONG(bit)] & MASK(bit))) + #endif + #ifndef set_bit + #define set_bit(bit, array) (array[LONG(bit)] |= MASK(bit)) diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-20-add-inotify-architectures.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-20-add-inotify-architectures.patch new file mode 100644 index 000000000..a70832568 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-20-add-inotify-architectures.patch @@ -0,0 +1,29 @@ +Index: xserver-xorg-input-evdev/src/inotify-syscalls.h +=================================================================== +--- xserver-xorg-input-evdev.orig/src/inotify-syscalls.h 2006-11-01 19:37:12.000000000 +1100 ++++ xserver-xorg-input-evdev/src/inotify-syscalls.h 2006-11-01 19:59:51.000000000 +1100 +@@ -43,6 +43,24 @@ + # define __NR_inotify_init 269 + # define __NR_inotify_add_watch 270 + # define __NR_inotify_rm_watch 271 ++#elif defined (__mips__) ++# if _MIPS_SIM == _MIPS_SIM_ABI32 ++# define __NR_inotify_init 4284 ++# define __NR_inotify_add_watch 4285 ++# define __NR_inotify_rm_watch 4286 ++# elif _MIPS_SIM == _MIPS_SIM_NABI32 ++# define __NR_inotify_init 6247 ++# define __NR_inotify_add_watch 6248 ++# define __NR_inotify_rm_watch 6249 ++# elif _MIPS_SIM == _MIPS_SIM_ABI64 ++# define __NR_inotify_init 5243 ++# define __NR_inotify_add_watch 5244 ++# define __NR_inotify_rm_watch 5245 ++# endif ++#elif defined (__mc68000__) ++# define __NR_inotify_init 284 ++# define __NR_inotify_add_watch 285 ++# define __NR_inotify_rm_watch 286 + #else + # error "Unsupported architecture!" + #endif diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-30-absolute-axis.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-30-absolute-axis.patch new file mode 100644 index 000000000..5b3737eca --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-30-absolute-axis.patch @@ -0,0 +1,31 @@ +From: Adam Jackson <ajax@nwnk.net> +Date: Fri, 2 Jun 2006 19:39:52 +0000 (+0000) +Subject: Fix an obvious bogon to avoid crashing on absolute axis setup. +X-Git-Tag: xf86-video-impact-0_2_0 +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=57a7f2844108072bf03c9f82baf92e3447d18fbe + +Fix an obvious bogon to avoid crashing on absolute axis setup. +--- + +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2006-06-02 Adam Jackson <ajax@freedesktop.org> ++ ++ * src/evdev_axes.c: ++ Fix an obvious bogon to avoid crashing on absolute axis setup. ++ + 2006-05-15 Zephaniah E. Hull,,, <warp@aehallh.com> + + * src/evdev.h: +--- a/src/evdev_axes.c ++++ b/src/evdev_axes.c +@@ -385,7 +385,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo) + k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0); + else + k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1); +- if (k < screenInfo.numScreens) { ++ if (k < screenInfo.numScreens && k >= 0) { + state->abs->screen = k; + xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d.\n", pInfo->name, k); + } else { diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-40-close-fd.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-40-close-fd.patch new file mode 100644 index 000000000..e00042406 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-40-close-fd.patch @@ -0,0 +1,18 @@ +From: Zephaniah E. Hull <warp@agamemnon.b5> +Date: Tue, 11 Jul 2006 07:08:30 +0000 (-0400) +Subject: Set pInfo->fd to -1 when we close it in EvdevProc. +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=eba5ea8d5a19f2b1984cbf20c95d22e243f19567 + +Set pInfo->fd to -1 when we close it in EvdevProc. +--- + +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -200,6 +200,7 @@ EvdevProc(DeviceIntPtr device, int what) + RemoveEnabledDevice (pInfo->fd); + xf86RemoveSIGIOHandler (pInfo->fd); + close (pInfo->fd); ++ pInfo->fd = -1; + + if (pEvdev->state.axes) + EvdevAxesOff (device); diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-50-xinput.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-50-xinput.patch new file mode 100644 index 000000000..d38f56689 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-50-xinput.patch @@ -0,0 +1,21 @@ +--- a/src/evdev.c 2008-06-23 08:40:50.000000000 -0400 ++++ b/src/evdev.c 2008-06-23 08:42:00.000000000 -0400 +@@ -233,10 +233,6 @@ EvdevSwitchMode (ClientPtr client, Devic + else + return !Success; + break; +- case SendCoreEvents: +- case DontSendCoreEvents: +- xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents)); +- break; + default: + return !Success; + } +@@ -263,7 +259,6 @@ EvdevNew(evdevDriverPtr driver, evdevDev + pInfo->device_control = EvdevProc; + pInfo->read_input = EvdevReadInput; + pInfo->switch_mode = EvdevSwitchMode; +- pInfo->motion_history_proc = xf86GetMotionEvents; + pInfo->conf_idev = driver->dev; + + pInfo->private = device; diff --git a/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk b/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk index 65677e724..d524c9480 100644 --- a/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk +++ b/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_FPIT_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_FPIT_VERSION = 1.2.0 XDRIVER_XF86_INPUT_FPIT_SOURCE = xf86-input-fpit-$(XDRIVER_XF86_INPUT_FPIT_VERSION).tar.bz2 XDRIVER_XF86_INPUT_FPIT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_FPIT_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk b/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk index 8363eda66..a441f4393 100644 --- a/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk +++ b/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_HYPERPEN_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_HYPERPEN_VERSION = 1.2.0 XDRIVER_XF86_INPUT_HYPERPEN_SOURCE = xf86-input-hyperpen-$(XDRIVER_XF86_INPUT_HYPERPEN_VERSION).tar.bz2 XDRIVER_XF86_INPUT_HYPERPEN_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_HYPERPEN_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk b/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk index 5bb2c39f4..da2d4d47c 100644 --- a/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk +++ b/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION = 1.2.0 XDRIVER_XF86_INPUT_JAMSTUDIO_SOURCE = xf86-input-jamstudio-$(XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION).tar.bz2 XDRIVER_XF86_INPUT_JAMSTUDIO_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_JAMSTUDIO_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk index 627dac8ff..08e984421 100644 --- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.2.3 +XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.3.2 XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2 XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_JOYSTICK_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk index b3bd2080f..b0c376913 100644 --- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk +++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.2.2 +XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.3.1 XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2 XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_KEYBOARD_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk b/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk index 3b8df81f5..9301219e4 100644 --- a/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk +++ b/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MAGELLAN_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_MAGELLAN_VERSION = 1.2.0 XDRIVER_XF86_INPUT_MAGELLAN_SOURCE = xf86-input-magellan-$(XDRIVER_XF86_INPUT_MAGELLAN_VERSION).tar.bz2 XDRIVER_XF86_INPUT_MAGELLAN_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_MAGELLAN_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk b/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk index df9db25a9..e2d8708bf 100644 --- a/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk +++ b/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MICROTOUCH_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_MICROTOUCH_VERSION = 1.2.0 XDRIVER_XF86_INPUT_MICROTOUCH_SOURCE = xf86-input-microtouch-$(XDRIVER_XF86_INPUT_MICROTOUCH_VERSION).tar.bz2 XDRIVER_XF86_INPUT_MICROTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_MICROTOUCH_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk index 341ea4fdf..86f74f432 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.2.2 +XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.3.0 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk b/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk index f5755404a..1e6f4cc9a 100644 --- a/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk +++ b/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MUTOUCH_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_MUTOUCH_VERSION = 1.2.0 XDRIVER_XF86_INPUT_MUTOUCH_SOURCE = xf86-input-mutouch-$(XDRIVER_XF86_INPUT_MUTOUCH_VERSION).tar.bz2 XDRIVER_XF86_INPUT_MUTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_MUTOUCH_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk b/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk index d9a5b3140..77e090801 100644 --- a/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk +++ b/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_PALMAX_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_PALMAX_VERSION = 1.2.0 XDRIVER_XF86_INPUT_PALMAX_SOURCE = xf86-input-palmax-$(XDRIVER_XF86_INPUT_PALMAX_VERSION).tar.bz2 XDRIVER_XF86_INPUT_PALMAX_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_PALMAX_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk b/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk index cabcf9230..a108dfe53 100644 --- a/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk +++ b/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_PENMOUNT_VERSION = 1.2.0 +XDRIVER_XF86_INPUT_PENMOUNT_VERSION = 1.3.0 XDRIVER_XF86_INPUT_PENMOUNT_SOURCE = xf86-input-penmount-$(XDRIVER_XF86_INPUT_PENMOUNT_VERSION).tar.bz2 XDRIVER_XF86_INPUT_PENMOUNT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_PENMOUNT_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk b/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk index 0821c49f1..0a254b532 100644 --- a/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk +++ b/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_SPACEORB_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_SPACEORB_VERSION = 1.1.1 XDRIVER_XF86_INPUT_SPACEORB_SOURCE = xf86-input-spaceorb-$(XDRIVER_XF86_INPUT_SPACEORB_VERSION).tar.bz2 XDRIVER_XF86_INPUT_SPACEORB_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_SPACEORB_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk b/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk index 8bbd410da..2d093ca9d 100644 --- a/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk +++ b/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_SUMMA_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_SUMMA_VERSION = 1.2.0 XDRIVER_XF86_INPUT_SUMMA_SOURCE = xf86-input-summa-$(XDRIVER_XF86_INPUT_SUMMA_VERSION).tar.bz2 XDRIVER_XF86_INPUT_SUMMA_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_SUMMA_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-synaptics/Config.in b/package/x11r7/xdriver_xf86-input-synaptics/Config.in new file mode 100644 index 000000000..de3bd552a --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-synaptics/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_XDRIVER_XF86_INPUT_SYNAPTICS + bool "xf86-input-synaptics" + default n + select BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XPROTO_INPUTPROTO + select BR2_PACKAGE_XPROTO_RANDRPROTO + select BR2_PACKAGE_XPROTO_XPROTO + help + xf86-input-synaptics 0.14.7 + X.Org driver for synaptics input devices diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics-0.14.7~git20070706-configure.patch b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics-0.14.7~git20070706-configure.patch new file mode 100644 index 000000000..0bb70d506 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics-0.14.7~git20070706-configure.patch @@ -0,0 +1,8 @@ +diff -Nwrup xfree86-driver-synaptics_0.14.7~git20070706.orig/configure xdriver_xf86-input-synaptics-0.14.7~git20070706/configure +--- a/.stamp_configured 1969-12-31 19:00:00.000000000 -0500 ++++ b/.stamp_configured 2008-06-23 11:01:16.000000000 -0400 +@@ -0,0 +1,4 @@ ++#!/bin/sh ++ ++echo "Dummy configure" ++ diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk new file mode 100644 index 000000000..48d464bec --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# xdriver_xf86-input-synaptics -- X.Org driver for synaptics input devices +# +################################################################################ + +XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 0.14.7~git20070706 +XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xfree86-driver-synaptics_$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).orig.tar.gz +XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://ftp.de.debian.org/debian/pool/main/x/xfree86-driver-synaptics +XDRIVER_XF86_INPUT_SYNAPTICS_AUTORECONF = NO +XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto +XDRIVER_XF86_INPUT_SYNAPTICS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install + +$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-synaptics)) diff --git a/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk b/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk index 30289d3b8..e0c2aa247 100644 --- a/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk +++ b/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_TEK4957_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_TEK4957_VERSION = 1.2.0 XDRIVER_XF86_INPUT_TEK4957_SOURCE = xf86-input-tek4957-$(XDRIVER_XF86_INPUT_TEK4957_VERSION).tar.bz2 XDRIVER_XF86_INPUT_TEK4957_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_TEK4957_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk index 6aecdbe5a..d59929c0e 100644 --- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk +++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.4.1 +XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.5.1 XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2 XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_VMMOUSE_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk index ced262b37..23160e84c 100644 --- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk +++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_VOID_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_VOID_VERSION = 1.1.1 XDRIVER_XF86_INPUT_VOID_SOURCE = xf86-input-void-$(XDRIVER_XF86_INPUT_VOID_VERSION).tar.bz2 XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_VOID_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk index 941ebfa3d..246269b7c 100644 --- a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk +++ b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_APM_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_APM_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_APM_SOURCE = xf86-video-apm-$(XDRIVER_XF86_VIDEO_APM_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_APM_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_APM_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk index 08413f69a..1c5d07f6d 100644 --- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk +++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ARK_VERSION = 0.6.0 +XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.0 XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_ARK_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch deleted file mode 100644 index ba05f8841..000000000 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- xf86-video-ati-6.6.3/configure.ac.orig 2007-06-10 12:02:12.000000000 +0200 -+++ xf86-video-ati-6.6.3/configure.ac 2007-06-10 12:02:31.000000000 +0200 -@@ -84,13 +84,19 @@ - # Checks for header files. - AC_HEADER_STDC - --if test "$DRI" != no; then -+if test "x$DRI" != xno; then -+ if test "$cross_compiling" = no; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch new file mode 100644 index 000000000..d27617606 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch @@ -0,0 +1,27 @@ +--- a/configure.ac 2008-06-23 10:39:28.000000000 -0400 ++++ b/configure.ac 2008-06-23 10:40:46.000000000 -0400 +@@ -85,14 +85,20 @@ sdkdir=$(pkg-config --variable=sdkdir xo + AC_HEADER_STDC + + if test "$DRI" != no; then +- AC_CHECK_FILE([${sdkdir}/dri.h], ++ if test "$cross_compiling" = "no" ; then ++ AC_CHECK_FILE([${sdkdir}/dri.h], + [have_dri_h="yes"], [have_dri_h="no"]) +- AC_CHECK_FILE([${sdkdir}/sarea.h], ++ AC_CHECK_FILE([${sdkdir}/sarea.h], + [have_sarea_h="yes"], [have_sarea_h="no"]) +- AC_CHECK_FILE([${sdkdir}/dristruct.h], ++ AC_CHECK_FILE([${sdkdir}/dristruct.h], + [have_dristruct_h="yes"], [have_dristruct_h="no"]) +- AC_CHECK_FILE([${sdkdir}/damage.h], ++ AC_CHECK_FILE([${sdkdir}/damage.h], + [have_damage_h="yes"], [have_damage_h="no"]) ++ else ++ have_dri_h="yes" ++ have_sarea_h="yes" ++ have_dristruct_h="yes" ++ fi + fi + + AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index 5c1f3f850..8c4ae9c5f 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ATI_VERSION = 6.6.3 +XDRIVER_XF86_VIDEO_ATI_VERSION = 6.8.191 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_ATI_AUTORECONF = NO +XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ati)) diff --git a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk index fce6b04dd..7c7d1caca 100644 --- a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk +++ b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_CHIPS_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_CHIPS_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_CHIPS_SOURCE = xf86-video-chips-$(XDRIVER_XF86_VIDEO_CHIPS_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_CHIPS_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_CHIPS_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk index b0eae40ed..c501f1fd4 100644 --- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk +++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.1.0 +XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.2.1 XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_CIRRUS_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix-1.1.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix-1.1.0-cross-compile.patch new file mode 100644 index 000000000..09b371273 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix-1.1.0-cross-compile.patch @@ -0,0 +1,31 @@ +--- a/configure 2006-04-07 14:48:07.000000000 -0400 ++++ b/configure 2008-06-23 11:09:35.000000000 -0400 +@@ -20264,28 +20264,8 @@ echo "$as_me: Building with package name + as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5 + echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_File+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- test "$cross_compiling" = yes && +- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r "$prefix/share/X11/sgml/defs.ent"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +-if test `eval echo '${'$as_ac_File'}'` = yes; then +- DEFS_ENT_PATH=$prefix/share/X11/sgml +-else + DEFS_ENT_PATH= + +-fi +- + + # Extract the first word of "linuxdoc", so it can be a program name with args. + set dummy linuxdoc; ac_word=$2 diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk index f0000209e..a9dee77c5 100644 --- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk +++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.3.1 +XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.4.0 XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_FBDEV_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch deleted file mode 100644 index 437e06bb1..000000000 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xf86-video-glint-1.1.1/configure.ac.orig 2007-06-10 20:58:34.000000000 +0200 -+++ xf86-video-glint-1.1.1/configure.ac 2007-06-10 20:58:58.000000000 +0200 -@@ -69,12 +69,18 @@ - AC_HEADER_STDC - - if test "$DRI" != no; then -+ if test "$cross_compiling" = "no" ; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch new file mode 100644 index 000000000..8c420d3a8 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch @@ -0,0 +1,29 @@ +--- a/configure.ac 2008-06-23 11:17:07.000000000 -0400 ++++ b/configure.ac 2008-06-23 11:16:31.000000000 -0400 +@@ -75,12 +75,20 @@ CPPFLAGS="$SAVE_CPPFLAGS" + AC_HEADER_STDC + + if test "$DRI" != no; then +- AC_CHECK_FILE([${sdkdir}/dri.h], +- [have_dri_h="yes"], [have_dri_h="no"]) +- AC_CHECK_FILE([${sdkdir}/sarea.h], +- [have_sarea_h="yes"], [have_sarea_h="no"]) +- AC_CHECK_FILE([${sdkdir}/dristruct.h], +- [have_dristruct_h="yes"], [have_dristruct_h="no"]) ++ if test "$cross_compiling" = "no" ; then ++ AC_CHECK_FILE([${sdkdir}/dri.h], ++ [have_dri_h="yes"], [have_dri_h="no"]) ++ AC_CHECK_FILE([${sdkdir}/sarea.h], ++ [have_sarea_h="yes"], [have_sarea_h="no"]) ++ AC_CHECK_FILE([${sdkdir}/dristruct.h], ++ [have_dristruct_h="yes"], [have_dristruct_h="no"]) ++ AC_CHECK_FILE([${sdkdir}/damage.h], ++ [have_damage_h="yes"], [have_damage_h="no"]) ++ else ++ have_dri_h="yes" ++ have_sarea_h="yes" ++ have_dristruct_h="yes" ++ fi + fi + + AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk index 2e9eaee19..5f37470ea 100644 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk +++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = NO +XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-glint)) diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk index e1b9b4d7e..29ee8aded 100644 --- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk +++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_I128_VERSION = 1.2.1 +XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.0 XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_I128_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk index add8a8842..e4c1105f1 100644 --- a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk +++ b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_I740_VERSION = 1.1.0 +XDRIVER_XF86_VIDEO_I740_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_I740_SOURCE = xf86-video-i740-$(XDRIVER_XF86_VIDEO_I740_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_I740_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_I740_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.6.5.patch b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch index 9f0179d59..9f0179d59 100644 --- a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.6.5.patch +++ b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk index 1e5447aca..5672aed15 100644 --- a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk +++ b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_I810_VERSION = 1.6.5 +XDRIVER_XF86_VIDEO_I810_VERSION = 1.7.4 XDRIVER_XF86_VIDEO_I810_SOURCE = xf86-video-i810-$(XDRIVER_XF86_VIDEO_I810_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_I810_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_I810_AUTORECONF = NO +XDRIVER_XF86_VIDEO_I810_AUTORECONF = YES XDRIVER_XF86_VIDEO_I810_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-i810)) diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch new file mode 100644 index 000000000..0258d7018 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch @@ -0,0 +1,30 @@ +--- xf86-video-i810-1.6.5/configure.ac.orig 2007-06-10 20:59:27.000000000 +0200 ++++ xf86-video-i810-1.6.5/configure.ac 2007-06-10 20:59:50.000000000 +0200 +@@ -92,13 +92,14 @@ AC_HEADER_STDC + + AC_MSG_CHECKING([whether to include DRI support]) + if test x$DRI = xauto; then ++ if test "$cross_compiling" = "no" ; then + AC_CHECK_FILE([${sdkdir}/dri.h], + [have_dri_h="yes"], [have_dri_h="no"]) + AC_CHECK_FILE([${sdkdir}/sarea.h], + [have_sarea_h="yes"], [have_sarea_h="no"]) + AC_CHECK_FILE([${sdkdir}/dristruct.h], + [have_dristruct_h="yes"], [have_dristruct_h="no"]) +- AC_CHECK_FILE([${sdkdir}/damage.h], ++ AC_CHECK_FILE([${sdkdir}/damage.h], + [have_damage_h="yes"], [have_damage_h="no"]) + + if test "$have_dri_h" = yes -a \ +@@ -108,6 +109,12 @@ if test x$DRI = xauto; then + else + DRI="no" + fi ++ else ++ have_dri_h="yes" ++ have_sarea_h="yes" ++ have_dristruct_h="yes" ++ DRI="yes" ++ fi + fi + AC_MSG_RESULT([$DRI]) diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index 0e0d760cd..48d8b69c4 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.1.1 +XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.3.2 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = NO +XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-intel)) diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.8.patch index 34cc1330c..34cc1330c 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.8.patch diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 803715e24..90c8804bd 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.6.1 +XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.8 XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_MGA_AUTORECONF = NO +XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-mga)) diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk index ab3e04552..3abfbbfb1 100644 --- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk +++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.1 XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_NEOMAGIC_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport-0.2.1-cross-compile.patch b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport-0.2.1-cross-compile.patch new file mode 100644 index 000000000..34c8a7a63 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport-0.2.1-cross-compile.patch @@ -0,0 +1,31 @@ +--- a/configure 2006-10-13 18:36:20.000000000 -0400 ++++ b/configure 2008-06-23 11:38:03.000000000 -0400 +@@ -20191,28 +20191,8 @@ echo "$as_me: Building with package name + as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5 + echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_File+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- test "$cross_compiling" = yes && +- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r "$prefix/share/X11/sgml/defs.ent"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +-if test `eval echo '${'$as_ac_File'}'` = yes; then +- DEFS_ENT_PATH=$prefix/share/X11/sgml +-else + DEFS_ENT_PATH= + +-fi +- + + # Extract the first word of "linuxdoc", so it can be a program name with args. + set dummy linuxdoc; ac_word=$2 diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk index abba1c66f..d598635e3 100644 --- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk +++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.3 +XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.9 XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_NV_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk index 209e85bc4..65d37dfd4 100644 --- a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk +++ b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_RENDITION_VERSION = 4.1.3 +XDRIVER_XF86_VIDEO_RENDITION_VERSION = 4.2.0 XDRIVER_XF86_VIDEO_RENDITION_SOURCE = xf86-video-rendition-$(XDRIVER_XF86_VIDEO_RENDITION_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_RENDITION_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_RENDITION_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk index d1da734c3..52f665e5e 100644 --- a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk +++ b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_S3_VERSION = 0.5.0 +XDRIVER_XF86_VIDEO_S3_VERSION = 0.6.0 XDRIVER_XF86_VIDEO_S3_SOURCE = xf86-video-s3-$(XDRIVER_XF86_VIDEO_S3_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_S3_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_S3_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk index f281c0f9c..88d1ac5d7 100644 --- a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk +++ b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_S3VIRGE_VERSION = 1.9.1 +XDRIVER_XF86_VIDEO_S3VIRGE_VERSION = 1.10.1 XDRIVER_XF86_VIDEO_S3VIRGE_SOURCE = xf86-video-s3virge-$(XDRIVER_XF86_VIDEO_S3VIRGE_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_S3VIRGE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_S3VIRGE_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage-2.2.1-cross-compile.patch b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage-2.2.1-cross-compile.patch new file mode 100644 index 000000000..b9c296b6b --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage-2.2.1-cross-compile.patch @@ -0,0 +1,27 @@ +--- a/configure.ac 2008-05-21 16:04:23.000000000 -0400 ++++ b/configure.ac 2008-06-23 11:41:50.000000000 -0400 +@@ -68,12 +68,18 @@ sdkdir=$(pkg-config --variable=sdkdir xo + AC_HEADER_STDC + + if test "$DRI" != no; then +- AC_CHECK_FILE([${sdkdir}/dri.h], +- [have_dri_h="yes"], [have_dri_h="no"]) +- AC_CHECK_FILE([${sdkdir}/sarea.h], +- [have_sarea_h="yes"], [have_sarea_h="no"]) +- AC_CHECK_FILE([${sdkdir}/dristruct.h], +- [have_dristruct_h="yes"], [have_dristruct_h="no"]) ++ if test "$cross_compiling" = "no" ; then ++ AC_CHECK_FILE([${sdkdir}/dri.h], ++ [have_dri_h="yes"], [have_dri_h="no"]) ++ AC_CHECK_FILE([${sdkdir}/sarea.h], ++ [have_sarea_h="yes"], [have_sarea_h="no"]) ++ AC_CHECK_FILE([${sdkdir}/dristruct.h], ++ [have_dristruct_h="yes"], [have_dristruct_h="no"]) ++ else ++ have_dri_h="yes" ++ have_sarea_h="yes" ++ have_dristruct_h="yes" ++ fi + fi + + AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk index 98f6b3b55..0bd5ef396 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.1.3 +XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.2.1 XDRIVER_XF86_VIDEO_SAVAGE_SOURCE = xf86-video-savage-$(XDRIVER_XF86_VIDEO_SAVAGE_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = NO +XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-savage)) diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk index f7495fc8f..cfcdf6abc 100644 --- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk +++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.4.2 +XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.6.0 XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_SILICONMOTION_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.9.3.patch b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.10.0.patch index 9e06480d4..9e06480d4 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.9.3.patch +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.10.0.patch diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk index f68d6c4f5..8d468f92f 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SIS_VERSION = 0.9.3 +XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.0 XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_SIS_AUTORECONF = NO +XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sis)) diff --git a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk index f85a25a5f..b32061c13 100644 --- a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk +++ b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.8.1 +XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.9.0 XDRIVER_XF86_VIDEO_SISUSB_SOURCE = xf86-video-sisusb-$(XDRIVER_XF86_VIDEO_SISUSB_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_SISUSB_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk index ef2f3a62a..2f2f4ab03 100644 --- a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk +++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk @@ -7,7 +7,7 @@ XDRIVER_XF86_VIDEO_SUNFFB_VERSION = 1.1.0 XDRIVER_XF86_VIDEO_SUNFFB_SOURCE = xf86-video-sunffb-$(XDRIVER_XF86_VIDEO_SUNFFB_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SUNFFB_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = NO +XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = YES XDRIVER_XF86_VIDEO_SUNFFB_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sunffb)) diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.3.0.patch b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.4.0.patch index e53591bb0..e53591bb0 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.3.0.patch +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.4.0.patch diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 574099319..f485a715f 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.3.0 +XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.0 XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = NO +XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-tdfx)) diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga-1.1.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga-1.1.0-cross-compile.patch new file mode 100644 index 000000000..fac8018aa --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga-1.1.0-cross-compile.patch @@ -0,0 +1,30 @@ +--- a/configure 2006-04-07 17:40:13.000000000 -0400 ++++ b/configure 2008-06-23 11:54:36.000000000 -0400 +@@ -20326,27 +20326,8 @@ echo "$as_me: Building with package name + as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5 + echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_File+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- test "$cross_compiling" = yes && +- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r "$prefix/share/X11/sgml/defs.ent"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +-if test `eval echo '${'$as_ac_File'}'` = yes; then +- DEFS_ENT_PATH=$prefix/share/X11/sgml +-else + DEFS_ENT_PATH= + +-fi + + + # Extract the first word of "linuxdoc", so it can be a program name with args. diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index 89b3d77b7..81edf8e2d 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.2.3 +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.0 XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk index 61b1bfbf8..144d51285 100644 --- a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk +++ b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TSENG_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_TSENG_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_TSENG_SOURCE = xf86-video-tseng-$(XDRIVER_XF86_VIDEO_TSENG_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_TSENG_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_TSENG_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk index 22de4d140..dffcf13e0 100644 --- a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk +++ b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_V4L_VERSION = 0.1.1 +XDRIVER_XF86_VIDEO_V4L_VERSION = 0.2.0 XDRIVER_XF86_VIDEO_V4L_SOURCE = xf86-video-v4l-$(XDRIVER_XF86_VIDEO_V4L_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_V4L_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk index b4a651e6e..6a6fed7e8 100644 --- a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk +++ b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk @@ -7,7 +7,7 @@ XDRIVER_XF86_VIDEO_VIA_VERSION = 0.2.2 XDRIVER_XF86_VIDEO_VIA_SOURCE = xf86-video-via-$(XDRIVER_XF86_VIDEO_VIA_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_VIA_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_VIA_AUTORECONF = NO +XDRIVER_XF86_VIDEO_VIA_AUTORECONF = YES XDRIVER_XF86_VIDEO_VIA_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-via)) diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk index 79a645eaa..319fa39a1 100644 --- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk +++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VMWARE_VERSION = 10.14.1 +XDRIVER_XF86_VIDEO_VMWARE_VERSION = 10.16.2 XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_VMWARE_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk index bbbfce44b..0e62b6025 100644 --- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk +++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_VOODOO_SOURCE = xf86-video-voodoo-$(XDRIVER_XF86_VIDEO_VOODOO_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_VOODOO_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = NO diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk index 4f10f9d9b..a89f1ec68 100644 --- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk +++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XPROTO_INPUTPROTO_VERSION = 1.4.2.1 +XPROTO_INPUTPROTO_VERSION = 1.4.3 XPROTO_INPUTPROTO_SOURCE = inputproto-$(XPROTO_INPUTPROTO_VERSION).tar.bz2 XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto XPROTO_INPUTPROTO_AUTORECONF = NO diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index a85b152da..994c4059d 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -9,6 +9,21 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver XSERVER_XORG_SERVER_AUTORECONF = NO XSERVER_XORG_SERVER_INSTALL_STAGING = YES + +ifeq ($(strip $(BR2_PACKAGE_XSERVER_xorg)),y) +XSERVER_XORG_MESA_DEPS:=mesa3d +XSERVER_XORG_MESA_DIR:=--with-mesa-source="$(BUILD_DIR)/Mesa-6.5.3" +XSERVER_XORG_ENABLE_MODULAR:=--enable-xorg +else +XSERVER_XORG_ENABLE_MODULAR:=--disable-xorg +endif + +ifeq ($(strip $(BR2_PACKAGE_XSERVER_tinyx)),y) +XSERVER_XORG_ENABLE_KDRIVE:=--enable-kdrive --enable-xfbdev +else +XSERVER_XORG_ENABLE_KDRIVE:=--disable-kdrive --disable-xfbdev +endif + XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont libdrm xlib_libxkbui \ xproto_compositeproto xproto_damageproto xproto_fixesproto \ xproto_glproto xproto_kbproto xproto_randrproto freetype \ @@ -21,11 +36,12 @@ XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont lib xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto \ xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto \ xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto \ - pixman dbus mcookie + pixman dbus $(XSERVER_XORG_MESA_DEPS) mcookie -XSERVER_XORG_SERVER_CONF_OPT = --enable-kdrive --enable-xfbdev --enable-freetype --disable-kbd_mode --disable-xorg \ - --disable-config-hal CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" +XSERVER_XORG_SERVER_CONF_OPT = $(XSERVER_XORG_ENABLE_KDRIVE) --enable-freetype $(XSERVER_XORG_ENABLE_MODULAR) \ + --disable-config-hal $(XSERVER_XORG_MESA_DIR) CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" +XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data XSERVER_XORG_SERVER_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install # Optional packages |