diff options
| -rw-r--r-- | mk/pkg-bottom.mk | 4 | ||||
| -rw-r--r-- | package/Config.in | 1 | ||||
| -rw-r--r-- | package/sdl/Makefile | 5 | ||||
| -rw-r--r-- | package/tslib/Makefile | 42 | ||||
| -rw-r--r-- | package/tslib/patches/patch-configure_ac | 11 |
5 files changed, 61 insertions, 2 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index a3ca4590c..0dc830b28 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -18,6 +18,10 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} mkdir -p ${WRKBUILD} @${MAKE} pre-configure $(MAKE_TRACE) +ifneq ($(filter autogen,${CONFIGURE_STYLE}),) + cd ${WRKBUILD}; \ + ./autogen.sh $(MAKE_TRACE) +endif ifneq ($(filter autotool,${CONFIGURE_STYLE}),) cd ${WRKBUILD}; \ env AUTOCONF_VERSION=2.62 \ 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/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], |