Initial population

git-svn-id: https://svn.o-hand.com/repos/poky@1 311d38ba-8fff-0310-9ca6-ca027cbcb966

22 files changed, 365 insertions, 0 deletions

diff --git a/openembedded/packages/x11/diet-x11_6.2.1.bb b/openembedded/packages/x11/diet-x11_6.2.1.bb
new file mode 100644
index 0000000000..1313bd08d0
--- /dev/null
+++ b/openembedded/packages/x11/diet-x11_6.2.1.bb
@@ -0,0 +1,8 @@
+SECTION = "x11/base"
+include x11_${PV}.bb
+
+EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
+
diff --git a/openembedded/packages/x11/files/autofoo.patch b/openembedded/packages/x11/files/autofoo.patch
new file mode 100644
index 0000000000..8bdba09768
--- /dev/null
+++ b/openembedded/packages/x11/files/autofoo.patch
@@ -0,0 +1,22 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libX11-6.2.1/configure.ac~autofoo
++++ libX11-6.2.1/configure.ac
+@@ -7,12 +7,12 @@
+         [jg@freedesktop.org],
+         libX11)
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_INIT_AUTOMAKE([dist-bzip2])
++AC_CONFIG_AUX_DIR(.)
+ 
++AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER([src/config.h])
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
diff --git a/openembedded/packages/x11/files/fix-utf8-wrong-define.patch b/openembedded/packages/x11/files/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000000..dca88fba92
--- /dev/null
+++ b/openembedded/packages/x11/files/fix-utf8-wrong-define.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define
++++ libX11-6.2.1/include/X11/Xlib.h
+@@ -100,7 +100,7 @@
+ 
+ /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
+    November 2000. Its presence is indicated through the following macro. */
+-#define X_HAVE_UTF8_STRING 1
++#undef X_HAVE_UTF8_STRING 
+ 
+ typedef char *XPointer;
+ 
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xdefaults b/openembedded/packages/x11/x11-common/etc/X11/Xdefaults
new file mode 100644
index 0000000000..f5b69dd516
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/Xdefaults
@@ -0,0 +1,3 @@
+Rxvt*scrollBar_right: true
+Rxvt*font: xft:Mono:pixelsize=9
+
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit b/openembedded/packages/x11/x11-common/etc/X11/Xinit
new file mode 100644
index 0000000000..f566ffe5be
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/Xinit
@@ -0,0 +1,16 @@
+#!/bin/sh
+# 
+
+export USER=root
+export HOME=/home/root
+if [ ! -d $HOME ] && [ -d /root ]; then
+  HOME=/root
+fi
+export XAPPLRESDIR=/usr/X11R6/lib/app-defaults
+export XFILESEARCHPATH=./%N%S%C.ad:/usr/X11R6/lib/X11/%L/%T/%N%S%C:/usr/X11R6/lib/X11/%l/%T/%N%S%C:/usr/X11R6/lib/X11/%T/%N%S%C:./%N%S.ad:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S:/usr/local/lib/X11/app-defaults/%N%S%C.ad
+
+export PATH=$PATH:/usr/X11R6/bin
+
+SYSSESSIONDIR=/etc/X11/Xinit.d
+
+exec run-parts $SYSSESSIONDIR
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr
new file mode 100644
index 0000000000..abde87d53c
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+xrandr -o normal
+
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus
new file mode 100644
index 0000000000..61ca84b595
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ -z "`which chkhinge`" ]; then
+   # probably not a clamshell zaurus
+   exit 0
+fi
+
+chkhinge -e
+if [ $? = 12 ]; then
+   xrandr -o right
+fi
+
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/12keymap b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/12keymap
new file mode 100644
index 0000000000..abc14f8661
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/12keymap
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
+
+case $MACHINE in
+	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+		case `uname -r` in
+			2.4*)
+				xmodmap - < /etc/X11/shepherd.xmodmap
+				;;
+			esac
+		;;
+        "Sharp-Collie")
+                xmodmap - < /etc/X11/collie.xmodmap
+                ;;
+	"Simpad")
+		xmodmap - < /etc/X11/simpad.xmodmap
+		;;
+	"HP iPAQ H2200")
+		xmodmap - < /etc/X11/h2200.xmodmap
+		;;
+esac
+
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate
new file mode 100644
index 0000000000..de47b871a2
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ ! -f /etc/pointercal ]; then
+    /usr/bin/xtscal
+fi
+
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap
new file mode 100644
index 0000000000..7ae3b58860
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -f /proc/hal/model ]; then
+  xmodmap -e 'keycode 104 = Return'
+fi
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver
new file mode 100644
index 0000000000..5f6d0dae5d
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+xset s 30 180
+xset s off
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults
new file mode 100644
index 0000000000..6b35e0357c
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+xrdb -load -nocpp < /etc/X11/Xdefaults
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xserver b/openembedded/packages/x11/x11-common/etc/X11/Xserver
new file mode 100644
index 0000000000..8492bfe214
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/Xserver
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+
+XSERVER=Xipaq
+if [ -f /usr/bin/Xfbdev ]; then
+  XSERVER=Xfbdev
+fi
+if [ -f /usr/bin/Xepson ]; then
+  XSERVER=Xepson
+fi
+if [ -f /usr/bin/Xorg ]; then
+  XSERVER=Xorg
+fi
+if [ -f /usr/bin/Xomap ]; then
+  XSERVER=Xomap
+fi
+
+. /etc/profile
+
+module_id() {
+    ## used to read from assets, but sometimes assets is corrupted
+    # grep "Module ID" /proc/hal/assets | sed "s/.*://"
+    ## used to read from /proc/hal/model, but that is removed in 2.6
+    # echo ' iPAQ' `cat /proc/hal/model`
+    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+export USER=root
+
+ARGS="-dpi 100 -br -pn"
+
+# use ucb 1x00 touchscreen if present
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
+  ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+fi
+
+# use usb mouse if present
+# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
+  ARGS="$ARGS -mouse /dev/input/mice"
+fi
+
+# start off server in conventional location.
+case `module_id` in
+	"HP iPAQ H3100" | "HP iPAQ H3800")
+		ARGS="$ARGS -screen 320x240@90 -rgba vrgb" ;;
+	"HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
+		ARGS="$ARGS -screen 320x240@270 -rgba vbgr" ;;
+	"HP iPAQ H5400" | "HP iPAQ H2200")
+		ARGS="$ARGS -rgba rgb" ;;
+	"Ramses")
+		# What is this "vt2" in aid of?
+		ARGS="$ARGS -screen 320x240@90 -rgba vrgb vt2" ;;
+	# both 'Sharp-Collie' and just 'Collie' have been reported
+	*Poodle)
+		ARGS="$ARGS -screen 320x240@270 -rgba vrgb" ;;
+	*Collie)
+		ARGS="$ARGS -screen 320x240@270 -rgba vrgb"
+		# Horrible hack required to enable resuming after suspend
+		rm -f /dev/apm_bios
+		killall -9 apmd
+		;;
+	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+		ARGS="$ARGS -rgba rgb" ;;
+	"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
+		ARGS="$ARGS -rgba rgb -screen 480x640@270" ;;
+	"Simpad")
+		ARGS="$ARGS -rgba rgb" ;;
+	"Generic OMAP1510/1610/1710")
+		ARGS="$ARGS -mouse /dev/input/event0" ;;
+esac
+
+exec $XSERVER $ARGS $*
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xsession b/openembedded/packages/x11/x11-common/etc/X11/Xsession
new file mode 100644
index 0000000000..cfa3a9a6e3
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/Xsession
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# this location MUST be consistent with /etc/X11/gpe-login.pre-session
+HOME_VOLATILE=/home/$USER/ramdisk
+export HOME_VOLATILE
+
+if [ -f /usr/bin/dbus-launch ]; then
+  ## test for an existing bus daemon, just to be safe
+  if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+     ## if not found, launch a new one
+     eval `dbus-launch --auto-syntax --exit-with-session`
+     echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
+  fi
+fi
+
+. /etc/profile
+
+if [ -f $HOME/.profile ]; then
+ . $HOME/.profile
+fi
+
+SYSSESSIONDIR=/etc/X11/Xsession-gpe.d
+
+if [ ! -d $SYSSESSIONDIR ]; then
+  SYSSESSIONDIR=/etc/X11/Xsession.d
+fi
+
+# Use run-parts to source every file in the session directory; we source
+# instead of executing so that the variables and functions defined above
+# are available to the scripts, and so that they can pass variables to each
+# other.
+
+# Can't use run-parts like this, busybox doesn't support it. Use ls instead
+#SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
+
+SESSIONFILES=`ls -X $SYSSESSIONDIR`
+if [ -n "$SESSIONFILES" ]; then
+  for SESSIONFILE in $SESSIONFILES; do
+  # Test if script is executable first before sourcing it
+    if [ -x "$SYSSESSIONDIR/$SESSIONFILE" ]; then
+      . $SYSSESSIONDIR/$SESSIONFILE
+    fi
+  done
+fi
+
+exit 0
+
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults b/openembedded/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults
new file mode 100644
index 0000000000..d3a284d8da
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -e $HOME/.Xdefaults ]; then
+    xrdb -merge -nocpp < $HOME/.Xdefaults
+fi
diff --git a/openembedded/packages/x11/x11-common/etc/X11/collie.xmodmap b/openembedded/packages/x11/x11-common/etc/X11/collie.xmodmap
new file mode 100644
index 0000000000..5c0b39dc88
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/collie.xmodmap
@@ -0,0 +1,5 @@
+keycode 96 = XF86Calendar
+keycode 97 = telephone
+keycode 48 = XF86Start
+keycode 98 = XF86Mail
+keycode 117 = XF86PowerDown
diff --git a/openembedded/packages/x11/x11-common/etc/X11/h2200.xmodmap b/openembedded/packages/x11/x11-common/etc/X11/h2200.xmodmap
new file mode 100644
index 0000000000..736766efd7
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/h2200.xmodmap
@@ -0,0 +1,5 @@
+keycode 75 = XF86Calendar
+keycode 76 = telephone
+keycode 77 = XF86Mail
+keycode 78 = XF86Start
+keycode 124 = XF86PowerDown
diff --git a/openembedded/packages/x11/x11-common/etc/X11/shepherd.xmodmap b/openembedded/packages/x11/x11-common/etc/X11/shepherd.xmodmap
new file mode 100644
index 0000000000..0a03b4f426
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/shepherd.xmodmap
@@ -0,0 +1,49 @@
+keycode 38 = Mode_switch
+keycode 31 = w W caret
+keycode 13 = e E equal
+keycode 26 = r R plus
+keycode 28 = t T bracketleft
+keycode 33 = y y bracketright
+keycode 29 = u U braceleft
+keycode 17 = i I braceright
+!keycode 73 = Tab Tab Caps_Lock
+keycode 12 = d D periodcentered
+keycode 14 = f F backslash
+keycode 15 = g G semicolon
+keycode 16 = h H colon
+keycode 18 = j J asterisk
+keycode 19 = k K currency
+keycode 20 = l L bar
+keycode 10 = b B underscore
+keycode 66 = minus minus at
+keycode 71 = comma slash less
+keycode 72 = period question greater
+
+! Side keys
+keycode 134 = Down
+keycode 133 = Up
+keycode 131 = Return
+keycode 132 = Escape
+
+!Special keys
+!keycode 96 = XF86Calendar
+!keycode 97 = telephone
+!keycode 98 = XF86Mail
+!keycode 48 = XF86HomePage
+!keycode 37 = XF86Start
+
+clear Shift
+clear Lock
+clear Control
+clear Mod1
+clear Mod2
+clear Mod3
+clear Mod4
+clear Mod5
+
+add Shift   = Shift_L Shift_R
+!add Lock    = Caps_Lock
+add Control = Control_L Control_R
+add Mod1    = Alt_L Alt_R
+add Mod2 = Mode_switch
+
diff --git a/openembedded/packages/x11/x11-common/etc/X11/simpad.xmodmap b/openembedded/packages/x11/x11-common/etc/X11/simpad.xmodmap
new file mode 100644
index 0000000000..d8b73b207f
--- /dev/null
+++ b/openembedded/packages/x11/x11-common/etc/X11/simpad.xmodmap
@@ -0,0 +1,2 @@
+keycode 102 = XF86PowerDown
+
diff --git a/openembedded/packages/x11/x11-common_0.1.bb b/openembedded/packages/x11/x11-common_0.1.bb
new file mode 100644
index 0000000000..707c766555
--- /dev/null
+++ b/openembedded/packages/x11/x11-common_0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Common X11 scripts"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r0"
+
+SRC_URI = "file://etc"
+S = ${WORKDIR}
+
+do_install() {
+	cp -R ${S}/etc ${D}/etc
+	chmod -R 755 ${D}/etc
+}
\ No newline at end of file
diff --git a/openembedded/packages/x11/x11-native_6.2.1.bb b/openembedded/packages/x11/x11-native_6.2.1.bb
new file mode 100644
index 0000000000..cb44531b87
--- /dev/null
+++ b/openembedded/packages/x11/x11-native_6.2.1.bb
@@ -0,0 +1,5 @@
+SECTION = "x11/base"
+include x11_${PV}.bb
+inherit native
+DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native"
+PROVIDES = ""
diff --git a/openembedded/packages/x11/x11_6.2.1.bb b/openembedded/packages/x11/x11_6.2.1.bb
new file mode 100644
index 0000000000..d3a6941b9a
--- /dev/null
+++ b/openembedded/packages/x11/x11_6.2.1.bb
@@ -0,0 +1,39 @@
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xextensions xau xtrans xdmcp"
+DESCRIPTION = "Base X libs."
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+PROVIDES = "x11"
+PR = "r2"
+
+SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
+	   file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit autotools pkgconfig 
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+#		unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+		oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
+	)
+	oe_runmake
+}
+
+do_stage() {
+	install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h
+	install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h
+	install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h
+	install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h
+	install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h
+	install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h
+	install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
+	install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
+	install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
+
+	oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR}
+}