diff options
Diffstat (limited to 'x11-misc/linuxwacom/files/linuxwacom-0.7.2-modular-x.patch')
| -rw-r--r-- | x11-misc/linuxwacom/files/linuxwacom-0.7.2-modular-x.patch | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/x11-misc/linuxwacom/files/linuxwacom-0.7.2-modular-x.patch b/x11-misc/linuxwacom/files/linuxwacom-0.7.2-modular-x.patch deleted file mode 100644 index 80a47c43e9e1..000000000000 --- a/x11-misc/linuxwacom/files/linuxwacom-0.7.2-modular-x.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -urN linuxwacom-0.7.2-orig/acinclude.m4 linuxwacom-0.7.2/acinclude.m4 ---- linuxwacom-0.7.2-orig/acinclude.m4 2005-12-27 03:45:09.000000000 -0500 -+++ linuxwacom-0.7.2/acinclude.m4 2005-12-27 03:53:28.000000000 -0500 -@@ -227,9 +227,12 @@ - WCM_ENV_XORGSDK=yes - $WCM_XORGSDK=$WCM_XORGSDK/xc - AC_MSG_RESULT(ok) -- else -+ elif test -f $WCM_XORGSDK/xf86Version.h; then -+ WCM_ENV_XORGSDK=yes -+ AC_MSG_RESULT(ok) -+ else - AC_MSG_RESULT("xf86Version.h missing") -- AC_MSG_RESULT("Tried $WCM_XORGSDK/include and WCM_XORGSDK/xc/include") -+ AC_MSG_RESULT("Tried $WCM_XORGSDK/include and WCM_XORGSDK/xc/include and WCM_XORGSDK") - fi - WCM_XORGSDK=`(cd $WCM_XORGSDK; pwd)` - fi -@@ -296,11 +299,15 @@ - dnl handle default case - AC_MSG_CHECKING(for X lib directory) - if test "$WCM_XLIBDIR" == "" || test "$WCM_XLIBDIR" == "yes"; then -+ WCM_XLIBDIR=$(pkg-config --variable=libdir xorg-server) - if test -d $WCM_XLIBDIR_DEFAULT/X11 || - test -d $WCM_XLIBDIR_DEFAULT; then - WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT - AC_MSG_RESULT(found) -+ elif test -d $WCM_XLIBDIR/X11; then -+ WCM_ENV_XLIB=yes -+ AC_MSG_RESULT(found) - else - AC_MSG_RESULT(not found, tried $WCM_XLIBDIR_DEFAULT/X11) - WCM_ENV_XLIB=no -diff -urN linuxwacom-0.7.2-orig/configure.in linuxwacom-0.7.2/configure.in ---- linuxwacom-0.7.2-orig/configure.in 2005-12-27 03:45:09.000000000 -0500 -+++ linuxwacom-0.7.2/configure.in 2005-12-27 03:45:38.000000000 -0500 -@@ -329,6 +329,13 @@ - AC_ARG_ENABLE(wacomdrv, - AC_HELP_STRING([--enable-wacomdrv], [Enable building wacom_drv.{o,so} [[default=yes]]]), - , enable_wacomdrv=yes) -+PKG_CHECK_MODULES(XORG, [xorg-server xproto], WCM_ENV_XORGSDK=yes, WCM_ENV_XORGSDK=no) -+WCM_XORGSDK=$(pkg-config --variable=sdkdir xorg-server) -+WCM_XORGINC=$(pkg-config --variable=includedir xorg-server) -+WCM_MODULEDIR=$(pkg-config --variable=moduledir xorg-server) -+if test "$WCM_ENV_XORGSDK" == "yes" && test "$enable_wacomdrv" == "yes"; then -+ CFLAGS="${CFLAGS} -I${WCM_XORGSDK} -I${WCM_XORGINC}/X11" -+fi - if test "$enable_wacomdrv" != "no"; then - if test "$WCM_ENV_XF86" != "yes" && test "$WCM_ENV_XORGSDK" != "yes"; then - echo "***"; echo "*** WARNING:"; -@@ -517,6 +524,7 @@ - AC_SUBST(WCM_XORGSDK) - AC_SUBST(WCM_XF86DIR) - AC_SUBST(WCM_XLIBDIR) -+AC_SUBST(WCM_MODULEDIR) - AC_SUBST(WCM_XSERVER64) - #AC_SUBST(WCM_OPTION_DLLOADER) - AC_SUBST(WCM_NO_MERGE_CONSTANTS) -@@ -565,6 +573,7 @@ - echo " XFree86 - $WCM_ENV_XF86 $WCM_XF86DIR" - else - echo " Xorg SDK - $WCM_ENV_XORGSDK $WCM_XORGSDK" -+echo " Xorg Module Dir - $WCM_MODULEDIR" - fi - echo " XSERVER64 - $WCM_OPTION_XSERVER64" - echo " dlloader - $WCM_OPTION_DLLOADER" -diff -urN linuxwacom-0.7.2-orig/src/Makefile.am linuxwacom-0.7.2/src/Makefile.am ---- linuxwacom-0.7.2-orig/src/Makefile.am 2005-12-27 03:45:09.000000000 -0500 -+++ linuxwacom-0.7.2/src/Makefile.am 2005-12-27 03:45:38.000000000 -0500 -@@ -7,7 +7,7 @@ - wacomcfgdir = $(includedir)/wacomcfg - wacomcfg_HEADERS = wacomcfg.h - --x86moduledir = @WCM_XLIBDIR@/modules/input -+x86moduledir = @WCM_MODULEDIR@/input - x86module_DATA = @WCM_XF86MODULES@ - - AM_CFLAGS = -Wall -pedantic |