diff options
author | Richard Purdie <richard@openedhand.com> | 2006-05-22 22:15:57 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-05-22 22:15:57 +0000 |
commit | fe4f9d5061e59a8298739de40ca8ab766e132fee (patch) | |
tree | 0fe7931bde9198aad3f5fbf9d922101bc6c6342f | |
parent | a1c255607188f539ed4bb5e3d98ba965c819201c (diff) | |
download | poky-fe4f9d5061e59a8298739de40ca8ab766e132fee.tar.gz |
Add xset
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@407 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r-- | openembedded/packages/xset/xset/autofoo.patch | 109 | ||||
-rw-r--r-- | openembedded/packages/xset/xset/disable-xkb.patch | 18 | ||||
-rw-r--r-- | openembedded/packages/xset/xset_20040817.bb | 18 |
3 files changed, 145 insertions, 0 deletions
diff --git a/openembedded/packages/xset/xset/autofoo.patch b/openembedded/packages/xset/xset/autofoo.patch new file mode 100644 index 0000000000..039d1319e3 --- /dev/null +++ b/openembedded/packages/xset/xset/autofoo.patch | |||
@@ -0,0 +1,109 @@ | |||
1 | diff -urN xset.orig/Makefile.am xset/Makefile.am | ||
2 | --- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 | ||
3 | +++ xset/Makefile.am 2004-08-14 16:32:10.000000000 +0200 | ||
4 | @@ -0,0 +1,53 @@ | ||
5 | +# | ||
6 | +# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ | ||
7 | +# | ||
8 | +# Copyright © 2003 Keith Packard | ||
9 | +# | ||
10 | +# Permission to use, copy, modify, distribute, and sell this software and its | ||
11 | +# documentation for any purpose is hereby granted without fee, provided that | ||
12 | +# the above copyright notice appear in all copies and that both that | ||
13 | +# copyright notice and this permission notice appear in supporting | ||
14 | +# documentation, and that the name of Keith Packard not be used in | ||
15 | +# advertising or publicity pertaining to distribution of the software without | ||
16 | +# specific, written prior permission. Keith Packard makes no | ||
17 | +# representations about the suitability of this software for any purpose. It | ||
18 | +# is provided "as is" without express or implied warranty. | ||
19 | +# | ||
20 | +# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, | ||
21 | +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO | ||
22 | +# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR | ||
23 | +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, | ||
24 | +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER | ||
25 | +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | ||
26 | +# PERFORMANCE OF THIS SOFTWARE. | ||
27 | +# | ||
28 | + | ||
29 | +AUTOMAKE_OPTIONS = 1.7 foreign | ||
30 | + | ||
31 | +AM_CFLAGS = @XSET_CFLAGS@ | ||
32 | + | ||
33 | +bin_PROGRAMS = xset | ||
34 | + | ||
35 | +xset_SOURCES = xset.c | ||
36 | + | ||
37 | +xset_LDADD = @XSET_LIBS@ | ||
38 | + | ||
39 | +man5_MANS=xset.man | ||
40 | + | ||
41 | +EXTRA_DIST= $(man5_MANS) | ||
42 | + | ||
43 | +MAINTAINERCLEANFILES = configure \ | ||
44 | +config.guess \ | ||
45 | +config.sub \ | ||
46 | +install-sh \ | ||
47 | +ltmain.sh \ | ||
48 | +missing \ | ||
49 | +mkinstalldirs \ | ||
50 | +aclocal.m4 \ | ||
51 | +Makefile.in \ | ||
52 | +depcomp \ | ||
53 | +autoscan.log \ | ||
54 | +configure.scan \ | ||
55 | +config.h \ | ||
56 | +config.h.in \ | ||
57 | +$(man5_MANS) | ||
58 | diff -urN xset.orig/autogen.sh xset/autogen.sh | ||
59 | --- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 | ||
60 | +++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200 | ||
61 | @@ -0,0 +1,3 @@ | ||
62 | +#! /bin/sh | ||
63 | +autoreconf -v --install || exit 1 | ||
64 | +./configure --enable-maintainer-mode "$@" | ||
65 | diff -urN xset.orig/configure.ac xset/configure.ac | ||
66 | --- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 | ||
67 | +++ xset/configure.ac 2004-08-17 14:21:25.000000000 +0200 | ||
68 | @@ -0,0 +1,41 @@ | ||
69 | +dnl | ||
70 | +dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ | ||
71 | +dnl | ||
72 | +dnl Copyright © 2003 Keith Packard | ||
73 | +dnl | ||
74 | +dnl Permission to use, copy, modify, distribute, and sell this software and its | ||
75 | +dnl documentation for any purpose is hereby granted without fee, provided that | ||
76 | +dnl the above copyright notice appear in all copies and that both that | ||
77 | +dnl copyright notice and this permission notice appear in supporting | ||
78 | +dnl documentation, and that the name of Keith Packard not be used in | ||
79 | +dnl advertising or publicity pertaining to distribution of the software without | ||
80 | +dnl specific, written prior permission. Keith Packard makes no | ||
81 | +dnl representations about the suitability of this software for any purpose. It | ||
82 | +dnl is provided "as is" without express or implied warranty. | ||
83 | +dnl | ||
84 | +dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, | ||
85 | +dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO | ||
86 | +dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR | ||
87 | +dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, | ||
88 | +dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER | ||
89 | +dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | ||
90 | +dnl PERFORMANCE OF THIS SOFTWARE. | ||
91 | +dnl | ||
92 | + | ||
93 | +AC_PREREQ(2.57) | ||
94 | +AC_INIT([xset],4.4.0,[],xset) | ||
95 | +AC_CONFIG_SRCDIR([Makefile.am]) | ||
96 | +AM_INIT_AUTOMAKE([dist-bzip2]) | ||
97 | +AM_MAINTAINER_MODE | ||
98 | +AM_CONFIG_HEADER(config.h) | ||
99 | + | ||
100 | +AC_PROG_CC | ||
101 | +AC_PROG_INSTALL | ||
102 | +AC_PROG_LN_S | ||
103 | +AC_LIBTOOL_WIN32_DLL | ||
104 | +AM_PROG_LIBTOOL | ||
105 | +AC_PROG_MAKE_SET | ||
106 | + | ||
107 | +PKG_CHECK_MODULES(XSET, xext xextensions xmuu x11) | ||
108 | + | ||
109 | +AC_OUTPUT([Makefile]) | ||
diff --git a/openembedded/packages/xset/xset/disable-xkb.patch b/openembedded/packages/xset/xset/disable-xkb.patch new file mode 100644 index 0000000000..6060fbb995 --- /dev/null +++ b/openembedded/packages/xset/xset/disable-xkb.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | --- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100 | ||
2 | +++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100 | ||
3 | @@ -42,11 +42,15 @@ | ||
4 | AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>]) | ||
5 | CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) | ||
6 | |||
7 | +AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), | ||
8 | + XKB="$enableval", XKB="yes") | ||
9 | +if test "x$XKB" = "xyes" ; then | ||
10 | PKG_CHECK_MODULES(SET_XKB, x11, | ||
11 | [SAVE_CPPFLAGS="$CPPFLAGS" | ||
12 | CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS" | ||
13 | AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>]) | ||
14 | CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) | ||
15 | +fi | ||
16 | |||
17 | PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc, | ||
18 | [SAVE_CPPFLAGS="$CPPFLAGS" | ||
diff --git a/openembedded/packages/xset/xset_20040817.bb b/openembedded/packages/xset/xset_20040817.bb new file mode 100644 index 0000000000..daf57d15c8 --- /dev/null +++ b/openembedded/packages/xset/xset_20040817.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | DESCRIPTION = "user preference utility for X" | ||
2 | LICENSE = "MIT" | ||
3 | MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" | ||
4 | FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" | ||
5 | PV = "0.0+cvs${FIXEDSRCDATE}" | ||
6 | PR = "r1" | ||
7 | |||
8 | DEPENDS = "libx11 libxext xextensions libxmu" | ||
9 | |||
10 | CFLAGS += "-D_GNU_SOURCE" | ||
11 | |||
12 | SECTION = "x11/base" | ||
13 | |||
14 | SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \ | ||
15 | file://autofoo.patch;patch=1" | ||
16 | S = "${WORKDIR}/xset" | ||
17 | |||
18 | inherit autotools pkgconfig | ||