From 3181c35ffadc215b97229784c9530805f86476c7 Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 21 Mar 2010 11:19:48 +0100 Subject: Ajout de xorg-xf86-input-fpit#1.3.0-3 --- test/xorg-xf86-input-fpit/.footprint | 11 --- test/xorg-xf86-input-fpit/.md5sum | 1 - test/xorg-xf86-input-fpit/Pkgfile | 19 ------ xorg/xorg-xf86-input-fpit/.footprint | 11 +++ xorg/xorg-xf86-input-fpit/.md5sum | 2 + xorg/xorg-xf86-input-fpit/Pkgfile | 20 ++++++ xorg/xorg-xf86-input-fpit/fpit-1.3.0-abi.patch | 95 ++++++++++++++++++++++++++ 7 files changed, 128 insertions(+), 31 deletions(-) delete mode 100644 test/xorg-xf86-input-fpit/.footprint delete mode 100644 test/xorg-xf86-input-fpit/.md5sum delete mode 100644 test/xorg-xf86-input-fpit/Pkgfile create mode 100644 xorg/xorg-xf86-input-fpit/.footprint create mode 100644 xorg/xorg-xf86-input-fpit/.md5sum create mode 100644 xorg/xorg-xf86-input-fpit/Pkgfile create mode 100644 xorg/xorg-xf86-input-fpit/fpit-1.3.0-abi.patch diff --git a/test/xorg-xf86-input-fpit/.footprint b/test/xorg-xf86-input-fpit/.footprint deleted file mode 100644 index 3987d099a..000000000 --- a/test/xorg-xf86-input-fpit/.footprint +++ /dev/null @@ -1,11 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/xorg/ -drwxr-xr-x root/root usr/lib/xorg/modules/ -drwxr-xr-x root/root usr/lib/xorg/modules/input/ --rwxr-xr-x root/root usr/lib/xorg/modules/input/fpit_drv.la --rwxr-xr-x root/root usr/lib/xorg/modules/input/fpit_drv.so -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man4/ --rw-r--r-- root/root usr/share/man/man4/fpit.4.gz diff --git a/test/xorg-xf86-input-fpit/.md5sum b/test/xorg-xf86-input-fpit/.md5sum deleted file mode 100644 index e58572d1b..000000000 --- a/test/xorg-xf86-input-fpit/.md5sum +++ /dev/null @@ -1 +0,0 @@ -e5bfda480f25121e3c4222e5e1eb5880 xf86-input-fpit-1.3.0.tar.bz2 diff --git a/test/xorg-xf86-input-fpit/Pkgfile b/test/xorg-xf86-input-fpit/Pkgfile deleted file mode 100644 index 7cbe90a34..000000000 --- a/test/xorg-xf86-input-fpit/Pkgfile +++ /dev/null @@ -1,19 +0,0 @@ -# Description: xorg driver xf86-input-fpit -# URL: http://xorg.freedesktop.org -# Maintainer: NuTyX core team -# Packager: lesibel at free dot fr -# Depends on: xorg-server - -name=xorg-xf86-input-fpit -version=1.3.0 -release=2 -source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-$version.tar.bz2) - -build() { - cd xf86-input-fpit-$version - - ./configure --prefix=/usr - - make - make DESTDIR=$PKG install -} diff --git a/xorg/xorg-xf86-input-fpit/.footprint b/xorg/xorg-xf86-input-fpit/.footprint new file mode 100644 index 000000000..3987d099a --- /dev/null +++ b/xorg/xorg-xf86-input-fpit/.footprint @@ -0,0 +1,11 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/xorg/ +drwxr-xr-x root/root usr/lib/xorg/modules/ +drwxr-xr-x root/root usr/lib/xorg/modules/input/ +-rwxr-xr-x root/root usr/lib/xorg/modules/input/fpit_drv.la +-rwxr-xr-x root/root usr/lib/xorg/modules/input/fpit_drv.so +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man4/ +-rw-r--r-- root/root usr/share/man/man4/fpit.4.gz diff --git a/xorg/xorg-xf86-input-fpit/.md5sum b/xorg/xorg-xf86-input-fpit/.md5sum new file mode 100644 index 000000000..01512000c --- /dev/null +++ b/xorg/xorg-xf86-input-fpit/.md5sum @@ -0,0 +1,2 @@ +9d8f1033924deb04edc1775bc82440f3 fpit-1.3.0-abi.patch +e5bfda480f25121e3c4222e5e1eb5880 xf86-input-fpit-1.3.0.tar.bz2 diff --git a/xorg/xorg-xf86-input-fpit/Pkgfile b/xorg/xorg-xf86-input-fpit/Pkgfile new file mode 100644 index 000000000..3dc1b78f9 --- /dev/null +++ b/xorg/xorg-xf86-input-fpit/Pkgfile @@ -0,0 +1,20 @@ +# Description: xorg driver xf86-input-fpit +# URL: http://xorg.freedesktop.org +# Maintainer: NuTyX core team +# Packager: lesibel at free dot fr +# Depends on: xorg-server + +name=xorg-xf86-input-fpit +version=1.3.0 +release=3 +source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-$version.tar.bz2 \ + fpit-1.3.0-abi.patch) + +build() { + cd xf86-input-fpit-$version + patch -Np1 -i ../fpit-1.3.0-abi.patch + ./configure --prefix=/usr + + make + make DESTDIR=$PKG install +} diff --git a/xorg/xorg-xf86-input-fpit/fpit-1.3.0-abi.patch b/xorg/xorg-xf86-input-fpit/fpit-1.3.0-abi.patch new file mode 100644 index 000000000..a9864e20a --- /dev/null +++ b/xorg/xorg-xf86-input-fpit/fpit-1.3.0-abi.patch @@ -0,0 +1,95 @@ +From 7d203627e7e3e7a6f8d0e847ed650b0b89760c09 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 17 Jul 2009 14:38:31 +1000 +Subject: [PATCH] Cope with XINPUT ABI 7. + +--- + src/xf86Fpit.c | 40 +++++++++++++++++++++++++++++++++++----- + 1 files changed, 35 insertions(+), 5 deletions(-) + +diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c +index 528ebb9..f40c6a9 100644 +--- a/src/xf86Fpit.c ++++ b/src/xf86Fpit.c +@@ -188,6 +188,9 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv) + * screen to fit one meter. + */ + int quarter_turns; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ Atom axis_labels[2] = { 0, 0 }; ++#endif + + priv->screen_width = screenInfo.screens[priv->screen_no]->width; + priv->screen_height = screenInfo.screens[priv->screen_no]->height; +@@ -212,14 +215,30 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv) + } + + if (priv->fpitTotalOrientation & FPIT_THEN_SWAP_XY) { +- InitValuatorAxisStruct(dev, 1, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ , ++ InitValuatorAxisStruct(dev, 1, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[1], ++#endif ++ priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ , + 9500 /* max_res */ ); +- InitValuatorAxisStruct(dev, 0, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ , ++ InitValuatorAxisStruct(dev, 0, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[0], ++#endif ++ priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ , + 10500 /* max_res */ ); + } else { +- InitValuatorAxisStruct(dev, 0, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ , ++ InitValuatorAxisStruct(dev, 0, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[0], ++#endif ++ priv->fpitMinY, priv->fpitMaxY, 9500, 0 /* min_res */ , + 9500 /* max_res */ ); +- InitValuatorAxisStruct(dev, 1, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ , ++ InitValuatorAxisStruct(dev, 1, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[1], ++#endif ++ priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ , + 10500 /* max_res */ ); + } + } +@@ -408,6 +427,10 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) + unsigned char map[] = { + 0, 1, 2, 3 /* DMC: changed this so we can use all three buttons */ + }; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ Atom btn_labels[3] = { 0 }; ++ Atom axis_labels[2] = { 0, 0 }; ++#endif + + + switch (mode) { +@@ -420,7 +443,11 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) + /* + * Device reports button press for up to 3 buttons. + */ +- if (InitButtonClassDeviceStruct(dev, 3, map) == FALSE) { ++ if (InitButtonClassDeviceStruct(dev, 3, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ btn_labels, ++#endif ++ map) == FALSE) { + ErrorF("Unable to allocate Fpit touchscreen ButtonClassDeviceStruct\n"); + return !Success; + } +@@ -435,6 +462,9 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) + } + + if (InitValuatorClassDeviceStruct(dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels, ++#endif + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, + #endif +-- +1.6.3.rc1.2.g0164.dirty + -- cgit v1.2.3-70-g09d2