bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update XOrg packages to 7.3

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@12468 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
lars
2008-09-01 21:31:52 +00:00
parent 40f3845abb
commit 3fea517e4b
114 changed files with 1174 additions and 1159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
XOrg/driver/xf86-input-evdev/Makefile
View File

@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
PKG_BASE_NAME:=xf86
PKG_NAME:=xf86-input-evdev
PKG_RELEASE:=1
PKG_VERSION:=X11R7.1-1.1.2
PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver
PKG_RELEASE:=2
PKG_VERSION:=1.1.2
PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
@ -27,7 +27,7 @@ define Package/xf86-input-evdev
endef
define Build/InstallDev
DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
endef
EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
@ -46,7 +46,7 @@ define Build/Configure
(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
if [ -x $(CONFIGURE_CMD) ]; then \
$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
$(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
$(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
$(CONFIGURE_VARS) \
$(CONFIGURE_CMD) \

46
XOrg/driver/xf86-input-evdev/patches/001-fix-compile.patch Normal file
View File

@ -0,0 +1,46 @@
--- xf86-input-evdev-1.1.2.orig/src/evdev.c.orig 2008-08-17 19:24:37.000000000 +0200
+++ xf86-input-evdev-1.1.2/src/evdev.c 2008-08-17 19:33:40.000000000 +0200
@@ -234,10 +234,6 @@
else
return !Success;
break;
- case SendCoreEvents:
- case DontSendCoreEvents:
- xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents));
- break;
default:
return !Success;
}
@@ -264,7 +260,9 @@
pInfo->device_control = EvdevProc;
pInfo->read_input = EvdevReadInput;
pInfo->switch_mode = EvdevSwitchMode;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
pInfo->motion_history_proc = xf86GetMotionEvents;
+#endif
pInfo->conf_idev = driver->dev;
pInfo->private = device;
@@ -451,8 +449,6 @@
0
};
-#ifdef XFree86LOADER
-
static void
EvdevUnplug(pointer p)
{
@@ -474,7 +470,7 @@
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- 0, /* Missing from SDK: XORG_VERSION_CURRENT, */
+ XORG_VERSION_CURRENT,
1, 1, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
@@ -488,4 +484,3 @@
EvdevPlug,
EvdevUnplug
};
-#endif /* XFree86LOADER */

30
XOrg/driver/xf86-input-evdev/patches/002-mipointer-fix.patch Normal file
View File

@ -0,0 +1,30 @@
diff -urN xf86-input-evdev-1.1.2.orig/src/evdev_axes.c xf86-input-evdev-1.1.2/src/evdev_axes.c
--- xf86-input-evdev-1.1.2.orig/src/evdev_axes.c 2008-08-28 10:59:09.000000000 +0200
+++ xf86-input-evdev-1.1.2/src/evdev_axes.c 2008-08-28 10:55:52.000000000 +0200
@@ -532,8 +532,14 @@
return Success;
if (!InitValuatorClassDeviceStruct(device, axes,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 1
+ GetMotionHistroy(),
+ GetMotionHistorSize(),
+#else
miPointerGetMotionEvents,
+ miPointerGetMotionBufferSize(),
+#endif
+ 0))
- miPointerGetMotionBufferSize(), 0))
return !Success;
for (i = 0; i < axes; i++) {
@@ -543,8 +549,9 @@
if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
return !Success;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
-
xf86MotionHistoryAllocate (pInfo);
+#endif
return Success;
}