Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=eb90b414e039a2cfc18b17fe4db7f715b0070e12
commit eb90b414e039a2cfc18b17fe4db7f715b0070e12
Author: bouleetbil <bouleet...@frogdev.info>
Date: Mon Jun 15 23:24:47 2009 +0200
linuxwacom-0.8.2_2-2-i686
*rebuild with new xorg
*added include fix
diff --git a/source/x11-extra/linuxwacom/FrugalBuild
b/source/x11-extra/linuxwacom/FrugalBuild
index a078498..9603ea9 100644
--- a/source/x11-extra/linuxwacom/FrugalBuild
+++ b/source/x11-extra/linuxwacom/FrugalBuild
@@ -3,20 +3,21 @@
pkgname=linuxwacom
pkgver=0.8.2_2
-pkgrel=1
+pkgrel=2
pkgdesc="Drivers, libraries, and doc for configuring and running Wacom tablets."
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
-depends=('xorg-server>=1.4.0.90' 'ncurses' 'libxi>=1.1.3')
+depends=('xorg-server>=1.6.1' 'ncurses' 'libxi>=1.1.3')
makedepends=('tk' 'inputproto' 'randrproto')
rodepends=('udev')
groups=('x11-extra')
archs=('i686' 'x86_64' 'ppc')
-source=($source check_driver{,.1} 60-wacom.rules)
+source=($source check_driver{,.1} 60-wacom.rules fix_include.diff)
sha1sums=('b1fd2bb816bc766cc52c36cf9e93607cd85e511c' \
'12ae37807a03f36be2c5cc47e444475677b41693' \
'7adf948f2d6f29635e80f4cc336799b7962d2a9a' \
- '075411d58a7915c194bd25a866babbed1d0a1127')
+ '075411d58a7915c194bd25a866babbed1d0a1127' \
+ 'bd55fc5df48215957082e0a26369aa1599466cc3')
_F_cd_path="$_F_sourceforge_name$_F_sourceforge_sep${pkgver//_/-}"
# disabled features:
@@ -25,6 +26,7 @@
_F_cd_path="$_F_sourceforge_name$_F_sourceforge_sep${pkgver//_/-}"
build()
{
+ Fpatchall
Fmake \
--enable-dlloader \
--enable-wacom \
diff --git a/source/x11-extra/linuxwacom/fix_include.diff
b/source/x11-extra/linuxwacom/fix_include.diff
new file mode 100644
index 0000000..07370d4
--- /dev/null
+++ b/source/x11-extra/linuxwacom/fix_include.diff
@@ -0,0 +1,22 @@
+--- linuxwacom-0.8.2-1.orig/src/xdrv/xf86Wacom.h 2009-01-15
14:57:45.000000000 -0500
++++ linuxwacom-0.8.2-1/src/xdrv/xf86Wacom.h 2009-01-15 14:59:33.000000000
-0500
+@@ -23,7 +23,7 @@
+ /****************************************************************************/
+
+ #include "../include/xdrv-config.h"
+-#ifdef WCM_XORG_XSERVER_1_6
++#ifdef WCM_XORG
+ #include <xorg-server.h>
+ #include <xorgVersion.h>
+ #else
+--- linuxwacom-0.8.2-1.orig/src/xdrv/wcmConfig.c 2008-12-30
16:46:01.000000000 -0500
++++ linuxwacom-0.8.2-1/src/xdrv/wcmConfig.c 2009-01-15 15:11:13.000000000
-0500
+@@ -994,7 +994,7 @@ static XF86ModuleVersionInfo xf86WcmVers
+ MODULEVENDORSTRING,
+ MODINFOSTRING1,
+ MODINFOSTRING2,
+-#ifdef WCM_XORG_XSERVER_1_6
++#ifdef WCM_XORG
+ XORG_VERSION_CURRENT,
+ #else
+ XF86_VERSION_CURRENT,
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
