May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit xen
by root＠suse.de 28 May '06

28 May '06

Hello community, here is the log from the commit of package xen checked in at Mon May 29 01:24:41 CEST 2006. -------- --- arch/i386/xen/xen.changes 2006-05-19 23:39:30.000000000 +0200 +++ xen/xen.changes 2006-05-26 23:59:59.000000000 +0200 @@ -1,0 +2,25 @@ +Fri May 26 11:48:08 MDT 2006 - ccoffing(a)novell.com + +- Fix deadlock between xm and qemu. Qemu should not call xm; + issue xc commands directly. This deadlock was exposed when + making qemu exit nicely and clean up. (#176400) +- Include Gerd's update to his previous REP MOVS fix. Calculating + high_addr and low_addr is more complicated than previously + thought, and the count was wrong. (#165448). +- Drop previous patch that forcefully turns off Xen's console + logging to avoid video corruption; instead use Jan's patch which + only turns logging off when in graphical mode. (#161541) +- Include Jan's patch to call machine_halt rather than inline + assembly "hlt" when Xen crashes to sync display, disable watchdog + timers, etc. +- Tweak the auto-ballooning patch to limit the VM itself to the + requested amount of memory, don't include the overhead, as + suggested by Intel. Separate calls exist elsewhere to increase + the max as needed. (#149179) +- Include select patches from xen-3.0-testing: + + 9688, 9696: These remove some broken assembly string + functions. This is prep work from Jan for bug #160066. + + 9695: Updates in the hypervisor to EDI and ESI could be + incorrect, due to sign not being handled correctly. + +------------------------------------------------------------------- Old: ---- xen-missing-media.diff xen-removable-media.diff New: ---- xen-9688-rm-broken-string-func.diff xen-9695-signed.diff xen-9696-rm-broken-string-func.diff xen-fatal-trap-halt.diff xen-removable.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.kk1XuV/_old 2006-05-29 01:23:24.000000000 +0200 +++ /var/tmp/diff_new_pack.kk1XuV/_new 2006-05-29 01:23:24.000000000 +0200 @@ -19,7 +19,7 @@ %define with_pygrub 1 %define xen_build_dir xen-3.0-testing Version: 3.0.2_09668 -Release: 5 +Release: 6 License: GPL Group: System/Kernel Autoreqprov: on @@ -61,7 +61,6 @@ Patch21: xen-xm-top-needs-root.diff Patch22: xen-tightvnc.diff Patch23: xen-balloon.diff -Patch24: xen-missing-media.diff Patch25: xen-bonding.diff Patch26: xen-hvm-localtime.diff Patch27: xen-hvm-auto-balloon.diff @@ -69,7 +68,6 @@ Patch29: xen-BUILD_BUG_ON.diff Patch30: xen-pirq_shared.diff Patch31: xen-lost-mouse.diff -Patch32: xen-removable-media.diff Patch33: xen-cirrus-corruption.diff Patch34: xen-hvm-memory-check.diff Patch35: xen-load-pae-bin-kernel.diff @@ -78,6 +76,8 @@ Patch38: xen-lowmem-emergency-pool.diff Patch39: xen-hvm-decode.diff Patch40: xen-console.diff +Patch41: xen-removable.diff +Patch42: xen-fatal-trap-halt.diff Patch49: xen-enable-hvm-debug.diff Patch50: xen-enable-debug Patch99: xen-poweroff.diff @@ -97,6 +97,9 @@ Patch113: xen-9683-svm-build-fix.diff Patch114: xen-9685-segment-bases.diff Patch115: xen-9686-32-64-vmx-regs.diff +Patch116: xen-9688-rm-broken-string-func.diff +Patch117: xen-9695-signed.diff +Patch118: xen-9696-rm-broken-string-func.diff URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/ Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -456,6 +459,9 @@ %patch113 -p1 %patch114 -p1 %patch115 -p1 +%patch116 -p1 +%patch117 -p1 +%patch118 -p1 # Now our patches... %patch1 -p1 %patch2 -p1 @@ -482,7 +488,6 @@ %patch21 -p1 %patch22 -p1 %patch23 -p1 -%patch24 -p1 %patch25 -p1 %patch26 -p1 %patch27 -p1 @@ -490,7 +495,6 @@ %patch29 -p1 %patch30 -p1 %patch31 -p1 -%patch32 -p1 %patch33 -p1 %patch34 -p1 %patch35 -p1 @@ -499,6 +503,8 @@ %patch38 -p1 %patch39 -p1 %patch40 -p1 +%patch41 -p1 +%patch42 -p1 #%patch49 -p1 XEN_EXTRAVERSION=%version-%release XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}} @@ -805,6 +811,28 @@ %{insserv_cleanup} %changelog -n xen +* Fri May 26 2006 - ccoffing(a)novell.com +- Fix deadlock between xm and qemu. Qemu should not call xm; + issue xc commands directly. This deadlock was exposed when + making qemu exit nicely and clean up. (#176400) +- Include Gerd's update to his previous REP MOVS fix. Calculating + high_addr and low_addr is more complicated than previously + thought, and the count was wrong. (#165448). +- Drop previous patch that forcefully turns off Xen's console + logging to avoid video corruption; instead use Jan's patch which + only turns logging off when in graphical mode. (#161541) +- Include Jan's patch to call machine_halt rather than inline + assembly "hlt" when Xen crashes to sync display, disable watchdog + timers, etc. +- Tweak the auto-ballooning patch to limit the VM itself to the + requested amount of memory, don't include the overhead, as + suggested by Intel. Separate calls exist elsewhere to increase + the max as needed. (#149179) +- Include select patches from xen-3.0-testing: + + 9688, 9696: These remove some broken assembly string + functions. This is prep work from Jan for bug #160066. + + 9695: Updates in the hypervisor to EDI and ESI could be + incorrect, due to sign not being handled correctly. * Fri May 19 2006 - ccoffing(a)novell.com - Update from Intel to previous patch to fix installation of HVM W2k. Adds decoding for two more instructions. (#176717) ++++++ README.SuSE ++++++ --- arch/i386/xen/README.SuSE 2006-05-19 21:18:37.000000000 +0200 +++ xen/README.SuSE 2006-05-27 00:34:19.000000000 +0200 @@ -152,8 +152,13 @@ "System", then start "Virtual Machine Management (Xen)". For full functionality, YaST must run in graphical mode, not ncurses. -The first screen shows all created and running VMs. To create a new one, click -"Add". Now adjust the VM's configuration to your liking. +The first screen shows all created and running VMs. To create a new one, +click "Add". Now adjust the VM's configuration to your liking. + +Xen does not yet properly support removable media in VMs in paravirtual mode, +so installing an operating system from CDs is rather difficult, manual +process. We recommend using a network installation source, a DVD, or a DVD +ISO. CDs do, however, work as expected in fully-virtual mode. Note that is is possible to install SUSE Linux graphically, even when it is paravirtualized. Add "vnc=1" to the "Installation Options" in YaST, and see @@ -243,18 +248,6 @@ commands must be done as root. -CD-ROM / DVD Support --------------------- -The physical CD/DVD drive can be shared between multiple VMs, but some special -steps have to be taken. - -The physical CD/DVD drive can be visible to only one fully virtualized VM at -a time. To virtually "insert" the CD/DVD (that is, to attach the physical -drive to the VM) press Ctrl-Alt-i while in the VM's window. The VM that -previously had control of the CD/DVD drive will still see a drive, but it will -appear to have no media. - - Networking ---------- Your virtual machines become much more useful if your can reach them via the ++++++ xen-9688-rm-broken-string-func.diff ++++++ # HG changeset patch # User kaf24(a)firebug.cl.cam.ac.uk # Date Wed May 24 11:54:00 2006 +0100 # Node ID f75e01cfde7613b0fcd0a5dce41765df75af044f # parent: 1405615a31d52bfcc75593bcad2ec8d4f21fff21 Remove broken inline-asm string functions from Xen/x86. The generic implementations in string.c are quite sufficient. Signed-off-by: Keir Fraser <keir(a)xensource.com> xen-unstable changeset: 10144:1345b20cca565950c0209971a0a71d19498cc765 xen-unstable date: Wed May 24 11:52:25 2006 +0100 --- a/xen/include/asm-x86/string.h Fri May 19 16:14:54 2006 +0100 +++ b/xen/include/asm-x86/string.h Wed May 24 11:54:00 2006 +0100 @@ -2,152 +2,6 @@ #define __X86_STRING_H__ #include <xen/config.h> - -#define __HAVE_ARCH_STRCPY -static inline char *strcpy(char *dest, const char *src) -{ - long d0, d1, d2; - __asm__ __volatile__ ( - "1: lodsb \n" - " stosb \n" - " test %%al,%%al \n" - " jne 1b \n" - : "=&S" (d0), "=&D" (d1), "=&a" (d2) - : "0" (src), "1" (dest) : "memory" ); - return dest; -} - -#define __HAVE_ARCH_STRNCPY -static inline char *strncpy(char *dest, const char *src, size_t count) -{ - long d0, d1, d2, d3; - __asm__ __volatile__ ( - "1: dec %2 \n" - " js 2f \n" - " lodsb \n" - " stosb \n" - " test %%al,%%al \n" - " jne 1b \n" - " rep ; stosb \n" - "2: \n" - : "=&S" (d0), "=&D" (d1), "=&c" (d2), "=&a" (d3) - : "0" (src), "1" (dest), "2" (count) : "memory" ); - return dest; -} - -#define __HAVE_ARCH_STRCAT -static inline char *strcat(char *dest, const char *src) -{ - long d0, d1, d2, d3; - __asm__ __volatile__ ( - " repne ; scasb \n" - " dec %1 \n" - "1: lodsb \n" - " stosb \n" - " test %%al,%%al \n" - " jne 1b \n" - : "=&S" (d0), "=&D" (d1), "=&a" (d2), "=&c" (d3) - : "0" (src), "1" (dest), "2" (0UL), "3" (0xffffffffUL) : "memory" ); - return dest; -} - -#define __HAVE_ARCH_STRNCAT -static inline char *strncat(char *dest, const char *src, size_t count) -{ - long d0, d1, d2, d3; - __asm__ __volatile__ ( - " repne ; scasb \n" - " dec %1 \n" - " mov %8,%3 \n" - "1: dec %3 \n" - " js 2f \n" - " lodsb \n" - " stosb \n" - " test %%al,%%al \n" - " jne 1b \n" - "2: xor %%eax,%%eax\n" - " stosb" - : "=&S" (d0), "=&D" (d1), "=&a" (d2), "=&c" (d3) - : "0" (src), "1" (dest), "2" (0UL), "3" (0xffffffffUL), "g" (count) - : "memory" ); - return dest; -} - -#define __HAVE_ARCH_STRCMP -static inline int strcmp(const char *cs, const char *ct) -{ - long d0, d1; - register int __res; - __asm__ __volatile__ ( - "1: lodsb \n" - " scasb \n" - " jne 2f \n" - " test %%al,%%al \n" - " jne 1b \n" - " xor %%eax,%%eax\n" - " jmp 3f \n" - "2: sbb %%eax,%%eax\n" - " or $1,%%al \n" - "3: \n" - : "=a" (__res), "=&S" (d0), "=&D" (d1) - : "1" (cs), "2" (ct) ); - return __res; -} - -#define __HAVE_ARCH_STRNCMP -static inline int strncmp(const char *cs, const char *ct, size_t count) -{ - long d0, d1, d2; - register int __res; - __asm__ __volatile__ ( - "1: dec %3 \n" - " js 2f \n" - " lodsb \n" - " scasb \n" - " jne 3f \n" - " test %%al,%%al \n" - " jne 1b \n" - "2: xor %%eax,%%eax\n" - " jmp 4f \n" - "3: sbb %%eax,%%eax\n" - " or $1,%%al \n" - "4: \n" - : "=a" (__res), "=&S" (d0), "=&D" (d1), "=&c" (d2) - : "1" (cs), "2" (ct), "3" (count) ); - return __res; -} - -#define __HAVE_ARCH_STRCHR -static inline char *strchr(const char *s, int c) -{ - long d0; - register char *__res; - __asm__ __volatile__ ( - " mov %%al,%%ah \n" - "1: lodsb \n" - " cmp %%ah,%%al \n" - " je 2f \n" - " test %%al,%%al \n" - " jne 1b \n" - " mov $1,%1 \n" - "2: mov %1,%0 \n" - " dec %0 \n" - : "=a" (__res), "=&S" (d0) : "1" (s), "0" (c) ); - return __res; -} - -#define __HAVE_ARCH_STRLEN -static inline size_t strlen(const char *s) -{ - long d0; - register int __res; - __asm__ __volatile__ ( - " repne ; scasb \n" - " notl %0 \n" - " decl %0 \n" - : "=c" (__res), "=&D" (d0) : "1" (s), "a" (0), "0" (0xffffffffUL) ); - return __res; -} static inline void *__variable_memcpy(void *to, const void *from, size_t n) { ++++++ xen-9695-signed.diff ++++++ # HG changeset patch # User kaf24(a)firebug.cl.cam.ac.uk # Date Fri May 26 13:55:03 2006 +0100 # Node ID 05782730877b4e8e85261aff9540b1b2597ffc86 # parent: d82a4c4d04d4757e7caa37cc2890f335bd8b4c5b Cast to a signed type before negating if we really want the result to be negative. From: Jan Beulich <jbeulich(a)novell.com> Signed-off-by: Keir Fraser <keir(a)xensource.com> xen-unstable changeset: 10171:2dc7c271270055b8df6b063141a05dc0c92298b2 xen-unstable date: Fri May 26 13:49:29 2006 +0100 --- a/xen/arch/x86/traps.c Fri May 26 09:23:33 2006 +0100 +++ b/xen/arch/x86/traps.c Fri May 26 13:55:03 2006 +0100 @@ -873,7 +873,7 @@ static int emulate_privileged_op(struct PAGE_FAULT(regs->edi, USER_WRITE_FAULT); break; } - regs->edi += (regs->eflags & EF_DF) ? -op_bytes : op_bytes; + regs->edi += (regs->eflags & EF_DF) ? -(int)op_bytes : op_bytes; break; case 0x6e: /* OUTSB */ @@ -899,7 +899,7 @@ static int emulate_privileged_op(struct outl_user((u32)data, (u16)regs->edx, v, regs); break; } - regs->esi += (regs->eflags & EF_DF) ? -op_bytes : op_bytes; + regs->esi += (regs->eflags & EF_DF) ? -(int)op_bytes : op_bytes; break; } --- a/xen/arch/x86/x86_emulate.c Fri May 26 09:23:33 2006 +0100 +++ b/xen/arch/x86/x86_emulate.c Fri May 26 13:55:03 2006 +0100 @@ -857,7 +857,7 @@ x86_emulate_memop( &dst.val, 8)) != 0 ) goto done; } - register_address_increment(_regs.esp, -dst.bytes); + register_address_increment(_regs.esp, -(int)dst.bytes); if ( (rc = ops->write_std(register_address(_regs.ss, _regs.esp), dst.val, dst.bytes)) != 0 ) goto done; @@ -939,9 +939,9 @@ x86_emulate_memop( goto done; } register_address_increment( - _regs.esi, (_regs.eflags & EFLG_DF) ? -dst.bytes : dst.bytes); + _regs.esi, (_regs.eflags & EFLG_DF) ? -(int)dst.bytes : dst.bytes); register_address_increment( - _regs.edi, (_regs.eflags & EFLG_DF) ? -dst.bytes : dst.bytes); + _regs.edi, (_regs.eflags & EFLG_DF) ? -(int)dst.bytes : dst.bytes); break; case 0xa6 ... 0xa7: /* cmps */ DPRINTF("Urk! I don't handle CMPS.\n"); @@ -952,7 +952,7 @@ x86_emulate_memop( dst.ptr = (unsigned long *)cr2; dst.val = _regs.eax; register_address_increment( - _regs.edi, (_regs.eflags & EFLG_DF) ? -dst.bytes : dst.bytes); + _regs.edi, (_regs.eflags & EFLG_DF) ? -(int)dst.bytes : dst.bytes); break; case 0xac ... 0xad: /* lods */ dst.type = OP_REG; @@ -961,7 +961,7 @@ x86_emulate_memop( if ( (rc = ops->read_emulated(cr2, &dst.val, dst.bytes)) != 0 ) goto done; register_address_increment( - _regs.esi, (_regs.eflags & EFLG_DF) ? -dst.bytes : dst.bytes); + _regs.esi, (_regs.eflags & EFLG_DF) ? -(int)dst.bytes : dst.bytes); break; case 0xae ... 0xaf: /* scas */ DPRINTF("Urk! I don't handle SCAS.\n"); ++++++ xen-9696-rm-broken-string-func.diff ++++++ # HG changeset patch # User kaf24(a)firebug.cl.cam.ac.uk # Date Fri May 26 13:55:33 2006 +0100 # Node ID 10602076065759c58d9cc1be0c04241325539c8b # parent: 05782730877b4e8e85261aff9540b1b2597ffc86 Remove bogus inline asm of unused function memchr(). Signed-off-by: Keir Fraser <keir(a)xensource.com> xen-unstable changeset: 10172:3ed325fa395bb75f846b29bd3fa571ffc03eb5e4 xen-unstable date: Fri May 26 13:53:49 2006 +0100 --- a/xen/include/asm-x86/string.h Fri May 26 13:55:03 2006 +0100 +++ b/xen/include/asm-x86/string.h Fri May 26 13:55:33 2006 +0100 @@ -112,22 +112,6 @@ extern void *memmove(void *dest, const v #define __HAVE_ARCH_MEMCMP #define memcmp __builtin_memcmp -#define __HAVE_ARCH_MEMCHR -static inline void *memchr(const void *cs, int c, size_t count) -{ - long d0; - register void *__res; - if ( count == 0 ) - return NULL; - __asm__ __volatile__ ( - " repne ; scasb\n" - " je 1f \n" - " mov $1,%0 \n" - "1: dec %0 \n" - : "=D" (__res), "=&c" (d0) : "a" (c), "0" (cs), "1" (count) ); - return __res; -} - static inline void *__memset_generic(void *s, char c, size_t count) { long d0, d1; ++++++ xen-console.diff ++++++ --- /var/tmp/diff_new_pack.kk1XuV/_old 2006-05-29 01:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.kk1XuV/_new 2006-05-29 01:23:27.000000000 +0200 @@ -1,18 +1,91 @@ -Index: xen-3.0-testing/xen/arch/x86/setup.c +Subject: video mode detection (161541) + +Charles, attached the promised patch for replacing xen-console.diff. Jan + +Index: xen-3.0-testing/xen/drivers/char/console.c =================================================================== ---- xen-3.0-testing.orig/xen/arch/x86/setup.c -+++ xen-3.0-testing/xen/arch/x86/setup.c -@@ -561,8 +561,11 @@ void __init __start_xen(multiboot_info_t - - init_trace_bufs(); - -- /* Give up the VGA console if DOM0 is configured to grab it. */ -- console_endboot(cmdline && strstr(cmdline, "tty0")); -+ /* -+ * Always give up the VGA console, even if DOM0 seems to not use tty0, -+ * to avoid clashing with X's video memory. -+ */ -+ console_endboot(1); +--- xen-3.0-testing.orig/xen/drivers/char/console.c ++++ xen-3.0-testing/xen/drivers/char/console.c +@@ -52,6 +52,7 @@ static char printk_prefix[16] = ""; - /* Hide UART from DOM0 if we're using it */ - serial_endboot(); + static int sercon_handle = -1; + static int vgacon_enabled = 0; ++static int yield_vgacon = 0; + + spinlock_t console_lock = SPIN_LOCK_UNLOCKED; + +@@ -112,6 +113,25 @@ static int detect_vga(void) + detect_video(__va(0xB8000))); + } + ++static int gfx_vga(void) ++{ ++ unsigned char idx, data; ++ ++#if 0 ++ inb(0x3da); ++ outb(0x10, 0x3c0); ++ data = inb(0x3c1); ++ inb(0x3da); ++ outb(0x20, 0x3c0); ++#else ++ idx = inb(0x3ce); ++ outb(0x06, 0x3ce); ++ data = inb(0x3cf); ++ outb(idx, 0x3ce); ++#endif ++ return data & 0x01; ++} ++ + /* This is actually code from vgaHWRestore in an old version of XFree86 :-) */ + static void init_vga(void) + { +@@ -191,12 +211,27 @@ static void put_newline(void) + + static void putchar_console(int c) + { ++ static int vga_in_gfx = -1; ++ + if ( !vgacon_enabled ) + return; + ++ switch ( yield_vgacon ) ++ { ++ case 2: ++ if ( vga_in_gfx < 0 ) ++ vga_in_gfx = gfx_vga(); ++ if ( vga_in_gfx ) ++ return; ++ break; ++ case 3: ++ return; ++ } ++ + if ( c == '\n' ) + { + put_newline(); ++ vga_in_gfx = -1; + } + else + { +@@ -474,6 +509,10 @@ void init_console(void) + sercon_handle = serial_parse_handle(p); + else if ( strncmp(p, "vga", 3) == 0 ) + vgacon_enabled = 1; ++ else if ( strncmp(p, "yield", 5) == 0 && (!p[5] || p[5] == ',') ) ++ yield_vgacon = 1; ++ else if ( strncmp(p, "keep", 4) == 0 && (!p[4] || p[4] == ',') ) ++ yield_vgacon = -1; + } + + init_vga(); +@@ -500,8 +539,7 @@ void init_console(void) + + void console_endboot(int disable_vga) + { +- if ( disable_vga ) +- vgacon_enabled = 0; ++ yield_vgacon |= 2; + + /* + * If user specifies so, we fool the switch routine to redirect input ++++++ xen-fatal-trap-halt.diff ++++++ From: Jan Beulich Index: xen-3.0-testing/xen/arch/x86/traps.c =================================================================== --- xen-3.0-testing.orig/xen/arch/x86/traps.c +++ xen-3.0-testing/xen/arch/x86/traps.c @@ -97,6 +97,8 @@ DECLARE_TRAP_HANDLER(alignment_check); DECLARE_TRAP_HANDLER(spurious_interrupt_bug); DECLARE_TRAP_HANDLER(machine_check); +void machine_halt(void); + long do_set_debugreg(int reg, unsigned long value); unsigned long do_get_debugreg(int reg); @@ -318,8 +320,7 @@ asmlinkage void fatal_trap(int trapnr, s console_force_lock(); /* Wait for manual reset. */ - for ( ; ; ) - __asm__ __volatile__ ( "hlt" ); + machine_halt(); } static inline int do_trap(int trapnr, char *str, ++++++ xen-hvm-auto-balloon.diff ++++++ --- /var/tmp/diff_new_pack.kk1XuV/_old 2006-05-29 01:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.kk1XuV/_new 2006-05-29 01:23:27.000000000 +0200 @@ -52,11 +52,13 @@ =================================================================== --- xen-3.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-3.0-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -1247,7 +1247,7 @@ class XendDomainInfo: +@@ -1246,8 +1246,8 @@ class XendDomainInfo: + m = self.image.getDomainMemory(self.info['memory'] * 1024) balloon.free(m) - xc.domain_setmaxmem(self.domid, m) +- xc.domain_setmaxmem(self.domid, m) - xc.domain_memory_increase_reservation(self.domid, m, 0, 0) ++ xc.domain_setmaxmem(self.domid, self.info['memory'] * 1024) + xc.domain_memory_increase_reservation(self.domid, self.info['memory'] * 1024, 0, 0) self.createChannels() ++++++ xen-hvm-rep-movs.diff ++++++ --- /var/tmp/diff_new_pack.kk1XuV/_old 2006-05-29 01:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.kk1XuV/_new 2006-05-29 01:23:27.000000000 +0200 @@ -2,21 +2,51 @@ =================================================================== --- xen-3.0-testing.orig/xen/arch/x86/hvm/platform.c +++ xen-3.0-testing/xen/arch/x86/hvm/platform.c -@@ -865,7 +865,7 @@ void handle_mmio(unsigned long va, unsig - * copy ourself. After this copy succeeds, "rep movs" is executed +@@ -830,7 +830,7 @@ void handle_mmio(unsigned long va, unsig + unsigned long count = GET_REPEAT_COUNT(); + unsigned long size = mmio_inst.op_size; + int sign = regs->eflags & EF_DF ? -1 : 1; +- unsigned long addr = 0; ++ unsigned long addr, high_addr, low_addr; + int dir; + + /* determine non-MMIO address */ +@@ -851,6 +851,13 @@ void handle_mmio(unsigned long va, unsig + addr = regs->edi; + } + } ++ if (sign > 0) { ++ high_addr = addr + count * size - 1; ++ low_addr = addr; ++ } else { ++ high_addr = addr + size - 1; ++ low_addr = addr - (count-1) * size; ++ } + + mmio_opp->flags = mmio_inst.flags; + mmio_opp->instr = mmio_inst.instr; +@@ -866,6 +873,7 @@ void handle_mmio(unsigned long va, unsig * again. */ -- if ((addr & PAGE_MASK) != ((addr + size - 1) & PAGE_MASK)) { -+ if ((addr & PAGE_MASK) != ((addr + sign * (size - 1)) & PAGE_MASK)) { + if ((addr & PAGE_MASK) != ((addr + size - 1) & PAGE_MASK)) { ++ /* one movs crosses page border */ unsigned long value = 0; mmio_opp->flags |= OVERLAP; -@@ -876,7 +876,7 @@ void handle_mmio(unsigned long va, unsig +@@ -876,13 +884,14 @@ void handle_mmio(unsigned long va, unsig hvm_copy(&value, addr, size, HVM_COPY_IN); send_mmio_req(IOREQ_TYPE_COPY, gpa, 1, size, value, dir, 0); } else { - if ((addr & PAGE_MASK) != ((addr + count * size - 1) & PAGE_MASK)) { -+ if ((addr & PAGE_MASK) != ((addr + sign * (count * size - 1)) & PAGE_MASK)) { ++ if ((high_addr & PAGE_MASK) != (low_addr & PAGE_MASK)) { ++ /* $count movs will cross page border */ regs->eip -= inst_len; /* do not advance %eip */ if (sign > 0) + count = (PAGE_SIZE - (addr & ~PAGE_MASK)) / size; + else +- count = (addr & ~PAGE_MASK) / size; ++ count = ((high_addr + 1) & ~PAGE_MASK) / size; + } + + send_mmio_req(IOREQ_TYPE_COPY, gpa, count, size, addr, dir, 1); ++++++ xen-lost-mouse.diff ++++++ --- /var/tmp/diff_new_pack.kk1XuV/_old 2006-05-29 01:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.kk1XuV/_new 2006-05-29 01:23:27.000000000 +0200 @@ -1,3 +1,9 @@ +Qemu was not releasing the mouse, so added sdl_grab_end. +atexit was not being called, so don't do SIGKILL. +But that caused a deadlock between qemu and xm, so qemu shouldn't +call xm directly. + + Index: xen-3.0-testing/tools/ioemu/sdl.c =================================================================== --- xen-3.0-testing.orig/tools/ioemu/sdl.c @@ -16,21 +22,51 @@ =================================================================== --- xen-3.0-testing.orig/tools/python/xen/xend/image.py +++ xen-3.0-testing/tools/python/xen/xend/image.py -@@ -376,9 +376,16 @@ class HVMImageHandler(ImageHandler): - def destroy(self): - self.unregister_shutdown_watch(); +@@ -378,7 +378,7 @@ class HVMImageHandler(ImageHandler): import signal -+ import time if not self.pid: return - os.kill(self.pid, signal.SIGKILL) + os.kill(self.pid, signal.SIGTERM) -+ # This is a temporary work-around for bug 176400 -+ time.sleep(2) -+ try: -+ os.kill(self.pid, signal.SIGKILL) -+ except: -+ pass os.waitpid(self.pid, 0) self.pid = 0 +Index: xen-3.0-testing/tools/ioemu/target-i386-dm/helper2.c +=================================================================== +--- xen-3.0-testing.orig/tools/ioemu/target-i386-dm/helper2.c ++++ xen-3.0-testing/tools/ioemu/target-i386-dm/helper2.c +@@ -409,12 +409,20 @@ int xc_handle; + void + destroy_hvm_domain(void) + { +- extern FILE* logfile; +- char destroy_cmd[32]; ++ int xcHandle; ++ int sts; + +- sprintf(destroy_cmd, "xm destroy %d", domid); +- if (system(destroy_cmd) == -1) +- fprintf(logfile, "%s failed.!\n", destroy_cmd); ++ xcHandle = xc_interface_open(); ++ if (xcHandle < 0) ++ fprintf(logfile, "Cannot acquire xenctrl handle\n"); ++ else { ++ sts = xc_domain_destroy(xcHandle, domid); ++ if (sts != 0) ++ fprintf(logfile, "? xc_domain_destroy failed, sts %d, errno %d\n", sts, errno); ++ else ++ fprintf(logfile, "Issued domain %d destroy\n", domid); ++ xc_interface_close(xcHandle); ++ } + } + + fd_set wakeup_rfds; +@@ -454,7 +462,7 @@ int main_loop(void) + retval = select(highest_fds+1, &wakeup_rfds, NULL, NULL, &tv); + if (retval == -1) { + fprintf(logfile, "select returned error %d\n", errno); +- return 0; ++ break; + } + rfds = wakeup_rfds; + FD_ZERO(&wakeup_rfds); ++++++ xen-removable-media.diff -> xen-removable.diff ++++++ ++++ 1226 lines (skipped) ++++ between arch/i386/xen/xen-removable-media.diff ++++ and xen/xen-removable.diff ++++++ xmexample.rescue ++++++ --- arch/i386/xen/xmexample.rescue 2006-04-04 19:38:36.000000000 +0200 +++ xen/xmexample.rescue 2006-05-27 00:06:54.000000000 +0200 @@ -6,27 +6,13 @@ # you can set the parameters for the domain on the xm command line. #============================================================================ -def vmid_check(var, val): - val = int(val) - if val <= 0: - raise ValueError - return val - -# Define the 'vmid' variable so that 'xm create' knows about it. -xm_vars.var('vmid', - use="Virtual machine id. Integer greater than 0.", - check=vmid_check) - -# Check the defined variables have valid values. -xm_vars.check() - #---------------------------------------------------------------------------- # Kernel image file and (optional) ramdisk (initrd). kernel = "/boot/vmlinuz-xen" ramdisk = "/boot/initrd-xen" # Or use domUloader instead of kernel/ramdisk to get kernel from domU FS -#bootloader = "/usr/lib/xen/boot/domUlaoder.py" +#bootloader = "/usr/lib/xen/boot/domUloader.py" #bootentry = "hda2:/vmlinuz-xen,/initrd-xen" #bootentry = "/boot/vmlinuz-xen,/boot/initrd-xen" @@ -37,7 +23,7 @@ memory = 64 # A name for your domain. All domains must have different names. -name = "Rescue%i" % vmid +name = "Rescue" # Which CPU to start domain on? #cpu = -1 # leave to Xen to pick @@ -47,7 +33,7 @@ # Optionally define mac and/or bridge for the network interfaces. # Random MACs are assigned if not given. -vif = [ 'mac=00:16:3e:00:00:%02x, bridge=xenbr0' % vmid ] +vif = [ '' ] #---------------------------------------------------------------------------- # Define the disk devices you want the domain to have access to, and @@ -55,7 +41,7 @@ # Each disk entry is of the form phy:UNAME,DEV,MODE # where UNAME is the device, DEV is the device name the domain will see, # and MODE is r for read-only, w for read-write. -disk = [ 'file:/var/lib/xen/images/rescue%i,hda1,w' % (vmid) ] +disk = [ 'file:/var/lib/xen/images/rescue,hda1,w' ] #---------------------------------------------------------------------------- # Set the kernel command line for the new domain. @@ -67,13 +53,13 @@ # Set if you want dhcp to allocate the IP address. #dhcp = "dhcp" # Set ip -#ip = "192.168.222.%i/27" % (8+vmid) +#ip = "192.168.222.9/27" # Set netmask. #netmask = "255.255.255.192" # Set default gateway. #gateway = "192.168.222.1" # Set the hostname. -hostname= "rescue%d" % vmid +#hostname= "rescue" # Set root device, see disk def above. root = "/dev/hda1 rw" @@ -86,7 +72,7 @@ #nfs_root = '/full/path/to/root/directory' # Sets runlevel 3. -extra = "3" +extra = "1" #---------------------------------------------------------------------------- # Set according to whether you want the domain restarted when it exits. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xmms
by root＠suse.de 28 May '06

28 May '06

Hello community, here is the log from the commit of package xmms checked in at Mon May 29 01:23:39 CEST 2006. -------- --- GNOME/xmms/xmms.changes 2006-04-06 18:36:36.000000000 +0200 +++ xmms/xmms.changes 2006-05-26 21:24:25.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 26 21:24:11 CEST 2006 - schwab(a)suse.de + +- Fix use of --noexecstack flag. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmms.spec ++++++ --- /var/tmp/diff_new_pack.bR9CzC/_old 2006-05-29 01:23:23.000000000 +0200 +++ /var/tmp/diff_new_pack.bR9CzC/_new 2006-05-29 01:23:23.000000000 +0200 @@ -15,7 +15,7 @@ %define splitmad 1 Summary: The extensible media player Version: 1.2.10 -Release: 97 +Release: 103 URL: http://www.xmms.org/ License: GPL Group: Productivity/Multimedia/Sound/Players @@ -448,7 +448,8 @@ autoconf --force popd done -CFLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack -fno-strict-aliasing" \ +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ +CCASFLAGS="-Wa,--noexecstack" \ ./configure \ %ifarch %ix86 --enable-simd \ @@ -593,6 +594,8 @@ /usr/share/aclocal/xmms.m4 %changelog -n xmms +* Fri May 26 2006 - schwab(a)suse.de +- Fix use of --noexecstack flag. * Thu Apr 06 2006 - sbrabec(a)suse.cz - Fixed playlist font color for xmmsuse and xmmsuse_blue (#116959). * Tue Mar 07 2006 - sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xbanner
by root＠suse.de 28 May '06

28 May '06

Hello community, here is the log from the commit of package xbanner checked in at Mon May 29 01:23:13 CEST 2006. -------- --- xbanner/xbanner.changes 2006-01-25 21:42:58.000000000 +0100 +++ xbanner/xbanner.changes 2006-05-27 19:35:17.000000000 +0200 @@ -1,0 +2,5 @@ +Sat May 27 19:35:11 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xbanner.spec ++++++ --- /var/tmp/diff_new_pack.XvDUi8/_old 2006-05-29 01:22:15.000000000 +0200 +++ /var/tmp/diff_new_pack.XvDUi8/_new 2006-05-29 01:22:15.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package xbanner (Version 1.31) # -# Copyright (c) 2004 SUSE LINUX AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,7 +16,7 @@ Group: Amusements/Toys/Background Autoreqprov: on Version: 1.31 -Release: 858 +Release: 873 Summary: X Window System background writings and images URL: http://www.hijinks.com/~spade/linux/XBanner/ Source: XBanner%{version}.tar.bz2 @@ -87,6 +87,8 @@ %config /usr/X11R6/lib/X11/app-defaults/XBanner %changelog -n xbanner +* Sat May 27 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Sun Oct 10 2004 - schwab(a)suse.de ++++++ XBanner1.31.dif ++++++ --- /var/tmp/diff_new_pack.XvDUi8/_old 2006-05-29 01:22:15.000000000 +0200 +++ /var/tmp/diff_new_pack.XvDUi8/_new 2006-05-29 01:22:15.000000000 +0200 @@ -1,5 +1,5 @@ --- Imakefile -+++ Imakefile 2000/09/13 13:16:54 ++++ Imakefile @@ -6,7 +6,7 @@ XCOMM Install directory: @@ -26,12 +26,12 @@ -InstallTarget(install,xbanner, --strip --mode "0755" --owner root --group bin , $(LOCALBINDIR)) -InstallTarget(install,freetemp, --strip --mode "0755" --owner root --group bin , $(LOCALBINDIR)) -InstallTarget(install,xb_check, --strip --mode "0755" --owner root --group bin , $(LOCALBINDIR)) -+InstallTarget(install,xbanner,--strip --mode "0755",$(LOCALBINDIR)) -+InstallTarget(install,freetemp,--strip --mode "0755",$(LOCALBINDIR)) -+InstallTarget(install,xb_check,--strip --mode "0755",$(LOCALBINDIR)) -+InstallTarget(install,random_effect,--strip --mode "0755",$(LOCALBINDIR)) ++InstallTarget(install,xbanner,--mode "0755",$(LOCALBINDIR)) ++InstallTarget(install,freetemp,--mode "0755",$(LOCALBINDIR)) ++InstallTarget(install,xb_check,--mode "0755",$(LOCALBINDIR)) ++InstallTarget(install,random_effect,--mode "0755",$(LOCALBINDIR)) --- samples/Demo/Coin -+++ samples/Demo/Coin 2000/09/13 13:17:35 ++++ samples/Demo/Coin @@ -7,7 +7,7 @@ xbanner.foreground: #FFA501 xbanner.hiColor: yellow @@ -42,7 +42,7 @@ xbanner.pixmapY: 250 xbanner.placement: TopCenter --- samples/Demo/Shake -+++ samples/Demo/Shake 2000/09/13 13:17:53 ++++ samples/Demo/Shake @@ -1,4 +1,4 @@ -xbanner.bgPixFile: ../../Logo_32_col.xpm +xbanner.bgPixFile: ../Logo_32_col.xpm @@ -50,7 +50,7 @@ xbanner.effect: Shake xbanner.font: -adobe-utopia-bold-i-normal--200-*-100-100-*-*-iso8859-1 --- samples/Demo/StandOut2_2 -+++ samples/Demo/StandOut2_2 2000/09/13 13:18:13 ++++ samples/Demo/StandOut2_2 @@ -8,7 +8,7 @@ xbanner.thickness: 4 xbanner.y: 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xdmbgrd
by root＠suse.de 28 May '06

28 May '06

Hello community, here is the log from the commit of package xdmbgrd checked in at Mon May 29 01:23:12 CEST 2006. -------- --- xdmbgrd/xdmbgrd.changes 2006-01-25 21:43:02.000000000 +0100 +++ xdmbgrd/xdmbgrd.changes 2006-05-27 22:20:24.000000000 +0200 @@ -1,0 +2,5 @@ +Sat May 27 22:20:16 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- xdmbgrd-0.5.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdmbgrd.spec ++++++ --- /var/tmp/diff_new_pack.8UarET/_old 2006-05-29 01:22:40.000000000 +0200 +++ /var/tmp/diff_new_pack.8UarET/_new 2006-05-29 01:22:40.000000000 +0200 @@ -1,15 +1,14 @@ # # spec file for package xdmbgrd (Version 0.5) # -# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -# usedforbuild aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libselinux libstdc++ libxcrypt m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt procinfo procps psmisc pwdutils rcs readline sed sendmail strace syslogd sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel XFree86 XFree86-devel XFree86-libs autoconf automake binutils expat fontconfig fontconfig-devel gcc gdbm gettext libtool perl rpm Name: xdmbgrd BuildRequires: xorg-x11 xorg-x11-devel @@ -17,10 +16,10 @@ Group: System/X11/Displaymanagers Autoreqprov: on Version: 0.5 -Release: 0 +Release: 44 Summary: SuSE Linux background Source: xdmbgrd-0.5.tar.bz2 -#Patch: xdmbgrd-0.5.dif +Patch: xdmbgrd-0.5.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -34,26 +33,25 @@ %prep %setup -q -#%patch +%patch %build PATH=$PATH:. make XLIBD=/usr/X11R6/%_lib %install -rm -rf $RPM_BUILD_ROOT if test -x /usr/X11R6/bin/chooser ; then mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin/ - install -s -m 0755 BackGround $RPM_BUILD_ROOT/usr/X11R6/bin/ + install -m 0755 BackGround $RPM_BUILD_ROOT/usr/X11R6/bin/ echo /usr/X11R6/bin/BackGround > file-list else if test -x /etc/X11/xdm/chooser ; then mkdir -p $RPM_BUILD_ROOT/etc/X11/xdm - install -s -m 0755 BackGround $RPM_BUILD_ROOT/etc/X11/xdm/ + install -m 0755 BackGround $RPM_BUILD_ROOT/etc/X11/xdm/ echo /etc/X11/xdm/BackGround > file-list else mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xdm - install -s -m 0755 BackGround $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xdm + install -m 0755 BackGround $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xdm echo /usr/X11R6/lib/X11/xdm/BackGround > file-list fi fi @@ -65,6 +63,8 @@ %defattr(-,root,root) %changelog -n xdmbgrd +* Sat May 27 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Mar 11 2004 - werner(a)suse.de ++++++ xdmbgrd-0.5.diff ++++++ --- Makefile +++ Makefile @@ -31,7 +31,7 @@ $(CC) $(CFLAGS) -DMAIN -D_PROGRAM=\"xconsole\" -s -o $@ $^ $(LIBS) BackGround: backgrd.c unzip.o login-pos.o SuSE_Linux.o - $(CC) $(CFLAGS) -Wl,-no-warn-mismatch -DMAIN -D_PROGRAM=\"xlogin\" -s -o $@ $^ $(LIBS) + $(CC) $(CFLAGS) -Wl,-no-warn-mismatch -DMAIN -D_PROGRAM=\"xlogin\" -o $@ $^ $(LIBS) clean: rm -f backgrd.o unzip.o login-pos.o testt \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit x11-input-wacom
by root＠suse.de 28 May '06

28 May '06

Hello community, here is the log from the commit of package x11-input-wacom checked in at Mon May 29 01:22:34 CEST 2006. -------- --- x11-input-wacom/x11-input-wacom.changes 2006-05-15 19:01:58.000000000 +0200 +++ x11-input-wacom/x11-input-wacom.changes 2006-05-26 14:59:32.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 26 14:59:14 CEST 2006 - sndirsch(a)suse.de + +- updated to release 0.7.4-2 + * fixes a typo in some wacom.c files + +------------------------------------------------------------------- Old: ---- linuxwacom-0.7.4-1.tar.bz2 New: ---- linuxwacom-0.7.4-2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.iU5sY1/_old 2006-05-29 01:22:11.000000000 +0200 +++ /var/tmp/diff_new_pack.iU5sY1/_new 2006-05-29 01:22:11.000000000 +0200 @@ -19,10 +19,10 @@ URL: http://linuxwacom.sourceforge.net/ Group: System/X11/Utilities Version: 0.7.4 -Release: 1 +Release: 2 Summary: X11 input module for wacom tablet Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o -Source: linuxwacom-%{version}-1.tar.bz2 +Source: linuxwacom-%{version}-2.tar.bz2 Patch: fix-linuxwacom-Makefile-64bitArch.diff Patch1: xsetwacom.diff Patch2: linuxwacom-0.7.0-rotate-patch @@ -74,7 +74,7 @@ Ping Cheng <pingc(a)wacom.com> %prep -%setup -n linuxwacom-%{version}-1 +%setup -n linuxwacom-%{version}-2 %patch %ifnarch s390 s390x %patch1 @@ -93,6 +93,8 @@ %ifarch x86_64 --enable-xserver64 \ %endif + --enable-dlloader \ + --with-xmoduledir=/usr/X11R6/%{_lib}/modules/input \ --with-xlib=/usr/X11R6/%{_lib} \ --with-xorg-sdk=/usr/X11R6/%{_lib}/Server %endif @@ -125,7 +127,7 @@ %dir /usr/X11R6/%_lib/modules/ %dir /usr/X11R6/%_lib/modules/input #### DO NOT STRIP ".o" modules ! ### -%attr (644,root,root) /usr/X11R6/%_lib/modules/input/wacom_drv.o +%attr (644,root,root) /usr/X11R6/%_lib/modules/input/wacom_drv.so %endif %files tools @@ -153,6 +155,9 @@ /usr/%_lib/libwacomcfg.so %changelog -n x11-input-wacom +* Fri May 26 2006 - sndirsch(a)suse.de +- updated to release 0.7.4-2 + * fixes a typo in some wacom.c files * Sat May 06 2006 - sndirsch(a)suse.de - updated to release 0.7.4-1 * added support for DTF 521, I3 12x12, and I3 12x19 ++++++ linuxwacom-0.7.4-1.tar.bz2 -> linuxwacom-0.7.4-2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/ChangeLog new/linuxwacom-0.7.4-2/ChangeLog --- old/linuxwacom-0.7.4-1/ChangeLog 2006-05-05 19:25:01.000000000 +0200 +++ new/linuxwacom-0.7.4-2/ChangeLog 2006-05-26 00:41:58.000000000 +0200 @@ -1,3 +1,11 @@ +2006-05-25 Ping Cheng <pingc(a)wacom.com> + * Fixed a typo in some wacom.c files + * Update configure.in and acinclude.m4 (Ron at Debian) for + xorg 7 installation path + detecting target arch + configure xlib path + * Release as 0.7.4-2 + 2006-05-05 Ping Cheng <pingc(a)wacom.com> * Updated website * Ready to release 0.7.4 @@ -12,7 +20,7 @@ * Removed SYSCALL for unnecessary statements (Andrew Zabolotny) 2006-04-06 Ping Cheng <pingc(a)wacom.com> - * Reday to release 0.7.3-1 + * Ready to release 0.7.3-1 2006-03-31 Ping Cheng <pingc(a)wacom.com> * Support 2.6.16 @@ -24,7 +32,7 @@ 2006-03-14 Ping Cheng <pingc(a)wacom.com> * Fixed a relative distance bug in wcmCommon.c - * Reday to release 0.7.3 as beta + * Ready to release 0.7.3 as beta 2006-03-06 Ping Cheng <pingc(a)wacom.com> * Fixed a Volito bug (Kirill Frolov) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/acinclude.m4 new/linuxwacom-0.7.4-2/acinclude.m4 --- old/linuxwacom-0.7.4-1/acinclude.m4 2006-05-05 19:25:01.000000000 +0200 +++ new/linuxwacom-0.7.4-2/acinclude.m4 2006-05-26 00:41:58.000000000 +0200 @@ -29,18 +29,39 @@ WCM_XIDUMP_DEFAULT=yes WCM_ENV_XLIB=no dnl Check architecture -AC_MSG_CHECKING(for processor type) -WCM_ARCH=`uname -m` +AC_MSG_CHECKING(for arch type) +AC_ARG_WITH(arch, +AC_HELP_STRING([--with-arch], [Use specified architecture]), +[ WCM_ARCH=$withval +], +[ + dnl Try the compiler for the build arch first. + dnl We may be cross compiling or building for + dnl a 32bit system with a 64 bit kernel etc. + WCM_ARCH=`$CC -dumpmachine 2> /dev/null` + test $? = 0 || WCM_ARCH=`uname -m` +]) AC_MSG_RESULT($WCM_ARCH) -dnl + +dnl Check for X server bit +AC_ARG_ENABLE(xserver64, +AC_HELP_STRING([--enable-xserver64], [Use specified X server bit [[default=usually]]]), +[ WCM_OPTION_XSERVER64=$enableval +], +[ + WCM_OPTION_XSERVER64=no + test `echo $WCM_ARCH | grep -c "64"` == 0 || WCM_OPTION_XSERVER64=yes +]) + WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib WCM_XLIBDIR_DEFAULT2=/usr/lib -WCM_OPTION_XSERVER64=no -IS64=`echo $WCM_ARCH | grep -c "64"` -if test $IS64 != 0; then +if test "$WCM_OPTION_XSERVER64" = "yes"; then + CFLAGS="$CFLAGS -D__amd64__" + WCM_XSERVER64="-D_XSERVER64" + test `echo $WCM_ARCH | grep -c "x86_64"` == 0 || + WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib64 - WCM_XLIBDIR_DEFAULT2=/usr/lib64 - WCM_OPTION_XSERVER64=yes + test -L /usr/lib64 || WCM_XLIBDIR_DEFAULT2=/usr/lib64 fi if test -f "$WCM_XLIBDIR_DEFAULT/Server/xf86Version.h"; then WCM_XORGSDK_DEFAULT=$WCM_XLIBDIR_DEFAULT/Server @@ -275,14 +296,14 @@ dnl handle default case AC_MSG_CHECKING(for X lib directory) if test "$WCM_XLIBDIR" == "" || test "$WCM_XLIBDIR" == "yes"; then - if test -d $WCM_XLIBDIR_DEFAULT/X11 || - test -d $WCM_XLIBDIR_DEFAULT; then + if test -f $WCM_XLIBDIR_DEFAULT2/libX11.so; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 AC_MSG_RESULT(found) - elif test -a $WCM_XLIBDIR_DEFAULT2/libX11.so; then + elif test -d $WCM_XLIBDIR_DEFAULT/X11 || + test -d $WCM_XLIBDIR_DEFAULT; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT AC_MSG_RESULT(found) else AC_MSG_RESULT([not found, tried $WCM_XLIBDIR_DEFAULT/X11 and $WCM_XLIBDIR_DEFAULT2]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/aclocal.m4 new/linuxwacom-0.7.4-2/aclocal.m4 --- old/linuxwacom-0.7.4-1/aclocal.m4 2006-05-08 18:32:55.000000000 +0200 +++ new/linuxwacom-0.7.4-2/aclocal.m4 2006-05-26 01:00:50.000000000 +0200 @@ -42,18 +42,39 @@ WCM_XIDUMP_DEFAULT=yes WCM_ENV_XLIB=no dnl Check architecture -AC_MSG_CHECKING(for processor type) -WCM_ARCH=`uname -m` +AC_MSG_CHECKING(for arch type) +AC_ARG_WITH(arch, +AC_HELP_STRING([--with-arch], [Use specified architecture]), +[ WCM_ARCH=$withval +], +[ + dnl Try the compiler for the build arch first. + dnl We may be cross compiling or building for + dnl a 32bit system with a 64 bit kernel etc. + WCM_ARCH=`$CC -dumpmachine 2> /dev/null` + test $? = 0 || WCM_ARCH=`uname -m` +]) AC_MSG_RESULT($WCM_ARCH) -dnl + +dnl Check for X server bit +AC_ARG_ENABLE(xserver64, +AC_HELP_STRING([--enable-xserver64], [Use specified X server bit [[default=usually]]]), +[ WCM_OPTION_XSERVER64=$enableval +], +[ + WCM_OPTION_XSERVER64=no + test `echo $WCM_ARCH | grep -c "64"` == 0 || WCM_OPTION_XSERVER64=yes +]) + WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib WCM_XLIBDIR_DEFAULT2=/usr/lib -WCM_OPTION_XSERVER64=no -IS64=`echo $WCM_ARCH | grep -c "64"` -if test $IS64 != 0; then +if test "$WCM_OPTION_XSERVER64" = "yes"; then + CFLAGS="$CFLAGS -D__amd64__" + WCM_XSERVER64="-D_XSERVER64" + test `echo $WCM_ARCH | grep -c "x86_64"` == 0 || + WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib64 - WCM_XLIBDIR_DEFAULT2=/usr/lib64 - WCM_OPTION_XSERVER64=yes + test -L /usr/lib64 || WCM_XLIBDIR_DEFAULT2=/usr/lib64 fi if test -f "$WCM_XLIBDIR_DEFAULT/Server/xf86Version.h"; then WCM_XORGSDK_DEFAULT=$WCM_XLIBDIR_DEFAULT/Server @@ -288,14 +309,14 @@ dnl handle default case AC_MSG_CHECKING(for X lib directory) if test "$WCM_XLIBDIR" == "" || test "$WCM_XLIBDIR" == "yes"; then - if test -d $WCM_XLIBDIR_DEFAULT/X11 || - test -d $WCM_XLIBDIR_DEFAULT; then + if test -f $WCM_XLIBDIR_DEFAULT2/libX11.so; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 AC_MSG_RESULT(found) - elif test -a $WCM_XLIBDIR_DEFAULT2/libX11.so; then + elif test -d $WCM_XLIBDIR_DEFAULT/X11 || + test -d $WCM_XLIBDIR_DEFAULT; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT AC_MSG_RESULT(found) else AC_MSG_RESULT([not found, tried $WCM_XLIBDIR_DEFAULT/X11 and $WCM_XLIBDIR_DEFAULT2]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/autom4te.cache/output.0 new/linuxwacom-0.7.4-2/autom4te.cache/output.0 --- old/linuxwacom-0.7.4-1/autom4te.cache/output.0 2006-05-08 18:32:58.000000000 +0200 +++ new/linuxwacom-0.7.4-2/autom4te.cache/output.0 2006-05-26 01:00:53.000000000 +0200 @@ -1020,6 +1020,7 @@ --enable-static=PKGS build static libraries default=yes --enable-fast-install=PKGS optimize for fast installation default=yes --disable-libtool-lock avoid locking (might break parallel builds) + --enable-xserver64 Use specified X server bit [default=usually] --enable-wacom Enable building wacom.o [default=no] --enable-wacdump Enable building wacdump [default=yes] --enable-xidump Enable building xidump [default=yes] @@ -1034,7 +1035,6 @@ --enable-tabletdev Enable building tabletdev.o [default=no] --enable-dlloader Use dlloader [default=usually] --enable-wacomdrv Enable building wacom_drv.{o,so} [default=yes] - --enable-xserver64 Use specified X server bit [default=usually] --enable-modver Enable kernel module versioning [default=usually] --enable-mkxincludes Enable mkxincludes, XF86 dependency builder [default=no] @@ -1044,6 +1044,7 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld default=no --with-pic try to use only PIC/non-PIC objects default=use both + --with-arch Use specified architecture --with-linux Override linux kernel check --with-kernel=dir Specify kernel source directory --with-x-src=dir Specify X driver build directory @@ -1052,7 +1053,8 @@ --with-xlib=dir uses a specified X11R6 directory --with-tcl=dir uses a specified tcl directory --with-tk=dir uses a specified tk directory - --with-arch Use specified architecture + --with-xmoduledir Specify wacom_drv path explicitly. Implies + --enable-dlloader Some influential environment variables: CC C compiler command @@ -7985,19 +7987,44 @@ WCM_ENV_TK=no WCM_XIDUMP_DEFAULT=yes WCM_ENV_XLIB=no -echo "$as_me:$LINENO: checking for processor type" >&5 -echo $ECHO_N "checking for processor type... $ECHO_C" >&6 -WCM_ARCH=`uname -m` +echo "$as_me:$LINENO: checking for arch type" >&5 +echo $ECHO_N "checking for arch type... $ECHO_C" >&6 + +# Check whether --with-arch or --without-arch was given. +if test "${with_arch+set}" = set; then + withval="$with_arch" + WCM_ARCH=$withval + +else + + WCM_ARCH=`$CC -dumpmachine 2> /dev/null` + test $? = 0 || WCM_ARCH=`uname -m` + +fi; echo "$as_me:$LINENO: result: $WCM_ARCH" >&5 echo "${ECHO_T}$WCM_ARCH" >&6 + +# Check whether --enable-xserver64 or --disable-xserver64 was given. +if test "${enable_xserver64+set}" = set; then + enableval="$enable_xserver64" + WCM_OPTION_XSERVER64=$enableval + +else + + WCM_OPTION_XSERVER64=no + test `echo $WCM_ARCH | grep -c "64"` == 0 || WCM_OPTION_XSERVER64=yes + +fi; + WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib WCM_XLIBDIR_DEFAULT2=/usr/lib -WCM_OPTION_XSERVER64=no -IS64=`echo $WCM_ARCH | grep -c "64"` -if test $IS64 != 0; then +if test "$WCM_OPTION_XSERVER64" = "yes"; then + CFLAGS="$CFLAGS -D__amd64__" + WCM_XSERVER64="-D_XSERVER64" + test `echo $WCM_ARCH | grep -c "x86_64"` == 0 || + WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib64 - WCM_XLIBDIR_DEFAULT2=/usr/lib64 - WCM_OPTION_XSERVER64=yes + test -L /usr/lib64 || WCM_XLIBDIR_DEFAULT2=/usr/lib64 fi if test -f "$WCM_XLIBDIR_DEFAULT/Server/xf86Version.h"; then WCM_XORGSDK_DEFAULT=$WCM_XLIBDIR_DEFAULT/Server @@ -9672,15 +9699,15 @@ echo "$as_me:$LINENO: checking for X lib directory" >&5 echo $ECHO_N "checking for X lib directory... $ECHO_C" >&6 if test "$WCM_XLIBDIR" == "" || test "$WCM_XLIBDIR" == "yes"; then - if test -d $WCM_XLIBDIR_DEFAULT/X11 || - test -d $WCM_XLIBDIR_DEFAULT; then + if test -f $WCM_XLIBDIR_DEFAULT2/libX11.so; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 - elif test -a $WCM_XLIBDIR_DEFAULT2/libX11.so; then + elif test -d $WCM_XLIBDIR_DEFAULT/X11 || + test -d $WCM_XLIBDIR_DEFAULT; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 else @@ -10494,26 +10521,33 @@ fi fi -WCM_MODDIR=$WCM_XLIBDIR/modules/input + +# Check whether --with-xmoduledir or --without-xmoduledir was given. +if test "${with_xmoduledir+set}" = set; then + withval="$with_xmoduledir" + WCM_MODDIR=$withval + +else + + WCM_MODDIR= + if test -d $WCM_XLIBDIR/xorg/modules/input; then + WCM_MODDIR=$WCM_XLIBDIR/xorg/modules/input + elif test -d $WCM_XLIBDIR/modules/input; then + WCM_MODDIR=$WCM_XLIBDIR/modules/input + fi + +fi; + WCM_OPTION_DLLOADER=no -if test -f $WCM_XLIBDIR/modules/input/wacom_drv.so; then - WCM_OPTION_DLLOADER=yes -elif test -f $WCM_XLIBDIR/xorg/modules/input/mouse_drv.so; then - WCM_OPTION_DLLOADER=yes - WCM_MODDIR=$WCM_XLIBDIR/xorg/modules/input -fi # Check whether --enable-dlloader or --disable-dlloader was given. if test "${enable_dlloader+set}" = set; then enableval="$enable_dlloader" - + WCM_OPTION_DLLOADER=$enableval + else - enable_dlloader=$WCM_OPTION_DLLOADER + test -z "$WCM_MODDIR" || WCM_OPTION_DLLOADER=yes + fi; -if test "$enable_dlloader" = "yes"; then - WCM_OPTION_DLLOADER=yes -elif test "$enable_dlloader" = "no"; then - WCM_OPTION_DLLOADER=no -fi @@ -10553,41 +10587,6 @@ fi fi - -# Check whether --with-arch or --without-arch was given. -if test "${with_arch+set}" = set; then - withval="$with_arch" - - WCM_ARCH=$withval - -fi; - -# Check whether --enable-xserver64 or --disable-xserver64 was given. -if test "${enable_xserver64+set}" = set; then - enableval="$enable_xserver64" - -else - enable_xserver64=$WCM_OPTION_XSERVER64 -fi; -if test "$enable_xserver64" = "no"; then - WCM_OPTION_XSERVER64=no - elif test "$enable_xserver64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - WCM_OPTION_XSERVER64=yes - if test "$WCM_ARCH" = "x86_64"; then - WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - fi -else - if test "$WCM_OPTION_XSERVER64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - if test "$WCM_ARCH" = "x86_64"; then - WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - fi - fi -fi - # Check whether --enable-modver or --disable-modver was given. if test "${enable_modver+set}" = set; then enableval="$enable_modver" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/autom4te.cache/traces.0 new/linuxwacom-0.7.4-2/autom4te.cache/traces.0 --- old/linuxwacom-0.7.4-1/autom4te.cache/traces.0 2006-05-08 18:32:58.000000000 +0200 +++ new/linuxwacom-0.7.4-2/autom4te.cache/traces.0 2006-05-26 01:00:53.000000000 +0200 @@ -1,4 +1,4 @@ -m4trace:aclocal.m4:610: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) +m4trace:aclocal.m4:631: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) m4trace:configure.in:2: -1- AC_INIT([src/2.4/wacom.c]) m4trace:configure.in:2: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.in:2: -1- m4_pattern_forbid([_AC_]) @@ -128,10 +128,10 @@ m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_CHECK_TOOL_PREFIX' is obsolete. You should run autoupdate.], [autoconf/programs.m4:188: AC_CHECK_TOOL_PREFIX is expanded from... configure.in:8: AC_CHECK_TOOL_PREFIX is required by... -aclocal.m4:4402: AC_PATH_MAGIC is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4423: AC_PATH_MAGIC is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- AC_SUBST([RANLIB]) m4trace:configure.in:8: -1- AC_SUBST([ac_ct_RANLIB]) @@ -141,150 +141,150 @@ You should run autoupdate.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [instead of using `AC_LANG', `AC_LANG_SAVE', and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete. You should run autoupdate.], [autoconf/c.m4:71: AC_LANG_C is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. You should run autoupdate.], [autoconf/lang.m4:172: AC_LANG_RESTORE is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete. You should run autoupdate.], [autoconf/general.m4:376: AC_FD_CC is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:1649: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... +aclocal.m4:1670: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... configure.in:8: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is required by... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete. You should run autoupdate.], [autoconf/general.m4:376: AC_FD_CC is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:1649: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... +aclocal.m4:1670: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... configure.in:8: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is required by... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete. You should run autoupdate.], [autoconf/general.m4:376: AC_FD_CC is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:1649: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... +aclocal.m4:1670: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... configure.in:8: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is required by... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete. You should run autoupdate.], [autoconf/general.m4:376: AC_FD_CC is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:1649: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... +aclocal.m4:1670: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... configure.in:8: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is required by... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) -m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries], [aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries], [aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) -m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries], [aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries], [aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) -m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure], [aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure], [aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) -m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure], [aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure], [aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete. You should run autoupdate.], [autoconf/general.m4:376: AC_FD_CC is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) -m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe], [aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe], [aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) -m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe], [aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe], [aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen], [lt_cv_dlopen="dlopen"], @@ -342,6 +342,14 @@ #undef HAVE_UNISTD_H]) m4trace:configure.in:8: -1- AC_SUBST([LIBTOOL]) m4trace:configure.in:12: -1- AC_SUBST([WCM_LIBWACOMCFG_VER]) +m4trace:configure.in:31: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... +aclocal.m4:123: AC_WCM_CHECK_ENVIRON is expanded from... +configure.in:31: the top level]) +m4trace:configure.in:31: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... +aclocal.m4:123: AC_WCM_CHECK_ENVIRON is expanded from... +configure.in:31: the top level]) m4trace:configure.in:31: -1- AC_DEFINE_TRACE_LITERAL([WCM_ENABLE_LINUXINPUT]) m4trace:configure.in:31: -1- AH_OUTPUT([WCM_ENABLE_LINUXINPUT], [/* Enable the Linux Input subsystem */ #undef WCM_ENABLE_LINUXINPUT]) @@ -418,82 +426,79 @@ m4trace:configure.in:298: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... configure.in:298: the top level]) -m4trace:configure.in:322: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +m4trace:configure.in:314: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... +configure.in:314: the top level]) +m4trace:configure.in:328: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... -configure.in:322: the top level]) -m4trace:configure.in:330: -1- AM_CONDITIONAL([WCM_DLLOADER], [test "$WCM_OPTION_DLLOADER" == "yes"]) -m4trace:configure.in:330: -1- AC_SUBST([WCM_DLLOADER_TRUE]) -m4trace:configure.in:330: -1- AC_SUBST([WCM_DLLOADER_FALSE]) -m4trace:configure.in:335: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... -configure.in:335: the top level]) -m4trace:configure.in:358: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... -configure.in:358: the top level]) -m4trace:configure.in:365: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... -configure.in:365: the top level]) -m4trace:configure.in:389: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... -configure.in:389: the top level]) -m4trace:configure.in:414: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_DRVALUE]) -m4trace:configure.in:414: -1- AH_OUTPUT([WCM_PATCH_DRVALUE], [/* Need the dr.wValue patch */ +configure.in:328: the top level]) +m4trace:configure.in:334: -1- AM_CONDITIONAL([WCM_DLLOADER], [test "$WCM_OPTION_DLLOADER" == "yes"]) +m4trace:configure.in:334: -1- AC_SUBST([WCM_DLLOADER_TRUE]) +m4trace:configure.in:334: -1- AC_SUBST([WCM_DLLOADER_FALSE]) +m4trace:configure.in:339: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... +configure.in:339: the top level]) +m4trace:configure.in:362: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... +configure.in:362: the top level]) +m4trace:configure.in:387: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_DRVALUE]) +m4trace:configure.in:387: -1- AH_OUTPUT([WCM_PATCH_DRVALUE], [/* Need the dr.wValue patch */ #undef WCM_PATCH_DRVALUE]) -m4trace:configure.in:418: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_DRVALUE]) -m4trace:configure.in:418: -1- AH_OUTPUT([WCM_PATCH_DRVALUE], [/* Do not need the dr.wValue patch */ +m4trace:configure.in:391: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_DRVALUE]) +m4trace:configure.in:391: -1- AH_OUTPUT([WCM_PATCH_DRVALUE], [/* Do not need the dr.wValue patch */ #undef WCM_PATCH_DRVALUE]) -m4trace:configure.in:433: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_DRVALUE]) -m4trace:configure.in:433: -1- AH_OUTPUT([WCM_PATCH_DRVALUE], [/* Do not need the dr.wValue patch */ +m4trace:configure.in:406: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_DRVALUE]) +m4trace:configure.in:406: -1- AH_OUTPUT([WCM_PATCH_DRVALUE], [/* Do not need the dr.wValue patch */ #undef WCM_PATCH_DRVALUE]) -m4trace:configure.in:442: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_NOQUIRK]) -m4trace:configure.in:442: -1- AH_OUTPUT([WCM_PATCH_NOQUIRK], [/* Missing quirks */ +m4trace:configure.in:415: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_NOQUIRK]) +m4trace:configure.in:415: -1- AH_OUTPUT([WCM_PATCH_NOQUIRK], [/* Missing quirks */ #undef WCM_PATCH_NOQUIRK]) -m4trace:configure.in:445: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_NOQUIRK]) -m4trace:configure.in:445: -1- AH_OUTPUT([WCM_PATCH_NOQUIRK], [/* Missing quirks */ +m4trace:configure.in:418: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_NOQUIRK]) +m4trace:configure.in:418: -1- AH_OUTPUT([WCM_PATCH_NOQUIRK], [/* Missing quirks */ #undef WCM_PATCH_NOQUIRK]) -m4trace:configure.in:460: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_NOQUIRK]) -m4trace:configure.in:460: -1- AH_OUTPUT([WCM_PATCH_NOQUIRK], [/* Missing quirks */ +m4trace:configure.in:433: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_NOQUIRK]) +m4trace:configure.in:433: -1- AH_OUTPUT([WCM_PATCH_NOQUIRK], [/* Missing quirks */ #undef WCM_PATCH_NOQUIRK]) -m4trace:configure.in:467: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +m4trace:configure.in:440: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... -configure.in:467: the top level]) -m4trace:configure.in:480: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. +configure.in:440: the top level]) +m4trace:configure.in:453: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from... -configure.in:480: the top level]) -m4trace:configure.in:507: -1- AC_SUBST([WCM_PROGS]) -m4trace:configure.in:508: -1- AC_SUBST([WCM_LIBS]) -m4trace:configure.in:509: -1- AC_SUBST([WCM_TCLLIBS]) -m4trace:configure.in:510: -1- AC_SUBST([WCM_TCLPKGS]) -m4trace:configure.in:511: -1- AC_SUBST([WCM_MODULES]) -m4trace:configure.in:512: -1- AC_SUBST([WCM_XF86PROGS]) -m4trace:configure.in:513: -1- AC_SUBST([WCM_XF86MODULES]) -m4trace:configure.in:514: -1- AC_SUBST([WCM_EXPPROGS]) -m4trace:configure.in:515: -1- AC_SUBST([WCM_EXPMODULES]) -m4trace:configure.in:516: -1- AC_SUBST([WCM_ARCH]) -m4trace:configure.in:517: -1- AC_SUBST([WCM_KSTACK]) -m4trace:configure.in:518: -1- AC_SUBST([WCM_MODVER]) -m4trace:configure.in:519: -1- AC_SUBST([WCM_KERNELDIR]) -m4trace:configure.in:520: -1- AC_SUBST([WCM_KERNEL_VER]) -m4trace:configure.in:521: -1- AC_SUBST([WCM_LINUXWACOMDIR]) -m4trace:configure.in:522: -1- AC_SUBST([WCM_XF86DIR]) -m4trace:configure.in:523: -1- AC_SUBST([WCM_XORGSDK]) -m4trace:configure.in:524: -1- AC_SUBST([WCM_XLIBDIR]) -m4trace:configure.in:525: -1- AC_SUBST([WCM_MODDIR]) -m4trace:configure.in:526: -1- AC_SUBST([WCM_XSERVER64]) -m4trace:configure.in:528: -1- AC_SUBST([WCM_NO_MERGE_CONSTANTS]) -m4trace:configure.in:529: -1- AC_SUBST([WCM_LINUX_INPUT]) -m4trace:configure.in:530: -1- AC_SUBST([WCM_XIDUMP_LIBS]) -m4trace:configure.in:531: -1- AC_SUBST([WCM_LIBWACOMCFG_LIBS]) -m4trace:configure.in:532: -1- AC_SUBST([WCM_WACOMXI_LIBS]) -m4trace:configure.in:533: -1- AC_SUBST([WCM_XSETWACOM_LIBS]) -m4trace:configure.in:534: -1- AC_SUBST([WCM_DEPFLAGS]) -m4trace:configure.in:535: -1- AC_SUBST([WCM_OPTION_WACOM]) -m4trace:configure.in:536: -1- AC_SUBST([WCM_OPTION_HID]) -m4trace:configure.in:537: -1- AC_SUBST([WCM_OPTION_EVDEV]) -m4trace:configure.in:538: -1- AC_SUBST([WCM_OPTION_MOUSEDEV]) -m4trace:configure.in:539: -1- AC_SUBST([WCM_OPTION_USBMOUSE]) -m4trace:configure.in:540: -1- AC_SUBST([WCM_OPTION_INPUT]) -m4trace:configure.in:557: -1- AC_CONFIG_FILES([Makefile +configure.in:453: the top level]) +m4trace:configure.in:480: -1- AC_SUBST([WCM_PROGS]) +m4trace:configure.in:481: -1- AC_SUBST([WCM_LIBS]) +m4trace:configure.in:482: -1- AC_SUBST([WCM_TCLLIBS]) +m4trace:configure.in:483: -1- AC_SUBST([WCM_TCLPKGS]) +m4trace:configure.in:484: -1- AC_SUBST([WCM_MODULES]) +m4trace:configure.in:485: -1- AC_SUBST([WCM_XF86PROGS]) +m4trace:configure.in:486: -1- AC_SUBST([WCM_XF86MODULES]) +m4trace:configure.in:487: -1- AC_SUBST([WCM_EXPPROGS]) +m4trace:configure.in:488: -1- AC_SUBST([WCM_EXPMODULES]) +m4trace:configure.in:489: -1- AC_SUBST([WCM_ARCH]) +m4trace:configure.in:490: -1- AC_SUBST([WCM_KSTACK]) +m4trace:configure.in:491: -1- AC_SUBST([WCM_MODVER]) +m4trace:configure.in:492: -1- AC_SUBST([WCM_KERNELDIR]) +m4trace:configure.in:493: -1- AC_SUBST([WCM_KERNEL_VER]) +m4trace:configure.in:494: -1- AC_SUBST([WCM_LINUXWACOMDIR]) +m4trace:configure.in:495: -1- AC_SUBST([WCM_XF86DIR]) +m4trace:configure.in:496: -1- AC_SUBST([WCM_XORGSDK]) +m4trace:configure.in:497: -1- AC_SUBST([WCM_XLIBDIR]) +m4trace:configure.in:498: -1- AC_SUBST([WCM_MODDIR]) +m4trace:configure.in:499: -1- AC_SUBST([WCM_XSERVER64]) +m4trace:configure.in:501: -1- AC_SUBST([WCM_NO_MERGE_CONSTANTS]) +m4trace:configure.in:502: -1- AC_SUBST([WCM_LINUX_INPUT]) +m4trace:configure.in:503: -1- AC_SUBST([WCM_XIDUMP_LIBS]) +m4trace:configure.in:504: -1- AC_SUBST([WCM_LIBWACOMCFG_LIBS]) +m4trace:configure.in:505: -1- AC_SUBST([WCM_WACOMXI_LIBS]) +m4trace:configure.in:506: -1- AC_SUBST([WCM_XSETWACOM_LIBS]) +m4trace:configure.in:507: -1- AC_SUBST([WCM_DEPFLAGS]) +m4trace:configure.in:508: -1- AC_SUBST([WCM_OPTION_WACOM]) +m4trace:configure.in:509: -1- AC_SUBST([WCM_OPTION_HID]) +m4trace:configure.in:510: -1- AC_SUBST([WCM_OPTION_EVDEV]) +m4trace:configure.in:511: -1- AC_SUBST([WCM_OPTION_MOUSEDEV]) +m4trace:configure.in:512: -1- AC_SUBST([WCM_OPTION_USBMOUSE]) +m4trace:configure.in:513: -1- AC_SUBST([WCM_OPTION_INPUT]) +m4trace:configure.in:530: -1- AC_CONFIG_FILES([Makefile mkxincludes src/Makefile src/2.4/Makefile @@ -509,35 +514,35 @@ src/2.6.16/Makefile src/wacomxi/Makefile src/wacomxi/wacomcpl]) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. You should run autoupdate.], []) -m4trace:configure.in:557: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) -m4trace:configure.in:557: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +m4trace:configure.in:530: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) +m4trace:configure.in:530: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"AMDEP\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_ENV_XF86\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_ENV_XF86\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_ENV_XF86\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_ENV_XF86\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_ENV_XORGSDK\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_ENV_XORGSDK\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_ENV_XORGSDK\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_ENV_XORGSDK\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_ENV_NCURSES\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_ENV_NCURSES\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_ENV_NCURSES\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_ENV_NCURSES\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WACOMXI_INSTALL\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WACOMXI_INSTALL\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WACOMXI_INSTALL\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WACOMXI_INSTALL\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_DLLOADER\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_DLLOADER\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_DLLOADER\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_DLLOADER\" was never defined. Usually this means the macro was only invoked conditionally.], []) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/configure new/linuxwacom-0.7.4-2/configure --- old/linuxwacom-0.7.4-1/configure 2006-05-08 18:33:04.000000000 +0200 +++ new/linuxwacom-0.7.4-2/configure 2006-05-26 01:00:59.000000000 +0200 @@ -1020,6 +1020,7 @@ --enable-static=PKGS build static libraries default=yes --enable-fast-install=PKGS optimize for fast installation default=yes --disable-libtool-lock avoid locking (might break parallel builds) + --enable-xserver64 Use specified X server bit [default=usually] --enable-wacom Enable building wacom.o [default=no] --enable-wacdump Enable building wacdump [default=yes] --enable-xidump Enable building xidump [default=yes] @@ -1034,7 +1035,6 @@ --enable-tabletdev Enable building tabletdev.o [default=no] --enable-dlloader Use dlloader [default=usually] --enable-wacomdrv Enable building wacom_drv.{o,so} [default=yes] - --enable-xserver64 Use specified X server bit [default=usually] --enable-modver Enable kernel module versioning [default=usually] --enable-mkxincludes Enable mkxincludes, XF86 dependency builder [default=no] @@ -1044,6 +1044,7 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld default=no --with-pic try to use only PIC/non-PIC objects default=use both + --with-arch Use specified architecture --with-linux Override linux kernel check --with-kernel=dir Specify kernel source directory --with-x-src=dir Specify X driver build directory @@ -1052,7 +1053,8 @@ --with-xlib=dir uses a specified X11R6 directory --with-tcl=dir uses a specified tcl directory --with-tk=dir uses a specified tk directory - --with-arch Use specified architecture + --with-xmoduledir Specify wacom_drv path explicitly. Implies + --enable-dlloader Some influential environment variables: CC C compiler command @@ -4660,7 +4662,7 @@ case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4663 "configure"' > conftest.$ac_ext + echo '#line 4665 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5222,7 +5224,7 @@ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -7119,7 +7121,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 7122 "configure" +#line 7124 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -7217,7 +7219,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 7220 "configure" +#line 7222 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -7985,19 +7987,44 @@ WCM_ENV_TK=no WCM_XIDUMP_DEFAULT=yes WCM_ENV_XLIB=no -echo "$as_me:$LINENO: checking for processor type" >&5 -echo $ECHO_N "checking for processor type... $ECHO_C" >&6 -WCM_ARCH=`uname -m` +echo "$as_me:$LINENO: checking for arch type" >&5 +echo $ECHO_N "checking for arch type... $ECHO_C" >&6 + +# Check whether --with-arch or --without-arch was given. +if test "${with_arch+set}" = set; then + withval="$with_arch" + WCM_ARCH=$withval + +else + + WCM_ARCH=`$CC -dumpmachine 2> /dev/null` + test $? = 0 || WCM_ARCH=`uname -m` + +fi; echo "$as_me:$LINENO: result: $WCM_ARCH" >&5 echo "${ECHO_T}$WCM_ARCH" >&6 + +# Check whether --enable-xserver64 or --disable-xserver64 was given. +if test "${enable_xserver64+set}" = set; then + enableval="$enable_xserver64" + WCM_OPTION_XSERVER64=$enableval + +else + + WCM_OPTION_XSERVER64=no + test `echo $WCM_ARCH | grep -c "64"` == 0 || WCM_OPTION_XSERVER64=yes + +fi; + WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib WCM_XLIBDIR_DEFAULT2=/usr/lib -WCM_OPTION_XSERVER64=no -IS64=`echo $WCM_ARCH | grep -c "64"` -if test $IS64 != 0; then +if test "$WCM_OPTION_XSERVER64" = "yes"; then + CFLAGS="$CFLAGS -D__amd64__" + WCM_XSERVER64="-D_XSERVER64" + test `echo $WCM_ARCH | grep -c "x86_64"` == 0 || + WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib64 - WCM_XLIBDIR_DEFAULT2=/usr/lib64 - WCM_OPTION_XSERVER64=yes + test -L /usr/lib64 || WCM_XLIBDIR_DEFAULT2=/usr/lib64 fi if test -f "$WCM_XLIBDIR_DEFAULT/Server/xf86Version.h"; then WCM_XORGSDK_DEFAULT=$WCM_XLIBDIR_DEFAULT/Server @@ -9672,15 +9699,15 @@ echo "$as_me:$LINENO: checking for X lib directory" >&5 echo $ECHO_N "checking for X lib directory... $ECHO_C" >&6 if test "$WCM_XLIBDIR" == "" || test "$WCM_XLIBDIR" == "yes"; then - if test -d $WCM_XLIBDIR_DEFAULT/X11 || - test -d $WCM_XLIBDIR_DEFAULT; then + if test -f $WCM_XLIBDIR_DEFAULT2/libX11.so; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 - elif test -a $WCM_XLIBDIR_DEFAULT2/libX11.so; then + elif test -d $WCM_XLIBDIR_DEFAULT/X11 || + test -d $WCM_XLIBDIR_DEFAULT; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 else @@ -10494,26 +10521,33 @@ fi fi -WCM_MODDIR=$WCM_XLIBDIR/modules/input + +# Check whether --with-xmoduledir or --without-xmoduledir was given. +if test "${with_xmoduledir+set}" = set; then + withval="$with_xmoduledir" + WCM_MODDIR=$withval + +else + + WCM_MODDIR= + if test -d $WCM_XLIBDIR/xorg/modules/input; then + WCM_MODDIR=$WCM_XLIBDIR/xorg/modules/input + elif test -d $WCM_XLIBDIR/modules/input; then + WCM_MODDIR=$WCM_XLIBDIR/modules/input + fi + +fi; + WCM_OPTION_DLLOADER=no -if test -f $WCM_XLIBDIR/modules/input/wacom_drv.so; then - WCM_OPTION_DLLOADER=yes -elif test -f $WCM_XLIBDIR/xorg/modules/input/mouse_drv.so; then - WCM_OPTION_DLLOADER=yes - WCM_MODDIR=$WCM_XLIBDIR/xorg/modules/input -fi # Check whether --enable-dlloader or --disable-dlloader was given. if test "${enable_dlloader+set}" = set; then enableval="$enable_dlloader" + WCM_OPTION_DLLOADER=$enableval else - enable_dlloader=$WCM_OPTION_DLLOADER + test -z "$WCM_MODDIR" || WCM_OPTION_DLLOADER=yes + fi; -if test "$enable_dlloader" = "yes"; then - WCM_OPTION_DLLOADER=yes -elif test "$enable_dlloader" = "no"; then - WCM_OPTION_DLLOADER=no -fi @@ -10553,41 +10587,6 @@ fi fi - -# Check whether --with-arch or --without-arch was given. -if test "${with_arch+set}" = set; then - withval="$with_arch" - - WCM_ARCH=$withval - -fi; - -# Check whether --enable-xserver64 or --disable-xserver64 was given. -if test "${enable_xserver64+set}" = set; then - enableval="$enable_xserver64" - -else - enable_xserver64=$WCM_OPTION_XSERVER64 -fi; -if test "$enable_xserver64" = "no"; then - WCM_OPTION_XSERVER64=no - elif test "$enable_xserver64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - WCM_OPTION_XSERVER64=yes - if test "$WCM_ARCH" = "x86_64"; then - WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - fi -else - if test "$WCM_OPTION_XSERVER64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - if test "$WCM_ARCH" = "x86_64"; then - WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - fi - fi -fi - # Check whether --enable-modver or --disable-modver was given. if test "${enable_modver+set}" = set; then enableval="$enable_modver" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/configure.in new/linuxwacom-0.7.4-2/configure.in --- old/linuxwacom-0.7.4-1/configure.in 2006-05-05 19:25:01.000000000 +0200 +++ new/linuxwacom-0.7.4-2/configure.in 2006-05-26 00:41:58.000000000 +0200 @@ -310,22 +310,26 @@ fi dnl Check for dlloader -WCM_MODDIR=$WCM_XLIBDIR/modules/input +AC_ARG_WITH(xmoduledir, +AC_HELP_STRING([--with-xmoduledir], [Specify wacom_drv path explicitly. Implies --enable-dlloader]), +[ WCM_MODDIR=$withval +], +[ + WCM_MODDIR= + if test -d $WCM_XLIBDIR/xorg/modules/input; then + WCM_MODDIR=$WCM_XLIBDIR/xorg/modules/input + elif test -d $WCM_XLIBDIR/modules/input; then + WCM_MODDIR=$WCM_XLIBDIR/modules/input + fi +]) + WCM_OPTION_DLLOADER=no -if test -f $WCM_XLIBDIR/modules/input/wacom_drv.so; then - WCM_OPTION_DLLOADER=yes -elif test -f $WCM_XLIBDIR/xorg/modules/input/mouse_drv.so; then - WCM_OPTION_DLLOADER=yes - WCM_MODDIR=$WCM_XLIBDIR/xorg/modules/input -fi AC_ARG_ENABLE(dlloader, AC_HELP_STRING([--enable-dlloader], [Use dlloader [[default=usually]]]), - , enable_dlloader=$WCM_OPTION_DLLOADER) -if test "$enable_dlloader" = "yes"; then - WCM_OPTION_DLLOADER=yes -elif test "$enable_dlloader" = "no"; then - WCM_OPTION_DLLOADER=no -fi +[ WCM_OPTION_DLLOADER=$enableval +], +[ test -z "$WCM_MODDIR" || WCM_OPTION_DLLOADER=yes +]) AM_CONDITIONAL(WCM_DLLOADER, test "$WCM_OPTION_DLLOADER" == "yes") @@ -353,37 +357,6 @@ fi fi -dnl Check for arch -AC_ARG_WITH(arch, -AC_HELP_STRING([--with-arch], [Use specified architecture]), -[ - WCM_ARCH=$withval -]) - -dnl Check for X server bit -AC_ARG_ENABLE(xserver64, -AC_HELP_STRING([--enable-xserver64], [Use specified X server bit [[default=usually]]]), - , enable_xserver64=$WCM_OPTION_XSERVER64) -if test "$enable_xserver64" = "no"; then - WCM_OPTION_XSERVER64=no - elif test "$enable_xserver64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - WCM_OPTION_XSERVER64=yes - if test "$WCM_ARCH" = "x86_64"; then - WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - fi -else - dnl not explicitly set, go with default - if test "$WCM_OPTION_XSERVER64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - if test "$WCM_ARCH" = "x86_64"; then - WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - fi - fi -fi - dnl Check for modver AC_ARG_ENABLE(modver, AC_HELP_STRING([--enable-modver], [Enable kernel module versioning [[default=usually]]]), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6/wacom.c new/linuxwacom-0.7.4-2/src/2.6/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6/wacom.c 2006-05-05 19:25:02.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -968,7 +968,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6.10/wacom.c new/linuxwacom-0.7.4-2/src/2.6.10/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6.10/wacom.c 2006-05-05 19:25:02.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6.10/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -970,7 +970,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6.11/wacom.c new/linuxwacom-0.7.4-2/src/2.6.11/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6.11/wacom.c 2006-05-05 19:25:02.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6.11/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -973,7 +973,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6.13/wacom.c new/linuxwacom-0.7.4-2/src/2.6.13/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6.13/wacom.c 2006-05-05 19:25:02.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6.13/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -946,7 +946,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6.14/wacom.c new/linuxwacom-0.7.4-2/src/2.6.14/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6.14/wacom.c 2006-05-05 19:25:03.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6.14/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -943,7 +943,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6.8/wacom.c new/linuxwacom-0.7.4-2/src/2.6.8/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6.8/wacom.c 2006-05-05 19:25:06.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6.8/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -971,7 +971,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6.9/wacom.c new/linuxwacom-0.7.4-2/src/2.6.9/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6.9/wacom.c 2006-05-05 19:25:06.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6.9/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -971,7 +971,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit utempter
by root＠suse.de 28 May '06

28 May '06

Hello community, here is the log from the commit of package utempter checked in at Mon May 29 01:22:10 CEST 2006. -------- --- utempter/utempter.changes 2006-01-25 21:31:03.000000000 +0100 +++ utempter/utempter.changes 2006-05-27 22:15:33.000000000 +0200 @@ -1,0 +2,5 @@ +Sat May 27 22:15:27 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ utempter.spec ++++++ --- /var/tmp/diff_new_pack.paPrUj/_old 2006-05-29 01:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.paPrUj/_new 2006-05-29 01:21:30.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package utempter (Version 0.5.5) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,7 +13,7 @@ Name: utempter %define utmpGroup tty Version: 0.5.5 -Release: 4 +Release: 16 Summary: A privileged helper for utmp and wtmp updates License: X11/MIT Group: Productivity/Security @@ -43,9 +43,7 @@ %install export DESTDIR=$RPM_BUILD_ROOT -[ -z "$DESTDIR" ] || rm -rf $DESTDIR make PREFIX=$DESTDIR LIBDIR=%_libdir install -strip $DESTDIR/usr/sbin/utempter chmod 755 $DESTDIR%{_libdir}/libutempter.so* /sbin/ldconfig -n $DESTDIR%{_libdir} @@ -65,6 +63,8 @@ %attr(444,root,root) %doc /usr/share/man/man8/* %changelog -n utempter +* Sat May 27 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Jun 20 2005 - kukuk(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit sgmltool
by root＠suse.de 28 May '06

28 May '06

Hello community, here is the log from the commit of package sgmltool checked in at Mon May 29 01:22:05 CEST 2006. -------- --- sgmltool/sgmltool.changes 2006-01-25 21:30:58.000000000 +0100 +++ sgmltool/sgmltool.changes 2006-05-27 23:08:57.000000000 +0200 @@ -1,0 +2,5 @@ +Sat May 27 23:08:52 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- sgml-tools-1.0.9-strip.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sgmltool-1.0.9.spec ++++++ --- /var/tmp/diff_new_pack.9qWJ5V/_old 2006-05-29 01:21:24.000000000 +0200 +++ /var/tmp/diff_new_pack.9qWJ5V/_new 2006-05-29 01:21:24.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package sgmltool (Version 1.0.9) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -21,7 +21,7 @@ Autoreqprov: on Summary: SGML-Tools - a Text-Formatting Package Version: 1.0.9 -Release: 915 +Release: 926 Source: ftp://ftp.nllgg.nl/pub2/SGMLtools/v1.0/sgml-tools-%{version}.tar.gz Source1: lnd-1.0.tar.bz2 Patch: sgml-tools-1.0.9.dif @@ -32,6 +32,7 @@ Patch5: sgml-tools-retval.diff Patch6: cflags-sgml-tools-1.0.9.diff Patch7: sgml-tools-1.0.9-sgmlpre.diff +Patch8: sgml-tools-1.0.9-strip.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -76,13 +77,12 @@ Tommy Marcus McGuire <mcguire(a)cs.utexas.edu> Ulrich Windl <ulrich.windl(a)rz.uni-regensburg.de> -%define INSTALL install -m755 -s +%define INSTALL install -m755 %define INSTALL_DIR install -d -m755 %define INSTALL_DATA install -m644 %define GZIP gzip --best --force %prep -%setup -q -n %{name}-%{version} -%setup -q -D -T -n %{name}-%{version} -a1 +%setup -q -n %{name}-%{version} -a1 %patch %patch1 -p 1 %patch2 -p 1 @@ -91,13 +91,14 @@ %patch5 %patch6 -p 1 %patch7 -p 1 +%patch8 %build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ ./configure --prefix=$RPM_BUILD_ROOT/usr \ --mandir=%{_mandir} \ --with-installed-nsgmls -make "CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing" LDFLAGS=-s +make "CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing" make install DESTDIR=$RPM_BUILD_ROOT prefix=/usr \ mandir=%{_mandir} (cd doc; PATH=$PATH:$RPM_BUILD_ROOT/%_bindir sh Makedoc.sh) @@ -111,7 +112,6 @@ make "CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing" %install -rm -fr $RPM_BUILD_ROOT : > doc/Makedoc.sh make install DESTDIR=$RPM_BUILD_ROOT prefix=/usr \ mandir=%{_mandir} @@ -158,6 +158,8 @@ %{_mandir}/man1/sgmltools.1.gz %changelog -n sgmltool +* Sat May 27 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Oct 10 2005 - ke(a)suse.de ++++++ sgml-tools-1.0.9-strip.diff ++++++ --- Makefile.in +++ Makefile.in @@ -74,7 +74,6 @@ ( cd iso-entities; \ $(MAKE) install ) endif - strip sgmlpre/sgmlpre for ii in sgmlpre/sgmlpre rtf-fix/rtf2rtf; do \ bn=`basename $$ii`; \ $(INSTALL_PROGRAM) $$ii $(DESTDIR)$(bindir)/$$bn; \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit safte-monitor
by root＠suse.de 28 May '06

28 May '06

Hello community, here is the log from the commit of package safte-monitor checked in at Mon May 29 01:21:24 CEST 2006. -------- --- safte-monitor/safte-monitor.changes 2006-01-25 21:41:18.000000000 +0100 +++ safte-monitor/safte-monitor.changes 2006-05-27 19:27:01.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 27 19:21:08 CEST 2006 - schwab(a)suse.de + +- Use RPM_OPT_FLAGS. +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ safte-monitor.spec ++++++ --- /var/tmp/diff_new_pack.p6gqsi/_old 2006-05-29 01:20:28.000000000 +0200 +++ /var/tmp/diff_new_pack.p6gqsi/_new 2006-05-29 01:20:28.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package safte-monitor (Version 0.0.5) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -14,7 +14,7 @@ Obsoletes: saftemon Summary: Linux SAF-TE SCSI enclosure monitor Version: 0.0.5 -Release: 235 +Release: 247 URL: http://oss.metaparadigm.com/safte-monitor/ Source0: %{name}-%{version}.tar.gz Patch0: %{name}-%{version}.diff @@ -32,7 +32,7 @@ these days. saftemon can monitor multiple SAF-TE devices and will automatically detect them. -The information retreived includes power supply, temperature, audible +The information retrieved includes power supply, temperature, audible alarm, drive faults, array critical/failed/rebuilding state and door lock status. saftemon logs changes in the status of these enclosure elements to syslog and can optionally execute an alert help program @@ -58,7 +58,6 @@ make CC=gcc %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install install -d $RPM_BUILD_ROOT/etc/init.d install redhat/init.d/safte-monitor $RPM_BUILD_ROOT/etc/init.d/safte-monitor @@ -95,6 +94,9 @@ /var/log/safte-monitor %changelog -n safte-monitor +* Sat May 27 2006 - schwab(a)suse.de +- Use RPM_OPT_FLAGS. +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Jun 17 2005 - meissner(a)suse.de ++++++ safte-monitor-0.0.5.diff ++++++ --- /var/tmp/diff_new_pack.p6gqsi/_old 2006-05-29 01:20:28.000000000 +0200 +++ /var/tmp/diff_new_pack.p6gqsi/_new 2006-05-29 01:20:28.000000000 +0200 @@ -9,8 +9,11 @@ top_builddir = . -@@ -54,7 +54,7 @@ +@@ -52,9 +52,10 @@ + + # C Flags ++CFLAGS = @CFLAGS@ CFLAGS += -DUSE_CELCIUS CFLAGS += -DHAVE_CRYPT_H -CFLAGS += -g -I$(LINUX_INCLUDES) -Isrc -I$(MATHOPD_DIR) \ @@ -18,7 +21,7 @@ -DMATHOPD_CONF="\"$(sysconfdir)/$(SAFTEMON_CONF)\"" -@@ -112,11 +112,11 @@ +@@ -112,11 +113,11 @@ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) \ $(DESTDIR)$(sysconfdir) \ $(DESTDIR)$(pkglibdir)/www \ @@ -26,9 +29,8 @@ + $(DESTDIR)$(pkgsysconfdir) \ $(DESTDIR)$(localstatedir)/log/safte-monitor \ $(DESTDIR)$(localstatedir)/run/safte-monitor -- $(INSTALL_PROGRAM) $(BIN_FILES) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) $(BIN_FILES) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) $(LIBEXEC_FILES) $(DESTDIR)$(pkglibexecdir) -+ $(INSTALL_PROGRAM) -s $(BIN_FILES) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) $(LIBEXEC_FILES) $(DESTDIR)$(pkgsysconfdir) $(INSTALL_DATA) $(CONF_FILES) $(DESTDIR)$(sysconfdir) $(INSTALL_DATA) $(WWW_FILES) $(DESTDIR)$(pkglibdir)/www @@ -155,8 +157,8 @@ +# sets the alert script name +# +SAFTEMONITOR_OPTIONS="-A /etc/safte-monitor/alert" ---- safte-monitor-0.0.5/src/qlogic_api.c.xx 2005-06-17 14:49:59.000000000 +0200 -+++ safte-monitor-0.0.5/src/qlogic_api.c 2005-06-17 14:50:03.000000000 +0200 +--- safte-monitor-0.0.5/src/qlogic_api.c ++++ safte-monitor-0.0.5/src/qlogic_api.c @@ -1,5 +1,6 @@ #include <stdio.h> #include <stdlib.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit scummvm
by root＠suse.de 28 May '06

28 May '06

Hello community, here is the log from the commit of package scummvm checked in at Mon May 29 01:21:18 CEST 2006. -------- --- scummvm/scummvm.changes 2006-02-06 17:39:54.000000000 +0100 +++ scummvm/scummvm.changes 2006-05-28 12:23:21.000000000 +0200 @@ -1,0 +2,7 @@ +Sun May 28 12:20:44 CEST 2006 - sndirsch(a)suse.de + +- updated to current CVS (2006-05-28) + * adds eperimental support for lure, cine, agi *and* gob2 (at + least the intro works now including sound) + +------------------------------------------------------------------- Old: ---- scummvm-0.8.2.tar.bz2 scummvm-tools-060129.diff scummvm-tools-060129.tar.bz2 New: ---- scummvm-060528.tar.bz2 scummvm-tools-060528.diff scummvm-tools-060528.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scummvm.spec ++++++ --- /var/tmp/diff_new_pack.K4deA6/_old 2006-05-29 01:20:37.000000000 +0200 +++ /var/tmp/diff_new_pack.K4deA6/_new 2006-05-29 01:20:37.000000000 +0200 @@ -1,29 +1,29 @@ # -# spec file for package scummvm (Version 0.8.2) +# spec file for package scummvm (Version 060528) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: scummvm -BuildRequires: SDL-devel flac-devel fluidsynth-devel gcc-c++ libvorbis libvorbis-devel readline-devel +BuildRequires: SDL-devel flac-devel fluidsynth-devel gcc-c++ libpng-devel libsndfile-devel libvorbis libvorbis-devel readline-devel URL: http://scummvm.sourceforge.net/ License: GPL Group: Amusements/Games/Other Autoreqprov: on -Version: 0.8.2 +Version: 060528 Release: 1 Summary: Interpreter for LucasArts games Source: %name-%version.tar.bz2 -Source1: %name-tools-060129.tar.bz2 +Source1: %name-tools-060528.tar.bz2 Source2: README.SUSE Patch: %name-cflags.diff -Patch1: %name-tools-060129.diff +Patch1: %name-tools-060528.diff Patch3: gob2.diff Patch4: %name.diff Patch5: %name-strip.diff @@ -60,17 +60,17 @@ Vincent Hamm %prep -%setup -n %name-%version -b1 +%setup -n %name/trunk -b1 %patch -pushd ../tools +pushd ../../tools/trunk %patch1 popd -#%patch3 +%patch3 %patch4 %patch5 %build -pushd ../tools +pushd ../../tools/trunk %ifarch ppc ppc64 s390 s390x export CFLAGS="$RPM_OPT_FLAGS -DSCUMM_BIG_ENDIAN" %else @@ -84,13 +84,15 @@ ./configure --prefix=/usr \ --bindir=/usr/games \ --mandir=%_mandir \ - --enable-kyra + --enable-lure \ + --enable-cine \ + --enable-agi make %install -pushd ../tools +pushd ../../tools/trunk make install DESTDIR=$RPM_BUILD_ROOT - cp README $RPM_BUILD_DIR/%name-%version/README-tools + cp README $RPM_BUILD_DIR/%name/trunk/README-tools popd make install DESTDIR=$RPM_BUILD_ROOT cp $RPM_SOURCE_DIR/README.SUSE . @@ -103,6 +105,10 @@ /usr/share/pixmaps/scummvm.xpm %changelog -n scummvm +* Sun May 28 2006 - sndirsch(a)suse.de +- updated to current CVS (2006-05-28) + * adds eperimental support for lure, cine, agi *and* gob2 (at + least the intro works now including sound) * Mon Feb 06 2006 - sndirsch(a)suse.de - added libvorbis/libvorbis-devel to BuildRequires to enable Ogg/Vorbis support again; has been disabled by switching from ++++++ gob2.diff ++++++ --- /var/tmp/diff_new_pack.K4deA6/_old 2006-05-29 01:20:37.000000000 +0200 +++ /var/tmp/diff_new_pack.K4deA6/_new 2006-05-29 01:20:37.000000000 +0200 @@ -1,15 +1,10 @@ ---- gob/gob.cpp.orig 2005-06-12 18:06:11.568810258 +0200 -+++ gob/gob.cpp 2005-06-12 18:08:00.467794870 +0200 -@@ -68,10 +68,11 @@ - - {"gob1", "Gobliiins (Interactive Demo)", GF_GOB1, "4f5bf4b9e4c39ebb93579747fc678e97"}, - --#if 0 -+#if 1 - {"gob2", "Gobliins 2 (DOS)", GF_GOB2, "abb5f762f9979d4253002de20f6e7b56"}, - {"gob2", "Gobliins 2 (DOS)", GF_GOB2, "9b6de65d811c08eebf50391b84fcba92"}, - {"gob2", "Gobliins 2 (DOS)", GF_GOB2, "54d59c200e3823ad0af11a605a6fd06a"}, -+ {"gob2", "Gobliins 2 (DOS)", GF_GOB2, "a13892cdf4badda85a6f6fb47603a128"}, - {"gob2", "Gobliins 2 (DOS Ru)", GF_GOB2, "b6d47494bf88398ae59c1b5656cafce4"}, +--- engines/gob/gob.cpp.orig 2006-05-28 12:14:28.130789234 +0200 ++++ engines/gob/gob.cpp 2006-05-28 12:15:44.505443980 +0200 +@@ -88,6 +88,7 @@ + {"gob2", "Gobliins 2 (DOS)", GF_GOB2, Common::FR_FRA, "abb5f762f9979d4253002de20f6e7b56"}, + {"gob2", "Gobliins 2 (DOS)", GF_GOB2, Common::EN_GRB, "9b6de65d811c08eebf50391b84fcba92"}, + {"gob2", "Gobliins 2 (DOS)", GF_GOB2, Common::EN_USA, "54d59c200e3823ad0af11a605a6fd06a"}, ++ {"gob2", "Gobliins 2 (DOS)", GF_GOB2, Common::DE_DEU, "a13892cdf4badda85a6f6fb47603a128"}, + {"gob2", "Gobliins 2 (DOS Ru)", GF_GOB2, Common::RU_RUS, "b6d47494bf88398ae59c1b5656cafce4"}, // CD 1.000. - {"gob2", "Gobliins 2 (CD)", GF_GOB2, "02bf538fd8003b8da23a3546299c3df4"}, + {"gob2", "Gobliins 2 (CD)", GF_GOB2, Common::EN_USA, "02bf538fd8003b8da23a3546299c3df4"}, ++++++ scummvm-0.8.2.tar.bz2 -> scummvm-060528.tar.bz2 ++++++ ++++ 1574433 lines of diff (skipped) ++++++ scummvm-cflags.diff ++++++ --- /var/tmp/diff_new_pack.K4deA6/_old 2006-05-29 01:20:56.000000000 +0200 +++ /var/tmp/diff_new_pack.K4deA6/_new 2006-05-29 01:20:56.000000000 +0200 @@ -1,13 +1,13 @@ ---- Makefile.orig 2004-02-25 11:00:07.000000000 +0100 -+++ Makefile 2004-03-16 09:05:42.386201259 +0100 -@@ -39,6 +39,7 @@ +--- Makefile.orig 2006-05-28 12:27:43.041858713 +0200 ++++ Makefile 2006-05-28 12:28:26.485265934 +0200 +@@ -25,6 +25,7 @@ CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wconversion CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor - CXXFLAGS+= -Wno-reorder -Wwrite-strings -fcheck-new + CXXFLAGS+= -Wno-reorder -Wwrite-strings +CXXFLAGS+= $(RPM_OPT_FLAGS) -fno-strict-aliasing - ####################################################################### - # Misc stuff - you should never have to edit this # + # Disable RTTI and exceptions, and enabled checking of pointers returned by "new" + CXXFLAGS+= -fno-rtti -fno-exceptions -fcheck-new --- tools/module.mk.orig 2005-07-04 10:24:38.268173325 +0200 +++ tools/module.mk 2005-07-04 10:25:29.249315179 +0200 @@ -27,11 +27,11 @@ ++++++ scummvm-tools-060129.diff -> scummvm-tools-060528.diff ++++++ --- scummvm/scummvm-tools-060129.diff 2006-02-06 17:39:54.000000000 +0100 +++ scummvm/scummvm-tools-060528.diff 2006-05-28 12:37:08.000000000 +0200 @@ -24,6 +24,6 @@ + mkdir -p $(DESTDIR)/usr/games + install -m 755 $(TARGETS) $(DESTDIR)/usr/games + - compress_san$(EXEEXT): compress_san.o compress.o util.o + compress_scumm_san$(EXEEXT): compress_scumm_san.o compress.o util.o $(CXX) $(LDFLAGS) -o $@ $+ -lz ++++++ scummvm-tools-060129.tar.bz2 -> scummvm-tools-060528.tar.bz2 ++++++ ++++ 42137 lines of diff (skipped) ++++++ scummvm.diff ++++++ --- /var/tmp/diff_new_pack.K4deA6/_old 2006-05-29 01:20:57.000000000 +0200 +++ /var/tmp/diff_new_pack.K4deA6/_new 2006-05-29 01:20:57.000000000 +0200 @@ -1,9 +1,9 @@ ---- Makefile.old 2005-07-04 11:07:59.048459780 +0200 -+++ Makefile 2005-07-04 11:13:42.047835627 +0200 -@@ -51,8 +51,6 @@ - $(INSTALL) -c -m 644 "$(srcdir)/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6" +--- Makefile.orig 2006-05-28 12:38:39.425129609 +0200 ++++ Makefile 2006-05-28 12:40:17.999899011 +0200 +@@ -50,8 +50,6 @@ + $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6" $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/" - $(INSTALL) -c -m 644 "$(srcdir)/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm" + $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm" - $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/doc/scummvm/" - $(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit qt3
by root＠suse.de 28 May '06

28 May '06

Hello community, here is the log from the commit of package qt3 checked in at Mon May 29 01:20:25 CEST 2006. -------- --- KDE/qt3/qt3-devel-doc.changes 2006-05-26 16:13:31.000000000 +0200 +++ qt3/qt3-devel-doc.changes 2006-05-29 01:19:43.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 26 19:40:44 CEST 2006 - dmueller(a)suse.de + +- fix build + +------------------------------------------------------------------- qt3-extensions.changes: same change qt3-static.changes: same change qt3.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.e6iAzD/_old 2006-05-29 01:19:59.000000000 +0200 +++ /var/tmp/diff_new_pack.e6iAzD/_new 2006-05-29 01:19:59.000000000 +0200 @@ -18,7 +18,7 @@ Summary: Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.6 -Release: 1 +Release: 2 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -233,6 +233,8 @@ %changelog -n qt3-devel-doc * Fri May 26 2006 - dmueller(a)suse.de +- fix build +* Fri May 26 2006 - dmueller(a)suse.de - 3.3.6 update * numerous bugfixes and translations * Wed May 10 2006 - dmueller(a)suse.de ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.e6iAzD/_old 2006-05-29 01:19:59.000000000 +0200 +++ /var/tmp/diff_new_pack.e6iAzD/_new 2006-05-29 01:19:59.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: cups-devel krb5-devel libdrm-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files License: GPL, QPL Version: 3.3.6 -Release: 1 +Release: 2 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -473,6 +473,8 @@ %changelog -n qt3-extensions * Fri May 26 2006 - dmueller(a)suse.de +- fix build +* Fri May 26 2006 - dmueller(a)suse.de - 3.3.6 update * numerous bugfixes and translations * Wed May 10 2006 - dmueller(a)suse.de ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.e6iAzD/_old 2006-05-29 01:19:59.000000000 +0200 +++ /var/tmp/diff_new_pack.e6iAzD/_new 2006-05-29 01:19:59.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: static program library for developing applications with graphical user interfaces Version: 3.3.6 -Release: 1 +Release: 2 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -242,6 +242,8 @@ %changelog -n qt3-static * Fri May 26 2006 - dmueller(a)suse.de +- fix build +* Fri May 26 2006 - dmueller(a)suse.de - 3.3.6 update * numerous bugfixes and translations * Wed May 10 2006 - dmueller(a)suse.de ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.e6iAzD/_old 2006-05-29 01:19:59.000000000 +0200 +++ /var/tmp/diff_new_pack.e6iAzD/_new 2006-05-29 01:19:59.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.6 -Release: 1 +Release: 2 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -340,6 +340,7 @@ %lang(it) /usr/lib/qt3/translations/qt_it.qm %lang(ja) /usr/lib/qt3/translations/qt_ja.qm %lang(nb) /usr/lib/qt3/translations/qt_nb.qm +%lang(pl) /usr/lib/qt3/translations/qt_pl.qm %lang(pt) /usr/lib/qt3/translations/qt_pt-br.qm %lang(pt) /usr/lib/qt3/translations/qt_pt.qm %lang(zh) /usr/lib/qt3/translations/qt_zh-cn.qm @@ -367,6 +368,8 @@ %changelog -n qt3 * Fri May 26 2006 - dmueller(a)suse.de +- fix build +* Fri May 26 2006 - dmueller(a)suse.de - 3.3.6 update * numerous bugfixes and translations * Wed May 10 2006 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0