summaryrefslogtreecommitdiffstats
path: root/openembedded
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-08-31 18:07:55 +0000
committerRichard Purdie <richard@openedhand.com>2005-08-31 18:07:55 +0000
commit9ed0d2aa99a76a864d4793f54146c0e79e373712 (patch)
treebf6b07b0cfcc23ebb23130013e348ff84f38ce32 /openembedded
parent047f13b69a6907483a4cf71cf20c8434e20c8873 (diff)
downloadpoky-9ed0d2aa99a76a864d4793f54146c0e79e373712.tar.gz
Add some extra packages to the image
git-svn-id: https://svn.o-hand.com/repos/poky@10 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
-rw-r--r--openembedded/packages/meta/meta-oh.bb34
-rw-r--r--openembedded/packages/meta/oh-image.bb4
-rw-r--r--openembedded/packages/rxvt/rxvt-2.7.9/include.patch16
-rw-r--r--openembedded/packages/rxvt/rxvt_2.7.9.bb41
-rw-r--r--openembedded/packages/vera-fonts/ttf-bitstream-vera_1.10.bb34
-rw-r--r--openembedded/packages/xauth/xauth/autofoo.patch148
-rw-r--r--openembedded/packages/xauth/xauth_cvs.bb13
-rw-r--r--openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch11
-rw-r--r--openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb9
-rw-r--r--openembedded/packages/xhost/xhost/autofoo.patch165
-rw-r--r--openembedded/packages/xhost/xhost_20040413.bb14
-rw-r--r--openembedded/packages/xmu/xmu_cvs.bb21
12 files changed, 492 insertions, 18 deletions
diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb
index 12b7d28906..450afc2070 100644
--- a/openembedded/packages/meta/meta-oh.bb
+++ b/openembedded/packages/meta/meta-oh.bb
@@ -1,38 +1,40 @@
1PACKAGES = oh-base-depends 1PACKAGES = "oh-base-depends oh-task-base"
2# oh-task-base 2# oh-task-base
3DESCRIPTION = "Meta-package for OpenHand Palmtop Environment" 3DESCRIPTION = "Meta-package for OpenHand Palmtop Environment"
4MAINTAINER = "Richard Purdie <richard@openedhand.com>" 4MAINTAINER = "Richard Purdie <richard@openedhand.com>"
5PR = "r0" 5PR = "r1"
6 6
7ALLOW_EMPTY = "1" 7ALLOW_EMPTY = "1"
8 8
9oh-base-depends = "\ 9oh-base-depends = "\
10 diet-x11 \ 10 diet-x11 \
11 matchbox \
12 virtual/xserver" 11 virtual/xserver"
13 12
14RDEPENDS_oh-base-depends := "${oh-base-depends}" 13RDEPENDS_oh-base-depends := "${oh-base-depends}"
15DEPENDS += " ${oh-base-depends}" 14DEPENDS += " ${oh-base-depends}"
16 15
17#oh-task-base = "\ 16oh-task-base = "\
18# matchbox \ 17 matchbox \
19# xcursor-transparent-theme \ 18 xcursor-transparent-theme \
20# rxvt-unicode \ 19 rxvt \
20 xhost \
21 ttf-bitstream-vera \
22 xauth"
23
24# teleport \
21# xst \ 25# xst \
22# xhost \
23# xrdb \
24# ttf-bitstream-vera \
25# libgtkstylus \ 26# libgtkstylus \
26# detect-stylus \ 27# detect-stylus \
27# teleport \ 28# xrdb \
28# xauth" 29
29# 30RDEPENDS_oh-task-base := "${oh-task-base}"
30#RDEPENDS_gpe-task-base := "gdk-pixbuf-loader-png \ 31
32# gdk-pixbuf-loader-png \
31# gdk-pixbuf-loader-xpm \ 33# gdk-pixbuf-loader-xpm \
32# gdk-pixbuf-loader-jpeg \ 34# gdk-pixbuf-loader-jpeg \
33# pango-module-basic-x \ 35# pango-module-basic-x \
34# pango-module-basic-fc \ 36# pango-module-basic-fc \
35# ${gpe-task-base}" 37
36#DEPENDS += " ${gpe-task-base}" 38DEPENDS += " ${oh-task-base}"
37 39
38LICENSE = "MIT" 40LICENSE = "MIT"
diff --git a/openembedded/packages/meta/oh-image.bb b/openembedded/packages/meta/oh-image.bb
index 668c7be463..27042725f1 100644
--- a/openembedded/packages/meta/oh-image.bb
+++ b/openembedded/packages/meta/oh-image.bb
@@ -1,4 +1,4 @@
1PR = "r0" 1PR = "r1"
2 2
3export IMAGE_BASENAME = "oh-image" 3export IMAGE_BASENAME = "oh-image"
4 4
@@ -10,8 +10,8 @@ DEPENDS = "task-bootstrap \
10 meta-oh" 10 meta-oh"
11 11
12export IPKG_INSTALL = "task-bootstrap \ 12export IPKG_INSTALL = "task-bootstrap \
13 oh-task-base \
13 ${XSERVER} " 14 ${XSERVER} "
14#oh-task-base \
15 15
16ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " 16ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
17 17
diff --git a/openembedded/packages/rxvt/rxvt-2.7.9/include.patch b/openembedded/packages/rxvt/rxvt-2.7.9/include.patch
new file mode 100644
index 0000000000..f7542843b1
--- /dev/null
+++ b/openembedded/packages/rxvt/rxvt-2.7.9/include.patch
@@ -0,0 +1,16 @@
1diff -urN rxvt.orig/src/rxvtlib.h.in rxvt/src/rxvtlib.h.in
2--- rxvt.orig/src/rxvtlib.h.in 2003-03-25 19:13:53.000000000 -0500
3+++ rxvt/src/rxvtlib.h.in 2004-04-03 20:35:13.000000000 -0500
4@@ -43,7 +43,11 @@
5 #include <sys/wait.h>
6 #include <sys/stat.h>
7
8-#include <X11/Intrinsic.h> /* Xlib, Xutil, Xresource, Xfuncproto */
9+#include <X11/Xlib.h>
10+#include <X11/Xutil.h>
11+#include <X11/Xresource.h>
12+#include <X11/Xproto.h>
13+#include <X11/region.h>
14
15 #ifdef ENABLE_XFT
16 #include <X11/Xft/Xft.h>
diff --git a/openembedded/packages/rxvt/rxvt_2.7.9.bb b/openembedded/packages/rxvt/rxvt_2.7.9.bb
new file mode 100644
index 0000000000..c201d16f8a
--- /dev/null
+++ b/openembedded/packages/rxvt/rxvt_2.7.9.bb
@@ -0,0 +1,41 @@
1DESCRIPTION = "Well known terminal emulator"
2SECTION = "x11/utils"
3PR = "r1"
4DEPENDS = "x11 libxft"
5LICENSE = "GPL"
6SRC_URI = "${HANDHELDS_CVS};module=apps/rxvt \
7 file://include.patch;patch=1"
8
9inherit autotools update-alternatives
10
11ALTERNATIVE_NAME = "x-terminal-emulator"
12ALTERNATIVE_PATH = "${bindir}/rxvt-2.7.9"
13
14S = ${WORKDIR}/rxvt
15
16EXTRA_OECONF = "--disable-menubar --disable-xim \
17 --enable-utmp --enable-wtmp --enable-lastlog \
18 --disable-strings --with-term=rxvt --enable-keepscrolling \
19 --with-xft --with-name=rxvt --enable-frills \
20 --enable-swapscreen --enable-transparency \
21 --with-codesets=eu,jp \
22 --enable-cursor-blink --enable-pointer-blank \
23 --enable-text-blink --enable-plain-scroll \
24 --enable-combining --enable-shared \
25 --with-x=${STAGING_LIBDIR}/.."
26
27EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
28 'XLIB=-L${STAGING_LIBDIR} -lX11 -lXft'"
29
30do_configure () {
31 mv autoconf/configure.in . || true
32 rm autoconf/libtool.m4
33 libtoolize --force
34 autotools_do_configure
35 echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
36 echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
37 echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
38 echo '#define HAVE_XLOCALE 1' >> config.h
39 echo '#define HAVE_UTMP_H 1' >> config.h
40 echo '#define HAVE_TTYSLOT 1' >> config.h
41}
diff --git a/openembedded/packages/vera-fonts/ttf-bitstream-vera_1.10.bb b/openembedded/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
new file mode 100644
index 0000000000..b756c99e4c
--- /dev/null
+++ b/openembedded/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
@@ -0,0 +1,34 @@
1DESCRIPTION = "The Bitstream Vera fonts - TTF Edition"
2SECTION = "x11/fonts"
3PRIORITY = "optional"
4LICENSE = "Bitstream Vera"
5PACKAGE_ARCH = "all"
6PR = "r3"
7RDEPENDS = "libfontconfig-utils"
8
9SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2"
10
11do_install () {
12 install -d ${D}${prefix}/share/fonts/ttf/
13 for i in *.ttf; do
14 install -m 644 $i ${D}${prefix}/share/fonts/ttf/${i}
15 done
16
17 # fontconfig ships this too. not sure what to do about it.
18 #install -d ${D}${sysconfdir}/fonts
19 #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf
20
21
22 install -d ${D}${prefix}/share/doc/${PN}/
23 for i in *.TXT; do
24 install -m 644 $i ${D}${prefix}/share/doc/${PN}/$i
25 done
26}
27
28pkg_postinst () {
29#!/bin/sh
30fc-cache
31}
32
33
34FILES_${PN} = "/etc ${datadir}/fonts"
diff --git a/openembedded/packages/xauth/xauth/autofoo.patch b/openembedded/packages/xauth/xauth/autofoo.patch
new file mode 100644
index 0000000000..d279a6f4fc
--- /dev/null
+++ b/openembedded/packages/xauth/xauth/autofoo.patch
@@ -0,0 +1,148 @@
1diff -urN xauth.orig/Imakefile xauth/Imakefile
2--- xauth.orig/Imakefile 2004-04-23 21:54:38.000000000 +0200
3+++ xauth/Imakefile 1970-01-01 01:00:00.000000000 +0100
4@@ -1,19 +0,0 @@
5-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:11 cpqbld Exp $
6-
7-
8-
9-
10-XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.5tsi Exp $
11-
12- DEPLIBS = $(DEPXAUTHLIB) $(DEPXMUULIB) $(DEPXLIB)
13-LOCAL_LIBRARIES = $(XAUTHLIB) $(XMUULIB) $(XLIB)
14- SRCS = xauth.c gethost.c process.c parsedpy.c
15- OBJS = xauth.o gethost.o process.o parsedpy.o
16- CONN_DEFINES = $(CONNECTION_FLAGS)
17- DEPEND_DEFINES = $(CONN_DEFINES) $(SIGNAL_DEFINES)
18-
19-ComplexProgramTarget(xauth)
20-
21-SpecialCObjectRule(gethost,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES))
22-SpecialCObjectRule(process,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES))
23-SpecialCObjectRule(parsedpy,$(ICONFIGFILES),$(CONN_DEFINES))
24diff -urN xauth.orig/Makefile.am xauth/Makefile.am
25--- xauth.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
26+++ xauth/Makefile.am 2004-08-14 13:20:37.000000000 +0200
27@@ -0,0 +1,53 @@
28+#
29+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
30+#
31+# Copyright © 2003 Keith Packard
32+#
33+# Permission to use, copy, modify, distribute, and sell this software and its
34+# documentation for any purpose is hereby granted without fee, provided that
35+# the above copyright notice appear in all copies and that both that
36+# copyright notice and this permission notice appear in supporting
37+# documentation, and that the name of Keith Packard not be used in
38+# advertising or publicity pertaining to distribution of the software without
39+# specific, written prior permission. Keith Packard makes no
40+# representations about the suitability of this software for any purpose. It
41+# is provided "as is" without express or implied warranty.
42+#
43+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
44+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
45+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
46+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
47+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
48+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
49+# PERFORMANCE OF THIS SOFTWARE.
50+#
51+
52+AUTOMAKE_OPTIONS = 1.7 foreign
53+
54+AM_CFLAGS = @XAUTH_CFLAGS@
55+
56+bin_PROGRAMS = xauth
57+
58+xauth_SOURCES = gethost.c parsedpy.c process.c xauth.c xauth.h
59+
60+xauth_LDADD = @XAUTH_LIBS@
61+
62+man5_MANS=xauth.man
63+
64+EXTRA_DIST= $(man5_MANS)
65+
66+MAINTAINERCLEANFILES = configure \
67+config.guess \
68+config.sub \
69+install-sh \
70+ltmain.sh \
71+missing \
72+mkinstalldirs \
73+aclocal.m4 \
74+Makefile.in \
75+depcomp \
76+autoscan.log \
77+configure.scan \
78+config.h \
79+config.h.in \
80+$(man5_MANS)
81diff -urN xauth.orig/autogen.sh xauth/autogen.sh
82--- xauth.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
83+++ xauth/autogen.sh 2004-08-14 13:15:46.000000000 +0200
84@@ -0,0 +1,3 @@
85+#! /bin/sh
86+autoreconf -v --install || exit 1
87+./configure --enable-maintainer-mode "$@"
88diff -urN xauth.orig/configure.ac xauth/configure.ac
89--- xauth.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
90+++ xauth/configure.ac 2004-08-14 23:43:54.000000000 +0200
91@@ -0,0 +1,57 @@
92+dnl
93+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
94+dnl
95+dnl Copyright © 2003 Keith Packard
96+dnl
97+dnl Permission to use, copy, modify, distribute, and sell this software and its
98+dnl documentation for any purpose is hereby granted without fee, provided that
99+dnl the above copyright notice appear in all copies and that both that
100+dnl copyright notice and this permission notice appear in supporting
101+dnl documentation, and that the name of Keith Packard not be used in
102+dnl advertising or publicity pertaining to distribution of the software without
103+dnl specific, written prior permission. Keith Packard makes no
104+dnl representations about the suitability of this software for any purpose. It
105+dnl is provided "as is" without express or implied warranty.
106+dnl
107+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
108+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
109+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
110+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
111+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
112+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
113+dnl PERFORMANCE OF THIS SOFTWARE.
114+dnl
115+
116+AC_PREREQ(2.57)
117+AC_INIT([xauth],4.4.0,[],xauth)
118+AC_CONFIG_SRCDIR([Makefile.am])
119+AM_INIT_AUTOMAKE([dist-bzip2])
120+AM_MAINTAINER_MODE
121+AM_CONFIG_HEADER(config.h)
122+
123+AC_PROG_CC
124+AC_PROG_INSTALL
125+AC_PROG_LN_S
126+AC_LIBTOOL_WIN32_DLL
127+AM_PROG_LIBTOOL
128+AC_PROG_MAKE_SET
129+
130+PKG_CHECK_MODULES(XAUTH, xau xext xmuu x11)
131+
132+AC_TYPE_SIGNAL
133+
134+# Transport selection
135+AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
136+AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes])
137+AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes])
138+if test "$UNIXCONN" = "yes"; then
139+ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
140+fi
141+if test "$TCPCONN" = "yes"; then
142+ AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
143+fi
144+if test "$IPV6CONN" = "yes"; then
145+ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
146+fi
147+
148+AC_OUTPUT([Makefile])
diff --git a/openembedded/packages/xauth/xauth_cvs.bb b/openembedded/packages/xauth/xauth_cvs.bb
new file mode 100644
index 0000000000..ff615a500d
--- /dev/null
+++ b/openembedded/packages/xauth/xauth_cvs.bb
@@ -0,0 +1,13 @@
1PV = "0.0cvs${CVSDATE}"
2LICENSE = "MIT"
3DEPENDS = "x11 xau xmu xext"
4DESCRIPTION = "X authority file utility"
5MAINTAINER = "Rene Wagner <rw@handhelds.org>"
6SECTION = "x11/base"
7PR = "r2"
8
9SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xauth \
10 file://autofoo.patch;patch=1"
11S = "${WORKDIR}/xauth"
12
13inherit autotools pkgconfig
diff --git a/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch b/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
new file mode 100644
index 0000000000..df28dfbc88
--- /dev/null
+++ b/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
@@ -0,0 +1,11 @@
1diff -ur xcursor-transparent-theme-0.1.1~/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am
2--- xcursor-transparent-theme-0.1.1~/cursors/Makefile.am 2003-10-30 12:13:59.000000000 +0000
3+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2004-07-27 12:56:24.000000000 +0100
4@@ -91,6 +91,6 @@
5 $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/
6 for CURSOR in $(CURSOR_NAMES); do \
7 echo '-- Installing cursor '$$CURSOR; \
8- ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
9+ ln -s transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
10 done
11
diff --git a/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
new file mode 100644
index 0000000000..ac03be504c
--- /dev/null
+++ b/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
@@ -0,0 +1,9 @@
1LICENSE = "GPL"
2DESCRIPTION = "Transparent xcursor theme for handheld systems"
3SECTION = "x11/base"
4
5SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
6 file://use-relative-symlinks.patch;patch=1"
7FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
8
9inherit autotools
diff --git a/openembedded/packages/xhost/xhost/autofoo.patch b/openembedded/packages/xhost/xhost/autofoo.patch
new file mode 100644
index 0000000000..b29f017abc
--- /dev/null
+++ b/openembedded/packages/xhost/xhost/autofoo.patch
@@ -0,0 +1,165 @@
1diff -urN xhost.orig/Imakefile xhost/Imakefile
2--- xhost.orig/Imakefile 2003-11-14 16:54:53.000000000 +0100
3+++ xhost/Imakefile 1970-01-01 01:00:00.000000000 +0100
4@@ -1,16 +0,0 @@
5-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:24 cpqbld Exp $
6-#if HasSecureRPC
7-RPC_DEFINES = -DSECURE_RPC
8-#else
9-RPC_DEFINES =
10-#endif
11-KRB5_DEFINES = Krb5Defines
12-KRB5_INCLUDE = Krb5Includes
13- INCLUDES = $(KRB5_INCLUDE)
14- DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
15-LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
16- SRCS = xhost.c
17- OBJS = xhost.o
18- DEFINES = ConnectionFlags $(SIGNAL_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES)
19-
20-ComplexProgramTarget(xhost)
21diff -urN xhost.orig/Makefile.am xhost/Makefile.am
22--- xhost.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
23+++ xhost/Makefile.am 2004-08-15 17:43:47.000000000 +0200
24@@ -0,0 +1,53 @@
25+#
26+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
27+#
28+# Copyright © 2003 Keith Packard
29+#
30+# Permission to use, copy, modify, distribute, and sell this software and its
31+# documentation for any purpose is hereby granted without fee, provided that
32+# the above copyright notice appear in all copies and that both that
33+# copyright notice and this permission notice appear in supporting
34+# documentation, and that the name of Keith Packard not be used in
35+# advertising or publicity pertaining to distribution of the software without
36+# specific, written prior permission. Keith Packard makes no
37+# representations about the suitability of this software for any purpose. It
38+# is provided "as is" without express or implied warranty.
39+#
40+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
41+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
42+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
43+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
44+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
45+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
46+# PERFORMANCE OF THIS SOFTWARE.
47+#
48+
49+AUTOMAKE_OPTIONS = 1.7 foreign
50+
51+AM_CFLAGS = @XHOST_CFLAGS@
52+
53+bin_PROGRAMS = xhost
54+
55+xhost_SOURCES = xhost.c
56+
57+xhost_LDADD = @XHOST_LIBS@
58+
59+man5_MANS=xhost.man
60+
61+EXTRA_DIST= $(man5_MANS)
62+
63+MAINTAINERCLEANFILES = configure \
64+config.guess \
65+config.sub \
66+install-sh \
67+ltmain.sh \
68+missing \
69+mkinstalldirs \
70+aclocal.m4 \
71+Makefile.in \
72+depcomp \
73+autoscan.log \
74+configure.scan \
75+config.h \
76+config.h.in \
77+$(man5_MANS)
78diff -urN xhost.orig/configure.ac xhost/configure.ac
79--- xhost.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
80+++ xhost/configure.ac 2004-08-15 17:43:42.000000000 +0200
81@@ -0,0 +1,57 @@
82+dnl
83+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
84+dnl
85+dnl Copyright © 2003 Keith Packard
86+dnl
87+dnl Permission to use, copy, modify, distribute, and sell this software and its
88+dnl documentation for any purpose is hereby granted without fee, provided that
89+dnl the above copyright notice appear in all copies and that both that
90+dnl copyright notice and this permission notice appear in supporting
91+dnl documentation, and that the name of Keith Packard not be used in
92+dnl advertising or publicity pertaining to distribution of the software without
93+dnl specific, written prior permission. Keith Packard makes no
94+dnl representations about the suitability of this software for any purpose. It
95+dnl is provided "as is" without express or implied warranty.
96+dnl
97+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
98+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
99+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
100+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
101+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
102+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
103+dnl PERFORMANCE OF THIS SOFTWARE.
104+dnl
105+
106+AC_PREREQ(2.57)
107+AC_INIT([xhost],4.4.0,[],xhost)
108+AC_CONFIG_SRCDIR([Makefile.am])
109+AM_INIT_AUTOMAKE([dist-bzip2])
110+AM_MAINTAINER_MODE
111+AM_CONFIG_HEADER(config.h)
112+
113+AC_PROG_CC
114+AC_PROG_INSTALL
115+AC_PROG_LN_S
116+AC_LIBTOOL_WIN32_DLL
117+AM_PROG_LIBTOOL
118+AC_PROG_MAKE_SET
119+
120+PKG_CHECK_MODULES(XHOST, xext xmuu x11)
121+
122+AC_TYPE_SIGNAL
123+
124+# Transport selection
125+AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
126+AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes])
127+AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes])
128+if test "$UNIXCONN" = "yes"; then
129+ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
130+fi
131+if test "$TCPCONN" = "yes"; then
132+ AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
133+fi
134+if test "$IPV6CONN" = "yes"; then
135+ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
136+fi
137+
138+AC_OUTPUT([Makefile])
139diff -urN xhost.orig/xhost.c xhost/xhost.c
140--- xhost.orig/xhost.c 2003-11-14 16:54:53.000000000 +0100
141+++ xhost/xhost.c 2004-08-15 17:53:07.000000000 +0200
142@@ -27,6 +27,10 @@
143
144 */
145
146+#ifdef HAVE_CONFIG_H
147+#include "config.h"
148+#endif
149+
150 #if defined(TCPCONN) || defined(STREAMSCONN)
151 #define NEEDSOCKETS
152 #endif
153@@ -102,11 +106,7 @@
154 static int local_xerror();
155 static char *get_hostname();
156
157-#ifdef SIGNALRETURNSINT
158-#define signal_t int
159-#else
160-#define signal_t void
161-#endif
162+#define signal_t RETSIGTYPE
163 static signal_t nameserver_lost();
164
165 #define NAMESERVER_TIMEOUT 5 /* time to wait for nameserver */
diff --git a/openembedded/packages/xhost/xhost_20040413.bb b/openembedded/packages/xhost/xhost_20040413.bb
new file mode 100644
index 0000000000..7245e7164e
--- /dev/null
+++ b/openembedded/packages/xhost/xhost_20040413.bb
@@ -0,0 +1,14 @@
1FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
2LICENSE = "MIT"
3PV = "0.0cvs${FIXEDCVSDATE}"
4DEPENDS = "x11 xext xmu"
5DESCRIPTION = "server access control program for X"
6MAINTAINER = "Rene Wagner <rw@handhelds.org>"
7SECTION = "x11/base"
8PR = "r2"
9
10SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xhost;date=${FIXEDCVSDATE} \
11 file://autofoo.patch;patch=1"
12S = "${WORKDIR}/xhost"
13
14inherit autotools pkgconfig
diff --git a/openembedded/packages/xmu/xmu_cvs.bb b/openembedded/packages/xmu/xmu_cvs.bb
new file mode 100644
index 0000000000..c7e5f84617
--- /dev/null
+++ b/openembedded/packages/xmu/xmu_cvs.bb
@@ -0,0 +1,21 @@
1PV = "0.0cvs${CVSDATE}"
2LICENSE = "MIT"
3SECTION = "x11/libs"
4PRIORITY = "optional"
5MAINTAINER = "Phil Blundell <pb@handhelds.org>"
6DEPENDS = "xt xext"
7PR = "r2"
8
9SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xmu"
10S = "${WORKDIR}/Xmu"
11
12PACKAGES =+ "xmuu xmuu-dev"
13
14FILES_xmuu = "${libdir}/libXmuu.so.*"
15FILES_xmuu-dev = "${libdir}/libXmuu.so"
16
17inherit autotools pkgconfig
18
19do_stage () {
20 oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
21}