mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 06:28:55 +02:00
xorgproto, new recipe, combine all proto packages in one
This commit is contained in:
begasus
waddlesplash
90
x11-proto/xorgproto/patches/xorgproto-2018.4.patchset
Normal file
90
x11-proto/xorgproto/patches/xorgproto-2018.4.patchset
Normal file
@@ -0,0 +1,90 @@
|
||||
From 21f368b9b7bc8f540923b6f897e03c80cd526d3c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Sat, 14 Jul 2018 15:24:53 +0200
|
||||
Subject: configure: add proper check for fd_set.bits
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 51d77bd..48f627f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -54,6 +54,28 @@ case $host_os in
|
||||
*) fds_bits_found=false;;
|
||||
esac
|
||||
|
||||
+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_CHECK_MEMBER(fd_set.fds_bits,
|
||||
[
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From b7590df866d76c0abf87f3c68197263d6bf03043 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Sat, 14 Jul 2018 15:26:34 +0200
|
||||
Subject: Assume Haiku uses POSIX thread safe functions
|
||||
|
||||
|
||||
diff --git a/include/X11/Xos_r.h b/include/X11/Xos_r.h
|
||||
index f963b64..f8b727b 100644
|
||||
--- a/include/X11/Xos_r.h
|
||||
+++ b/include/X11/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
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From 60f1b23ba452203e5bbe39a824865a861d52208a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Sat, 14 Jul 2018 15:29:54 +0200
|
||||
Subject: Haiku only has POSIX-mandated passwd fields
|
||||
|
||||
|
||||
diff --git a/include/X11/Xos_r.h b/include/X11/Xos_r.h
|
||||
index f8b727b..970f37d 100644
|
||||
--- a/include/X11/Xos_r.h
|
||||
+++ b/include/X11/Xos_r.h
|
||||
@@ -252,7 +252,7 @@ typedef struct {
|
||||
*/
|
||||
|
||||
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
|
||||
- defined(__APPLE__) || defined(__DragonFly__)
|
||||
+ defined(__APPLE__) || defined(__DragonFly__) || defined(__HAIKU__)
|
||||
static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
|
||||
{
|
||||
memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
|
||||
--
|
||||
2.16.4
|
||||
|
||||
83
x11-proto/xorgproto/xorgproto-2018.4.recipe
Normal file
83
x11-proto/xorgproto/xorgproto-2018.4.recipe
Normal file
@@ -0,0 +1,83 @@
|
||||
SUMMARY="X.Org's protocol headers"
|
||||
DESCRIPTION="The X.Org protocol headers."
|
||||
HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
|
||||
COPYRIGHT="1991 Oracle and/or its affiliates. All rights reserved.
|
||||
1985, 1987, 1988, 1990, 1991, 1993-1996, 1998 The Open Group
|
||||
1987 Digital Equipment Corporation, Maynard, Massachusetts.
|
||||
1987 Apollo Computer Inc., Chelmsford, Massachusetts.
|
||||
1989 Hewlett-Packard Company.
|
||||
1999 The XFree86 Project Inc."
|
||||
LICENSE="MIT (no promotion)"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0"
|
||||
PATCHES="xorgproto-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="any"
|
||||
|
||||
PROVIDES="
|
||||
xorgproto = $portVersion
|
||||
devel:applewmproto = 1.4.2
|
||||
devel:bigreqsproto = 1.1.2
|
||||
devel:compositeproto = 0.4.2
|
||||
devel:damageproto = 1.2.1
|
||||
devel:dmxproto = 2.3.1
|
||||
devel:dri2proto = 2.8
|
||||
devel:dri3proto = 1.2
|
||||
devel:fixesproto = 5.0
|
||||
devel:fontsproto = 2.1.3
|
||||
devel:glproto = 1.4.17
|
||||
devel:inputproto = 2.3.2
|
||||
devel:kbproto = 1.0.7
|
||||
devel:presentproto = 1.2
|
||||
devel:randrproto = 1.6.0
|
||||
devel:recordproto = 1.14.2
|
||||
devel:renderproto = 0.11.1
|
||||
devel:resourceproto = 1.2.0
|
||||
devel:scrnsaverproto = 1.2.2
|
||||
devel:trapproto = 3.4.3
|
||||
devel:videoproto = 2.3.3
|
||||
devel:windowswmproto = 1.0.4
|
||||
devel:xcmiscproto = 1.2.2
|
||||
devel:xextproto = 7.3.0
|
||||
devel:xf86bigfontproto = 1.2.0
|
||||
devel:xf86dgaproto = 2.1
|
||||
devel:xf86driproto = 2.1.1
|
||||
devel:xf86miscproto = 0.9.3
|
||||
devel:xf86vidmodeproto = 2.3.1
|
||||
devel:xineramaproto = 1.2.1
|
||||
devel:xproto = 7.0.32
|
||||
devel:xproxymngproto = 1.0.3
|
||||
"
|
||||
REQUIRES="
|
||||
haiku
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku_devel
|
||||
devel:util_macros
|
||||
devel:xorg_sgml_doctools
|
||||
docbook_xml_dtd
|
||||
docbook_xsl_stylesheets
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoconf
|
||||
cmd:aclocal
|
||||
cmd:awk
|
||||
cmd:gcc
|
||||
cmd:make
|
||||
cmd:pkg_config
|
||||
cmd:xmlto
|
||||
cmd:xsltproc
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -vfi
|
||||
runConfigure ./configure
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
}
|
||||
Reference in New Issue
Block a user