OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=19

x86emu.diff

@@ -0,0 +1,20 @@
+--- hw/xfree86/x86emu/prim_ops.c
++++ hw/xfree86/x86emu/prim_ops.c
+@@ -2082,7 +2082,7 @@
+ void imul_long_direct(u32 *res_lo, u32* res_hi,u32 d, u32 s)
+ {
+ #ifdef	__HAS_LONG_LONG__
+-	s64 res = (s32)d * (s32)s;
++	s64 res = (s64)(s32)d * (s32)s;
+ 
+ 	*res_lo = (u32)res;
+ 	*res_hi = (u32)(res >> 32);
+@@ -2174,7 +2174,7 @@
+ void mul_long(u32 s)
+ {
+ #ifdef	__HAS_LONG_LONG__
+-	u64 res = (u32)M.x86.R_EAX * (u32)s;
++	u64 res = (u64)M.x86.R_EAX * s;
+ 
+ 	M.x86.R_EAX = (u32)res;
+ 	M.x86.R_EDX = (u32)(res >> 32);

xorg-x11-server.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 15 13:29:53 CET 2007 - schwab@suse.de
+
+- Remove bug197190-ia64.diff, fix x86emu instead.
+
 -------------------------------------------------------------------
 Wed Mar 14 22:09:12 CET 2007 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 URL:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.2
-Release:        60
+Release:        61
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -82,7 +82,7 @@ Patch42:        bug227111-ddc_screensize.diff
 Patch43:        bug-211314_mesa-context.diff
 Patch44:        bug-211314_p_drawable_privclean.diff
 Patch45:        bug-197858_dpms.diff
-Patch46:        bug197190-ia64.diff
+Patch46:        x86emu.diff
 Patch334:       p_pci-domain.diff
 Patch357:       p_pci-ce-x.diff
 
@@ -509,6 +509,8 @@ exit 0
 %endif
 
 %changelog
+* Thu Mar 15 2007 - schwab@suse.de
+- Remove bug197190-ia64.diff, fix x86emu instead.
 * Wed Mar 14 2007 - sndirsch@suse.de
 - xserver 1.2.99.902 release:
   * Xprint: shorten font filename to fit in tar length limit