summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Config.in1
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/busybox/config/miscutils/Config.in2
-rw-r--r--package/busybox/files/busybox.postinst1
-rw-r--r--package/busybox/files/watchdog.init27
-rw-r--r--package/sdl/Makefile5
-rw-r--r--package/tslib/Makefile42
-rw-r--r--package/tslib/patches/patch-configure_ac11
8 files changed, 87 insertions, 4 deletions
diff --git a/package/Config.in b/package/Config.in
index b79d083b5..dadce220f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -534,6 +534,7 @@ source "package/libvorbis/Config.in.lib"
source "package/libvorbisidec/Config.in"
source "package/libvorbisidec/Config.in.lib"
source "package/tcp_wrappers/Config.in"
+source "package/tslib/Config.in"
source "package/libxml2/Config.in"
source "package/libxml2/Config.in.lib"
source "package/libxslt/Config.in"
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 2a9ef5e14..37f50bdd6 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= busybox
PKG_VERSION:= 1.15.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 495e320537f0772125f2db3c098e437c
PKG_DESCR:= Core utilities for embedded Linux systems
PKG_SECTION:= base
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index eeb0d6d34..8346391a9 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -617,7 +617,7 @@ config BUSYBOX_VOLNAME
config BUSYBOX_WATCHDOG
bool "watchdog"
depends on !ADK_PACKAGE_WATCHDOG
- default n
+ default y
help
The watchdog utility is used with hardware or software watchdog
device drivers. It opens the specified watchdog device special file
diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst
index 90ddf9d42..761fb777d 100644
--- a/package/busybox/files/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
@@ -2,5 +2,6 @@
. $IPKG_INSTROOT/etc/functions.sh
add_rcconf network network YES
add_rcconf crond crond NO
+add_rcconf watchdog watchdog NO
add_rcconf 'use "-C32" normally, "NO" to disable' syslogd_flags '-C32'
add_rcconf inetd
diff --git a/package/busybox/files/watchdog.init b/package/busybox/files/watchdog.init
new file mode 100644
index 000000000..c5d0e9545
--- /dev/null
+++ b/package/busybox/files/watchdog.init
@@ -0,0 +1,27 @@
+#!/bin/sh
+#PKG busybox
+#INIT 10
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+ [[ $watchdog = NO ]] && exit 0
+ exec sh $0 start
+ ;;
+start)
+ watchdog /dev/watchdog
+ ;;
+stop)
+ pkill watchdog
+ ;;
+restart)
+ sh $0 stop
+ sh $0 start
+ ;;
+*)
+ echo "Usage: $0 {start | stop | restart}"
+ exit 1
+ ;;
+esac
+exit $?
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index d1290789f..0f244569d 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4
PKG_DESCR:= Simple DirectMedia Layer
PKG_SECTION:= libs
-PKG_DEPENDS:= libusb alsa-lib libpthread
-PKG_BUILDDEP+= libusb alsa-lib
+PKG_DEPENDS:= libusb alsa-lib libpthread tslib
+PKG_BUILDDEP+= libusb alsa-lib tslib
PKG_URL:= http://www.libsdl.org
PKG_SITES:= http://www.libsdl.org/release/
@@ -28,6 +28,7 @@ CONFIGURE_ARGS+= --disable-esd \
--enable-video-fbcon \
--disable-video-directfb \
--disable-video-opengl \
+ --enable-input-tslib \
--without-x
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/tslib/Makefile b/package/tslib/Makefile
new file mode 100644
index 000000000..9a7c0fd6b
--- /dev/null
+++ b/package/tslib/Makefile
@@ -0,0 +1,42 @@
+# 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:= tslib
+PKG_VERSION:= 1.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 92b2eb55b1e4ef7e2c0347069389390e
+PKG_DESCR:= touchscreen library
+PKG_SECTION:= libs
+PKG_URL:= http://tslib.berlios.de/
+PKG_SITES:= http://download.berlios.de/tslib/ \
+ http://download2.berlios.de/tslib/
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,TSLIB,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:= autogen gnu
+CONFIGURE_ARGS+= --disable-ucb1x00 \
+ --disable-corgi \
+ --disable-collie \
+ --disable-h3600 \
+ --disable-mk712 \
+ --disable-linear-h2200 \
+ --disable-arctic2
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_TSLIB)/etc
+ $(INSTALL_DIR) $(IDIR_TSLIB)/usr/lib/ts
+ $(INSTALL_DIR) $(IDIR_TSLIB)/usr/bin
+ $(CP) $(WRKINST)/usr/lib/libts*so* $(IDIR_TSLIB)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/ts/*.so $(IDIR_TSLIB)/usr/lib/ts
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/ts_calibrate $(IDIR_TSLIB)/usr/bin
+ $(INSTALL_DATA) $(WRKINST)/etc/ts.conf $(IDIR_TSLIB)/etc
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tslib/patches/patch-configure_ac b/package/tslib/patches/patch-configure_ac
new file mode 100644
index 000000000..bb2ff1f42
--- /dev/null
+++ b/package/tslib/patches/patch-configure_ac
@@ -0,0 +1,11 @@
+--- tslib-1.0.orig/configure.ac 2006-08-24 23:02:55.000000000 +0200
++++ tslib-1.0/configure.ac 2010-01-19 08:07:05.861094823 +0100
+@@ -71,7 +71,7 @@ AC_MSG_RESULT($dejitter_module)
+ AM_CONDITIONAL(ENABLE_DEJITTER_MODULE, test "$dejitter_module" = "yes")
+
+ AC_MSG_CHECKING([whether linear-h2200 module is requested])
+-AC_ARG_ENABLE(dejitter,
++AC_ARG_ENABLE(linear-h2200,
+ AS_HELP_STRING([--enable-linear-h2200],
+ [Enable building of linearizing filter for iPAQ h2200 (default=yes)]),
+ [h2200_linear_module=$enableval],