merge of a37386c647ba514be2ca59ef5c79c6a6a410c1ac

     and f876e12a0a86569a88b52f784afdf938aae16b25

7 files changed, 138 insertions, 4 deletions

diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
new file mode 100644
index 0000000000..6a4bc321c9
--- /dev/null
+++ b/packages/tslib/tslib_1.0.bb
@@ -0,0 +1,98 @@
+DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library."
+HOMEPAGE = "http://cvs.arm.linux.org.uk/"
+AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
+SECTION = "base"
+LICENSE = "LGPL"
+
+PR = "r0"
+SRCDATE_tslib = "now"
+
+SRC_URI = "svn://svn.berlios.de/svnroot/repos/tslib/tags/tslib;module=${PV};proto=http \
+           file://ts.conf \
+           file://ts-2.6.conf \
+           file://ts.conf-h3600-2.4 \
+           file://ts.conf-simpad-2.4 \
+           file://ts.conf-corgi-2.4 \
+           file://ts.conf-collie-2.4 \
+           file://tslib.sh"
+SRC_URI_append_mnci += " file://devfs.patch;patch=1"
+SRC_URI_append_mnci += " file://event1.patch;patch=1"
+S = "${WORKDIR}/${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF        = "--enable-shared"
+EXTRA_OECONF_mnci   = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
+
+do_stage() {
+	autotools_stage_all
+}
+
+do_install_prepend() {
+	install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
+}
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/profile.d/
+	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
+	case ${MACHINE} in
+	a780 | e680 | h3600 | h3900 | h5xxx | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel | h4000)
+		install -d ${D}${datadir}/tslib
+		for f in ts-2.6.conf ts.conf-h3600-2.4; do
+			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
+		done
+		rm -f ${D}${sysconfdir}/ts.conf
+		;;
+	c7x0 | spitz | akita | tosa )
+		install -d ${D}${datadir}/tslib
+		for f in ts-2.6.conf ts.conf-corgi-2.4; do
+			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
+		done
+		rm -f ${D}${sysconfdir}/ts.conf
+		;;
+	collie | poodle )
+		install -d ${D}${datadir}/tslib
+		for f in ts-2.6.conf ts.conf-collie-2.4; do
+			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
+		done
+		rm -f ${D}${sysconfdir}/ts.conf
+		;;
+
+	simpad )
+		install -d ${D}${datadir}/tslib
+		for f in ts-2.6.conf ts.conf-simpad-2.4; do
+			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
+		done
+		rm -f ${D}${sysconfdir}/ts.conf
+		;;
+	*)
+		;;
+	esac
+}
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
+CONFFILES_${PN} = "${sysconfdir}/ts.conf"
+
+RDEPENDS_tslib-conf_h1940 = "detect-stylus"
+RDEPENDS_tslib-conf_h2200 = "detect-stylus"
+RDEPENDS_tslib-conf_h3600 = "detect-stylus"
+RDEPENDS_tslib-conf_h3900 = "detect-stylus"
+RDEPENDS_tslib-conf_h5xxx = "detect-stylus"
+RDEPENDS_tslib-conf_h6300 = "detect-stylus"
+RDEPENDS_tslib-conf_blueangel = "detect-stylus"
+RDEPENDS_tslib-conf_htcuniversal = "detect-stylus"
+RDEPENDS_tslib-conf_h4000 = "detect-stylus"
+RDEPENDS_tslib-conf_ipaq-pxa270 = "detect-stylus"
+
+PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
+PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
+
+PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate"
+
+RDEPENDS_libts = "tslib-conf"
+
+FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib"
+FILES_libts = "${libdir}/*.so.* ${libdir}/ts/*.so*"
+FILES_libts-dev = "${FILES_tslib-dev}"
+FILES_tslib-calibrate += "${bindir}/ts_calibrate"
+FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test"
diff --git a/site/i386-linux b/site/i386-linux
index 422c825bef..7640a45d88 100644
--- a/site/i386-linux
+++ b/site/i386-linux
@@ -104,3 +104,13 @@ with_broken_putenv=${with_broken_putenv=no}
 
 # xffm
 jm_cv_func_working_readdir=yes
+
+# ipsec-tools
+ac_cv_va_copy=${ac_cv_va_copy=no}
+ac_cv___va_copy=${ac_cv___va_copy=yes}
+racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no}
+
+# slrn
+slrn_cv___va_copy=${slrn_cv___va_copy=yes}
+slrn_cv_va_copy=${slrn_cv_va_copy=no}
+slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}
diff --git a/site/i486-linux b/site/i486-linux
index 1791e58ea7..1d4115be90 100644
--- a/site/i486-linux
+++ b/site/i486-linux
@@ -140,3 +140,13 @@ ac_cv_file_lib_src_libmad_frame_h=${ac_cv_file_lib_src_libmad_frame_h=no}
 # xorg X11R7
 ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no}
 ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no}
+
+# ipsec-tools
+ac_cv_va_copy=${ac_cv_va_copy=no}
+ac_cv___va_copy=${ac_cv___va_copy=yes}
+racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no}
+
+# slrn
+slrn_cv___va_copy=${slrn_cv___va_copy=yes}
+slrn_cv_va_copy=${slrn_cv_va_copy=no}
+slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}
diff --git a/site/i586-linux b/site/i586-linux
index 65b7c0dd8a..f78dbbfe04 100644
--- a/site/i586-linux
+++ b/site/i586-linux
@@ -123,3 +123,13 @@ php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_
 
 # xffm
 jm_cv_func_working_readdir=yes
+
+# ipsec-tools
+ac_cv_va_copy=${ac_cv_va_copy=no}
+ac_cv___va_copy=${ac_cv___va_copy=yes}
+racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no}
+
+# slrn
+slrn_cv___va_copy=${slrn_cv___va_copy=yes}
+slrn_cv_va_copy=${slrn_cv_va_copy=no}
+slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}
diff --git a/site/i686-linux b/site/i686-linux
index 113929adbb..ce5580f973 100644
--- a/site/i686-linux
+++ b/site/i686-linux
@@ -202,3 +202,8 @@ jm_cv_func_working_readdir=yes
 #xserver-xorg
 ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no}
 ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no}
+
+# slrn
+slrn_cv___va_copy=${slrn_cv___va_copy=yes}
+slrn_cv_va_copy=${slrn_cv_va_copy=no}
+slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}
diff --git a/site/sh4-linux b/site/sh4-linux
index 7189cd1615..8e25cad4a5 100644
--- a/site/sh4-linux
+++ b/site/sh4-linux
@@ -196,10 +196,6 @@ compat_cv_func_dirname_works=${compat_cv_func_dirname_works=no}
 slrn_cv___va_copy=${slrn_cv___va_copy=yes}
 slrn_cv_va_copy=${slrn_cv_va_copy=no}
 slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}
-ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes}
-ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
-ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes}
-ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
 
 # startup-notification
 lf_cv_sane_realloc=yes
diff --git a/site/sh4-linux-uclibc b/site/sh4-linux-uclibc
index 734e0924f7..30054561f2 100644
--- a/site/sh4-linux-uclibc
+++ b/site/sh4-linux-uclibc
@@ -35,3 +35,8 @@ ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
 ac_cv_va_copy=${ac_cv_va_copy=no}
 ac_cv___va_copy=${ac_cv___va_copy=yes}
 racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no}
+
+# slrn
+slrn_cv___va_copy=${slrn_cv___va_copy=yes}
+slrn_cv_va_copy=${slrn_cv_va_copy=no}
+slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}