Hello community, here is the log from the commit of package x11-input-wacom checked in at Wed Oct 3 01:16:42 CEST 2007. -------- --- x11-input-wacom/x11-input-wacom.changes 2007-08-16 04:19:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2007-09-30 14:22:01.041443000 +0200 @@ -1,0 +2,6 @@ +Sun Sep 30 14:24:59 CEST 2007 - sndirsch@suse.de + +- linuxwacom-0.7.8-3.diff + * fixes build with xorg-server 1.4 + +------------------------------------------------------------------- New: ---- linuxwacom-0.7.8-3.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.NwV804/_old 2007-10-03 01:16:38.000000000 +0200 +++ /var/tmp/diff_new_pack.NwV804/_new 2007-10-03 01:16:38.000000000 +0200 @@ -16,13 +16,14 @@ BuildRequires: xorg-x11-server-sdk %endif License: GPL v2 or later -URL: http://linuxwacom.sourceforge.net/ +Url: http://linuxwacom.sourceforge.net/ Group: System/X11/Utilities Version: 0.7.8 -Release: 20 +Release: 38 Summary: X11 input module for wacom tablet Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o Source: linuxwacom-%{version}-3.tar.bz2 +Patch: linuxwacom-0.7.8-3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,7 +41,7 @@ Requires: %{name} = %{version}-%{release} Provides: linuxwacom Obsoletes: linuxwacom -Autoreqprov: on +AutoReqProv: on %description tools This package contains tools for configuration, diagnostic and libraries @@ -58,7 +59,7 @@ Requires: %{name}-tools = %{version}-%{release} Provides: linuxwacom-devel Obsoletes: linuxwacom-devel -Autoreqprov: on +AutoReqProv: on %description devel This package contains all necessary include files and libraries needed @@ -72,6 +73,7 @@ %prep %setup -n linuxwacom-%{version}-3 +%patch %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -144,8 +146,10 @@ /usr/%_lib/libwacomcfg.a /usr/%_lib/libwacomcfg.la /usr/%_lib/libwacomcfg.so - %changelog +* Sun Sep 30 2007 - sndirsch@suse.de +- linuxwacom-0.7.8-3.diff + * fixes build with xorg-server 1.4 * Thu Aug 16 2007 - sndirsch@suse.de - updated to new release 0.7.8-3 * Fixed a wacom.c bug for 2.4 and older 2.6's ++++++ linuxwacom-0.7.8-3.diff ++++++ diff -u -p -r ../linuxwacom-0.7.8-3.old/src/xdrv/wcmCommon.c ./src/xdrv/wcmCommon.c --- ../linuxwacom-0.7.8-3.old/src/xdrv/wcmCommon.c 2007-09-30 11:45:28.000000000 +0000 +++ ./src/xdrv/wcmCommon.c 2007-09-30 12:13:57.000000000 +0000 @@ -1077,7 +1077,7 @@ static void resetSampleCounter(const Wac * Handles suppression, transformation, filtering, and event dispatch. ****************************************************************************/ -void xf86WcmEvent(WacomCommonPtr common, unsigned int channel, +void xf86WcmEvent(LocalDevicePtr local, WacomCommonPtr common, unsigned int channel, const WacomDeviceState* pState) { WacomDeviceState* pLast; @@ -1096,7 +1096,7 @@ void xf86WcmEvent(WacomCommonPtr common, #if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 if (!miPointerCurrentScreen()) #else - if (!miPointerGetScreen(pDev->dev)) + if (!miPointerGetScreen(local->dev)) #endif { DBG(1, common->debugLevel, ErrorF("xf86WcmEvent: " diff -u -p -r ../linuxwacom-0.7.8-3.old/src/xdrv/wcmISDV4.c ./src/xdrv/wcmISDV4.c --- ../linuxwacom-0.7.8-3.old/src/xdrv/wcmISDV4.c 2007-09-30 11:45:28.000000000 +0000 +++ ./src/xdrv/wcmISDV4.c 2007-09-30 12:17:53.000000000 +0000 @@ -293,7 +293,7 @@ static int isdv4Parse(LocalDevicePtr loc { /* send a prox-out for old device */ WacomDeviceState out = { 0 }; - xf86WcmEvent(common, 0, &out); + xf86WcmEvent(local,common, 0, &out); ds->device_type = cur_type; } } @@ -314,7 +314,7 @@ static int isdv4Parse(LocalDevicePtr loc ds->device_type == ERASER_ID ? "ERASER " : ds->device_type == STYLUS_ID ? "STYLUS" : "NONE")); } - xf86WcmEvent(common,0,ds); + xf86WcmEvent(local,common,0,ds); return common->wcmPktLength; } diff -u -p -r ../linuxwacom-0.7.8-3.old/src/xdrv/wcmSerial.c ./src/xdrv/wcmSerial.c --- ../linuxwacom-0.7.8-3.old/src/xdrv/wcmSerial.c 2007-09-30 11:45:28.000000000 +0000 +++ ./src/xdrv/wcmSerial.c 2007-09-30 12:16:31.000000000 +0000 @@ -616,7 +616,7 @@ static int serialParseGraphire(LocalDevi ds->relwheel = -ds->relwheel; } - xf86WcmEvent(common,0,ds); + xf86WcmEvent(local, common,0,ds); return common->wcmPktLength; } @@ -658,7 +658,7 @@ static int serialParseCintiq(LocalDevice /* requires button info, so it goes down here. */ serialParseP4Common(local, data, last, ds); - xf86WcmEvent(common,0,ds); + xf86WcmEvent(local, common,0,ds); return common->wcmPktLength; } @@ -694,7 +694,7 @@ static int serialParseProtocol4(LocalDev /* requires button info, so it goes down here. */ serialParseP4Common(local, data, last, ds); - xf86WcmEvent(common,0,ds); + xf86WcmEvent(local,common,0,ds); return common->wcmPktLength; } @@ -862,7 +862,7 @@ static int serialParseProtocol5(LocalDev /* if new data is available, send it */ if (have_data) { - xf86WcmEvent(common,channel,ds); + xf86WcmEvent(local,common,channel,ds); } return common->wcmPktLength; } @@ -1272,7 +1272,7 @@ static void serialParseP4Common(LocalDev { /* send a prox-out for old device */ WacomDeviceState out = { 0 }; - xf86WcmEvent(common, 0, &out); + xf86WcmEvent(local,common, 0, &out); ds->device_type = cur_type; } } diff -u -p -r ../linuxwacom-0.7.8-3.old/src/xdrv/wcmUSB.c ./src/xdrv/wcmUSB.c --- ../linuxwacom-0.7.8-3.old/src/xdrv/wcmUSB.c 2007-09-30 11:45:28.000000000 +0000 +++ ./src/xdrv/wcmUSB.c 2007-09-30 12:17:16.000000000 +0000 @@ -913,7 +913,7 @@ static void usbParseChannel(LocalDeviceP } /* dispatch event */ - xf86WcmEvent(common, channel, ds); + xf86WcmEvent(local,common, channel, ds); } #endif /* LINUX_INPUT */ diff -u -p -r ../linuxwacom-0.7.8-3.old/src/xdrv/xf86Wacom.h ./src/xdrv/xf86Wacom.h --- ../linuxwacom-0.7.8-3.old/src/xdrv/xf86Wacom.h 2007-09-30 11:45:28.000000000 +0000 +++ ./src/xdrv/xf86Wacom.h 2007-09-30 12:20:17.000000000 +0000 @@ -608,7 +608,7 @@ int xf86WcmInitTablet(LocalDevicePtr loc void xf86WcmReadPacket(LocalDevicePtr local); /* handles suppression, filtering, and dispatch. */ -void xf86WcmEvent(WacomCommonPtr common, unsigned int channel, const WacomDeviceState* ds); +void xf86WcmEvent(LocalDevicePtr local, WacomCommonPtr common, unsigned int channel, const WacomDeviceState* ds); /* dispatches data to XInput event system */ void xf86WcmSendEvents(LocalDevicePtr local, const WacomDeviceState* ds); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org