Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=52ed6088a409d4d5bbd8d80e87329ecfc18d968e
commit 52ed6088a409d4d5bbd8d80e87329ecfc18d968e Author: Krisztian VASAS <[email protected]> Date: Thu Jan 1 19:34:21 2009 +0100 xf86-input-jamstudio-1.2.0-1-i686 - version bump - added compile fixes diff --git a/source/x11/xf86-input-jamstudio/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-jamstudio/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..7915655 --- /dev/null +++ b/source/x11/xf86-input-jamstudio/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,16 @@ +diff --git a/src/js_x.c b/src/js_x.c +index be6b6fa..623f35a 100644 +--- a/src/js_x.c ++++ b/src/js_x.c +@@ -192,7 +192,10 @@ xf86JS_XProc(DeviceIntPtr pJS_X, int operation) + return !Success; + if (InitProximityClassDeviceStruct(pJS_X) == FALSE) + return !Success; +- if (InitValuatorClassDeviceStruct(pJS_X, nbaxes, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct(pJS_X, nbaxes, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + local->history_size, + Absolute | OutOfProximity) == FALSE) + return !Success; diff --git a/source/x11/xf86-input-jamstudio/02-remove_xfree86_v4.patch1 b/source/x11/xf86-input-jamstudio/02-remove_xfree86_v4.patch1 new file mode 100644 index 0000000..90f8ea2 --- /dev/null +++ b/source/x11/xf86-input-jamstudio/02-remove_xfree86_v4.patch1 @@ -0,0 +1,51 @@ +diff --git a/src/js_x.c b/src/js_x.c +index 623f35a..3b6997f 100644 +--- a/src/js_x.c ++++ b/src/js_x.c +@@ -28,9 +28,6 @@ + + #include <sys/types.h> + #include "xf86Version.h" +-#if XORG_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) +-#define XFREE86_V4 1 +-#endif + #include "misc.h" + #include "xf86.h" + #include "xf86_OSproc.h" +@@ -38,11 +35,10 @@ + #include "exevents.h" /* Needed for InitValuator/Proximity stuff */ + #include "mipointer.h" + +-#ifdef XFree86LOADER + #include "xf86Module.h" +-#endif + #include <errno.h> + #include <string.h> ++#include <unistd.h> + + #define JSX_XCOORD 65584 + #define JSX_YCOORD 65585 +@@ -51,8 +47,6 @@ + + #define SYSCALL(call) while(((call) == -1) && (errno == EINTR)) + +-#ifdef XFREE86_V4 +- + struct hiddev_event + { + unsigned hid; +@@ -333,8 +327,6 @@ xf86JS_XInit(InputDriverPtr drv, IDevPtr dev, int flags) + _X_EXPORT InputDriverRec JAMSTUDIO = + { 1, "js_x", NULL, xf86JS_XInit, xf86JS_XUnInit, NULL, 0 }; + +-#ifdef XFree86LOADER +- + static void + xf86JS_XUnplug(pointer p) + { +@@ -366,5 +358,3 @@ _X_EXPORT XF86ModuleData js_xModuleData = { + xf86JS_XPlug, + xf86JS_XUnplug + }; +-#endif +-#endif diff --git a/source/x11/xf86-input-jamstudio/03-fix_xf86version_to_xorgversion.patch1 b/source/x11/xf86-input-jamstudio/03-fix_xf86version_to_xorgversion.patch1 new file mode 100644 index 0000000..3897a4a --- /dev/null +++ b/source/x11/xf86-input-jamstudio/03-fix_xf86version_to_xorgversion.patch1 @@ -0,0 +1,13 @@ +diff --git a/src/js_x.c b/src/js_x.c +index c27a0da..b203d11 100644 +--- a/src/js_x.c ++++ b/src/js_x.c +@@ -27,7 +27,7 @@ + #endif + + #include <sys/types.h> +-#include "xf86Version.h" ++#include "xorgVersion.h" + #include "misc.h" + #include "xf86.h" + #include "xf86_OSproc.h" diff --git a/source/x11/xf86-input-jamstudio/04-dont_use_deprecated_calls_for_newer_xinput_abi.patch1 b/source/x11/xf86-input-jamstudio/04-dont_use_deprecated_calls_for_newer_xinput_abi.patch1 new file mode 100644 index 0000000..c391b31 --- /dev/null +++ b/source/x11/xf86-input-jamstudio/04-dont_use_deprecated_calls_for_newer_xinput_abi.patch1 @@ -0,0 +1,18 @@ +diff --git a/src/js_x.c b/src/js_x.c +index 3b6997f..c27a0da 100644 +--- a/src/js_x.c ++++ b/src/js_x.c +@@ -148,8 +148,13 @@ xf86JS_XConvert(LocalDevicePtr local, int first, int num, int v0, int v1, + int width, height; + int deltaX, deltaY; + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + width = miPointerCurrentScreen()->width; + height = miPointerCurrentScreen()->height; ++#else ++ width = miPointerGetScreen(local->dev)->width; ++ height = miPointerGetScreen(local->dev)->height; ++#endif + /* + deltaX=(float)width/priv->jsxMaxX; deltaY=(float)height/priv->jsxMaxY; + */ diff --git a/source/x11/xf86-input-jamstudio/FrugalBuild b/source/x11/xf86-input-jamstudio/FrugalBuild index 82b2303..c0c2e3f 100644 --- a/source/x11/xf86-input-jamstudio/FrugalBuild +++ b/source/x11/xf86-input-jamstudio/FrugalBuild @@ -2,8 +2,17 @@ # Maintainer: Christian Hamar alias krix <[email protected]> pkgname=xf86-input-jamstudio -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.0 +pkgrel=1 Finclude xorg -sha1sums=('db7c48994d25974060047321df3b86eb9cead2f0') +source=(${sour...@]} \ + '01-fix_xinput_abi_version.patch1' \ + '02-remove_xfree86_v4.patch1' \ + '03-fix_xf86version_to_xorgversion.patch1' \ + '04-dont_use_deprecated_calls_for_newer_xinput_abi.patch1') +sha1sums=('612fe414130068ce098b19cdea9639645f013a27' \ + '6a3dcb2aa0c5c10feaa54c052b964190f77286c3' \ + '973466200e6dea6fb78afa3c5582b75553d9aabd' \ + '945616c8ff757dbf9094227c3c949fb63ba4a6e2' \ + 'a208b8ca812883cf1928f60d9d0666b12bc497c0') # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
