summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/modules.mk4
-rw-r--r--package/Config.in1
-rw-r--r--package/dialog/Makefile2
-rw-r--r--package/xf86-input-evtouch/Makefile33
-rw-r--r--package/xf86-input-evtouch/patches/patch-ev_calibrate_c11
-rw-r--r--package/xf86-input-evtouch/patches/patch-evtouch_c125
-rw-r--r--package/xorg-server/Makefile2
-rw-r--r--target/alix1c/Makefile1
-rw-r--r--target/alix2d/Makefile1
-rw-r--r--target/alix2d13/Makefile1
-rw-r--r--target/foxboard/Makefile1
-rw-r--r--target/linux/config/Config.in.input6
-rw-r--r--target/rb411/Makefile1
-rw-r--r--target/rb433/Makefile1
-rw-r--r--target/rb532/Makefile1
-rw-r--r--target/wrap/Makefile1
16 files changed, 190 insertions, 2 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index 948a68364..f1760baa8 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -979,6 +979,10 @@ $(eval $(call KMOD_template,INPUT_MOUSEDEV,input-mousedev,\
$(MODULES_DIR)/kernel/drivers/input/mousedev \
,45))
+$(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\
+ $(MODULES_DIR)/kernel/drivers/input/evdev \
+,45))
+
#
# USB
#
diff --git a/package/Config.in b/package/Config.in
index 832ab8893..63ae10491 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -544,6 +544,7 @@ source "package/xf86-video-cirrus/Config.in"
source "package/xf86-video-geode/Config.in"
source "package/xf86-input-mouse/Config.in"
source "package/xf86-input-keyboard/Config.in"
+source "package/xf86-input-evtouch/Config.in"
menu "X Libraries"
source "package/libICE/Config.in"
diff --git a/package/dialog/Makefile b/package/dialog/Makefile
index 74178cd2b..2763a0946 100644
--- a/package/dialog/Makefile
+++ b/package/dialog/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= dialog
PKG_VERSION:= 1.1-20080819
PKG_RELEASE:= 1
-PKG_MD5SUM:= 3caebd641a9f337b980becb4444336c5
+PKG_MD5SUM:= 3caebd641a9f337b980becb4444336c5
PKG_DESCR:= A text gui interface
PKG_SECTION:= misc
PKG_DEPENDS:= libncurses
diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile
new file mode 100644
index 000000000..4f7506523
--- /dev/null
+++ b/package/xf86-input-evtouch/Makefile
@@ -0,0 +1,33 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= xf86-input-evtouch
+PKG_VERSION:= 0.8.8
+PKG_RELEASE:= 1
+PKG_BUILDDEP+= xorg-server
+PKG_MD5SUM:= 4d8e092356d8353002f60a4907046c13
+PKG_DESCR:= X11 driver for touchscreen
+PKG_SECTION:= x11
+PKG_DEPENDS:= xorg-server kmod-input-evdev
+PKG_SITES:= http://www.conan.de/touchscreen/
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+PKG_TARGET_DEPENDS:= alix1c
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_INPUT_EVTOUCH,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XF86_INPUT_EVTOUCH}/usr/lib/xorg/modules/input
+ ${CP} ${WRKINST}/usr/lib/xorg/modules/input/evtouch_drv.so \
+ ${IDIR_XF86_INPUT_EVTOUCH}/usr/lib/xorg/modules/input/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-input-evtouch/patches/patch-ev_calibrate_c b/package/xf86-input-evtouch/patches/patch-ev_calibrate_c
new file mode 100644
index 000000000..103500ea5
--- /dev/null
+++ b/package/xf86-input-evtouch/patches/patch-ev_calibrate_c
@@ -0,0 +1,11 @@
+--- xf86-input-evtouch-0.8.8.orig/ev_calibrate.c 2008-11-10 12:25:32.000000000 +0100
++++ xf86-input-evtouch-0.8.8/ev_calibrate.c 2010-01-08 17:13:52.000000000 +0100
+@@ -218,7 +218,7 @@ int main (void)
+ int cap_style = CapButt; /* style of the line's edje and */
+ int join_style = JoinBevel; /* joined lines. */
+
+- int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask;
++ int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask;
+
+ int depth;
+ int screen_num;
diff --git a/package/xf86-input-evtouch/patches/patch-evtouch_c b/package/xf86-input-evtouch/patches/patch-evtouch_c
new file mode 100644
index 000000000..a0fe4919e
--- /dev/null
+++ b/package/xf86-input-evtouch/patches/patch-evtouch_c
@@ -0,0 +1,125 @@
+--- xf86-input-evtouch-0.8.8.orig/evtouch.c 2008-11-11 09:47:55.000000000 +0100
++++ xf86-input-evtouch-0.8.8/evtouch.c 2010-01-08 17:14:02.000000000 +0100
+@@ -30,8 +30,8 @@
+
+ #define _evdev_touch_C_
+
+-#include <xf86Version.h>
+-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0)
++#include <xorgVersion.h>
++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(3,9,0,0,0)
+ #define XFREE86_V4
+ #endif
+
+@@ -74,7 +74,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86Xinput.h"
+ #include "exevents.h"
+-#include "xf86OSmouse.h"
+ #include "randrstr.h"
+
+ #ifndef NEED_XF86_TYPES
+@@ -139,7 +138,7 @@ static XF86ModuleVersionInfo VersionRec
+ "Kenan Esau",
+ MODINFOSTRING1,
+ MODINFOSTRING2,
+- XF86_VERSION_CURRENT,
++ XORG_VERSION_CURRENT,
+ 0, 8, 8,
+ ABI_CLASS_XINPUT,
+ ABI_XINPUT_VERSION,
+@@ -167,7 +166,7 @@ Unplug(pointer p)
+ }
+
+
+-XF86ModuleData evtouchModuleData = {&VersionRec, Plug, Unplug };
++_X_EXPORT XF86ModuleData evtouchModuleData = {&VersionRec, Plug, Unplug };
+
+ #endif /* XFree86LOADER */
+
+@@ -306,7 +305,7 @@ void EVTouchProcessAbs(EVTouchPrivatePtr
+ }
+
+ if (pos_changed == 1) {
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
+ ConvertProc(priv->local, 0, 2,
+ priv->raw_x, priv->raw_y,
+ 0, 0, 0, 0,
+@@ -370,7 +369,7 @@ void EVTouchProcessRel(EVTouchPrivatePtr
+ priv->raw_y = priv->min_y;
+ }
+
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
+ ConvertProc(priv->local, 0, 2,
+ priv->raw_x, priv->raw_y,
+ 0, 0, 0, 0,
+@@ -591,6 +590,10 @@ DeviceInit (DeviceIntPtr dev)
+ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private);
+ unsigned char map[EV_MAX_BUTTONS];
+ int i;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ Atom btn_label;
++ Atom axis_labels[2] = { 0, 0 };
++#endif
+
+ for (i = 0; i < EV_MAX_BUTTONS; i++)
+ map[i] = i;
+@@ -629,7 +632,11 @@ DeviceInit (DeviceIntPtr dev)
+ /*
+ * Device reports button press for 5 buttons.
+ */
+- if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, map) == FALSE)
++ if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ &btn_label,
++#endif
++ map) == FALSE)
+ {
+ ErrorF("Unable to allocate EVTouch touchscreen ButtonClassDeviceStruct\n");
+ return BadAlloc;
+@@ -653,28 +660,34 @@ DeviceInit (DeviceIntPtr dev)
+ * Device reports motions on 2 axes in absolute coordinates.
+ * Axes min and max values are reported in raw coordinates.
+ */
+- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents,
+- local->history_size, Absolute) == FALSE)
++ if (InitValuatorClassDeviceStruct(dev, 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels,
++#endif
++ local->history_size, Absolute) == FALSE)
+ {
+ ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n");
+ return !Success;
+ }
+
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
+- xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width,
++ xf86InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[0],
++#endif
++ 0, priv->screen_width,
+ 1024,
+ EV_AXIS_MIN_RES /* min_res */ ,
+ EV_AXIS_MAX_RES /* max_res */ );
+ xf86InitValuatorDefaults(dev, 0);
+- xf86InitValuatorAxisStruct(dev, 1, 0, priv->screen_height,
++ xf86InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[1],
++#endif
++ 0, priv->screen_height,
+ 1024,
+ EV_AXIS_MIN_RES /* min_res */ ,
+ EV_AXIS_MAX_RES /* max_res */ );
+ xf86InitValuatorDefaults(dev, 1);
+-#else
+- xf86InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x,
+- xf86InitValuatorDefaults(dev, 1);
+-#endif
+
+ /* Initial position of pointer on screen: Centered */
+ priv->cur_x=(priv->max_x - priv->min_x)/2;
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 790a01d7e..4152dcc0c 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9
PKG_DESCR:= Xorg server
PKG_SECTION:= x11
-PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile libfontenc xkeyboard-config xkbcomp
+PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile libfontenc xkeyboard-config xkbcomp libxau libxaw libxmu libxpm libxrender libxt libxxf86dga libxext libxdmcp libxv libsm libice libx11
PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl xf86dgaproto
PKG_URL:= http://www.x.org
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile
index 691cf1a08..c17a1ef8a 100644
--- a/target/alix1c/Makefile
+++ b/target/alix1c/Makefile
@@ -24,5 +24,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
@echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}'
+ @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/alix2d/Makefile b/target/alix2d/Makefile
index 691cf1a08..c17a1ef8a 100644
--- a/target/alix2d/Makefile
+++ b/target/alix2d/Makefile
@@ -24,5 +24,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
@echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}'
+ @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/alix2d13/Makefile b/target/alix2d13/Makefile
index 691cf1a08..c17a1ef8a 100644
--- a/target/alix2d13/Makefile
+++ b/target/alix2d13/Makefile
@@ -24,5 +24,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
@echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}'
+ @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile
index d151225ac..ffa6f4152 100644
--- a/target/foxboard/Makefile
+++ b/target/foxboard/Makefile
@@ -35,5 +35,6 @@ imageinstall: ${BIN_DIR}/${ROOTFSTARBALL}
@echo Use sudo ./boot_linux -F -i ${ADK_TARGET}-${FS}-kernel to flash the kernel
@echo Do not forget to set network boot jumper, before you start the foxboard
@echo ${ROOTFSTARBALL} is your nfs root and can be extracted on your nfs server
+ @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 5f1cffd77..a3afafe0c 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -38,4 +38,10 @@ config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
tristate
default n
+config ADK_KPACKAGE_KMOD_INPUT_EVDEV
+ prompt "kmod-input-evdev................. Event support"
+ select ADK_KERNEL_INPUT
+ tristate
+ default n
+
endmenu
diff --git a/target/rb411/Makefile b/target/rb411/Makefile
index b9ee5932b..4ecfbc47a 100644
--- a/target/rb411/Makefile
+++ b/target/rb411/Makefile
@@ -14,6 +14,7 @@ ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
+ @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),yaffs)
diff --git a/target/rb433/Makefile b/target/rb433/Makefile
index b9ee5932b..4ecfbc47a 100644
--- a/target/rb433/Makefile
+++ b/target/rb433/Makefile
@@ -14,6 +14,7 @@ ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
+ @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),yaffs)
diff --git a/target/rb532/Makefile b/target/rb532/Makefile
index f0e6028ec..7cf3d7c46 100644
--- a/target/rb532/Makefile
+++ b/target/rb532/Makefile
@@ -26,5 +26,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
+ @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/wrap/Makefile b/target/wrap/Makefile
index 825b55175..77b9d4ab9 100644
--- a/target/wrap/Makefile
+++ b/target/wrap/Makefile
@@ -24,5 +24,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
@echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
+ @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot'
@echo 'Login as user root with password linux123 via ssh or console'
endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 14:32:16 +0000