diff options
| author | hans <hans> | 2012-02-16 20:30:55 +0000 |
|---|---|---|
| committer | hans <hans> | 2012-02-16 20:30:55 +0000 |
| commit | 19a4ca1b540ea2e5828e0ed00623a6f83963aea9 (patch) | |
| tree | 60d0f870e414d3fb1047709a39e993cc868d1528 /x11 | |
| parent | 25edae20e3cfdda37487ff7d976d0b2fae53f674 (diff) | |
| download | pkgsrc-19a4ca1b540ea2e5828e0ed00623a6f83963aea9.tar.gz | |
Make this build on SunOS.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libdrm/Makefile | 4 | ||||
| -rw-r--r-- | x11/libdrm/distinfo | 5 | ||||
| -rw-r--r-- | x11/libdrm/patches/patch-ac | 14 | ||||
| -rw-r--r-- | x11/libdrm/patches/patch-libkms_linux.c | 16 |
4 files changed, 33 insertions, 6 deletions
diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile index 99ff688f816..fcf2bf75cd4 100644 --- a/x11/libdrm/Makefile +++ b/x11/libdrm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2010/05/02 22:24:38 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2012/02/16 20:30:55 hans Exp $ # DISTNAME= libdrm-2.4.20 @@ -13,7 +13,7 @@ COMMENT= Userspace interface to kernel DRM services PKG_DESTDIR_SUPPORT= user-destdir ONLY_FOR_PLATFORM= NetBSD-*-* DragonFly-*-* FreeBSD-*-* OpenBSD-*-* \ - Linux-*-* + Linux-*-* SunOS-*-* USE_PKGLOCALEDIR= yes USE_TOOLS+= pkg-config diff --git a/x11/libdrm/distinfo b/x11/libdrm/distinfo index 81670a3be84..658d0294a70 100644 --- a/x11/libdrm/distinfo +++ b/x11/libdrm/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.13 2010/04/19 18:46:15 tnn Exp $ +$NetBSD: distinfo,v 1.14 2012/02/16 20:30:55 hans Exp $ SHA1 (libdrm-2.4.20.tar.bz2) = f1448ac0f1c7a5f74a86d2fb50941fc12dc932db RMD160 (libdrm-2.4.20.tar.bz2) = 5581c45abfb9cb2bd0b95d4754d7812bb8323e3a Size (libdrm-2.4.20.tar.bz2) = 400812 bytes SHA1 (patch-ab) = 66dadd3244bfa9c69be0982fd2108deb94483de2 -SHA1 (patch-ac) = 61635a93d4b83783023114cd96993dc1075cbe1b +SHA1 (patch-ac) = ad084f0e3e89551ca7a9b8aaaf3e9723ea420a9e SHA1 (patch-ad) = ea3ef8de8db782ddab23f182f1e6bd9d8f612a78 +SHA1 (patch-libkms_linux.c) = 737d0a8e7b742ee9d24fec94c72de6b4915dd675 diff --git a/x11/libdrm/patches/patch-ac b/x11/libdrm/patches/patch-ac index cff1e4f65c7..2b11b378325 100644 --- a/x11/libdrm/patches/patch-ac +++ b/x11/libdrm/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2010/04/16 13:43:36 tnn Exp $ +$NetBSD: patch-ac,v 1.4 2012/02/16 20:30:56 hans Exp $ --- xf86drm.h.orig 2010-03-05 23:21:13.000000000 +0000 +++ xf86drm.h @@ -14,7 +14,17 @@ $NetBSD: patch-ac,v 1.3 2010/04/16 13:43:36 tnn Exp $ #include <stdint.h> #include <drm.h> -@@ -333,7 +337,12 @@ typedef struct _drmSetVersion { +@@ -55,6 +59,9 @@ + #else /* One of the *BSDs */ + + #include <sys/ioccom.h> ++#ifdef __sun ++#define _IOC(d, x, y, t) ((int)((uint32_t)(d | (((sizeof (t)) & IOCPARM_MASK)<<16) | (x<<8) | y))) ++#endif + #define DRM_IOCTL_NR(n) ((n) & 0xff) + #define DRM_IOC_VOID IOC_VOID + #define DRM_IOC_READ IOC_OUT +@@ -333,7 +340,12 @@ typedef struct _drmSetVersion { #define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ #define DRM_LOCK_CONT 0x40000000U /**< Hardware lock is contended */ diff --git a/x11/libdrm/patches/patch-libkms_linux.c b/x11/libdrm/patches/patch-libkms_linux.c new file mode 100644 index 00000000000..12634900427 --- /dev/null +++ b/x11/libdrm/patches/patch-libkms_linux.c @@ -0,0 +1,16 @@ +$NetBSD: patch-libkms_linux.c,v 1.1 2012/02/16 20:30:56 hans Exp $ + +--- libkms/linux.c.orig 2010-03-06 00:21:13.000000000 +0100 ++++ libkms/linux.c 2012-01-10 20:40:06.019270181 +0100 +@@ -40,6 +40,11 @@ + + #include <sys/stat.h> + ++#ifdef __sun ++#include <sys/types.h> ++#include <sys/mkdev.h> ++#endif ++ + #include "internal.h" + + #define PATH_SIZE 512 |