Merge all changes from trunk

This commit is contained in:
Oliver Tappe
2013-03-29 14:04:07 +00:00
parent 888e133171
commit 94cc6aaf85
1052 changed files with 65053 additions and 2541 deletions

View File

@@ -10,7 +10,7 @@ BUILD {
cd inputproto-2.0
libtoolize --force --copy --install
autoreconf -i
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
}
INSTALL {

View File

@@ -10,7 +10,7 @@ BUILD {
cd kbproto-1.0.4
libtoolize --force --copy --install
autoreconf -i
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
}
INSTALL {

View File

@@ -10,7 +10,7 @@ BUILD {
cd xcb-proto-1.6
libtoolize --force --copy --install
autoreconf -i
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}

View File

@@ -10,7 +10,7 @@ BUILD {
cd xextproto-7.1.1
libtoolize --force --copy --install
autoreconf -i
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
}
INSTALL {

View File

@@ -0,0 +1,48 @@
diff --git a/Xos_r.h xproto-7.0.23-git/Xos_r.h
index f963b64..f8b727b 100644
--- a/Xos_r.h
+++ xproto-7.0.23-git/Xos_r.h
@@ -88,6 +88,10 @@ in this Software without prior written authorization from The Open Group.
# endif
#endif /* _XOS_R_H */
+#ifdef __HAIKU__
+#define _POSIX_THREAD_SAFE_FUNCTIONS
+#endif
+
#ifndef WIN32
#ifdef __cplusplus
diff --git a/configure.ac xproto-7.0.23-git/configure.ac
index c4acf24..b3c82aa 100644
--- a/configure.ac
+++ xproto-7.0.23-git/configure.ac
@@ -99,6 +99,28 @@ if test "x$fds_bits_found" = xfalse ; then
fi
if test "x$fds_bits_found" = xfalse ; then
+AC_CHECK_MEMBER(fd_set.bits,
+ [
+ fds_bits_found=plain_simple
+ USE_FDS_BITS="bits"
+ ],,
+ [
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #endif
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif
+ ])
+fi
+
+if test "x$fds_bits_found" = xfalse ; then
AC_MSG_ERROR([Could not determine how to access the fds_bits or equivalent
structure in fd_set on your platform.])
fi

View File

@@ -9,7 +9,7 @@ BUILD {
cd xproto-7.0.16
libtoolize --force --copy --install
autoreconf -i
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
}
INSTALL {

View File

@@ -0,0 +1,27 @@
DESCRIPTION="xproto"
HOMEPAGE="http://cgit.freedesktop.org/xorg/proto/xproto/"
COPYRIGHT="1991, Oracle and/or its affiliates. All rights reserved.
1985, 1987, 1988, 1990, 1991, 1993-1996, 1998 The Open Group
1987 by Digital Equipment Corporation, Maynard, Massachusetts.
1987 by Apollo Computer Inc., Chelmsford, Massachusetts.
1989 by Hewlett-Packard Company.
1999 The XFree86 Project Inc."
LICENSE="MIT (no promotion)"
SRC_URI="git://anongit.freedesktop.org/xorg/proto/xproto"
#CHECKSUM_MD5=""
REVISION="1"
STATUS_HAIKU="untested"
DEPEND=""
BUILD {
cd xproto-7.0.23-git
./autogen.sh -V
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--datadir=`finddir B_COMMON_LIB_DIRECTORY`
make
}
INSTALL {
cd xproto-7.0.23-git
make install
}