[gentoo-commits] proj/x11:master commit in: x11-libs/libdrm/files/

[gentoo-commits] proj/x11:master commit in: x11-libs/libdrm/files/

[Matt Turner]

commit:     6d416078f89c317ed6814ab9e77a324e78656d48
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Nov  2 03:10:19 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Nov  2 03:10:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=6d416078

x11-libs/libdrm: rebase solaris patch, bug 389261

Trivially broken by upstream 961bf9b5c2866ccb4fedf2b45b29fb688519d0db

---
 x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
index 5c148a4..0311a00 100644
--- a/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
+++ b/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
@@ -76,7 +76,7 @@ Index: libdrm-2.4.23/xf86drm.c
 +#ifdef __sun
 +    map.handle = handle;
 +#else
-     map.handle = (void *)handle;
+     map.handle = (void *)(uintptr_t)handle;
 +#endif
  
      if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))

[gentoo-commits] proj/x11:master commit in: x11-libs/libdrm/files/

[Matt Turner]

commit:     d84951eda6d51c84fc559730b6df1a549a13cad4
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Mon Sep 22 17:43:26 2014 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 22 17:43:26 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d84951ed

x11-libs/libdrm: Update solaris patch

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=519380

---
 x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch | 25 ++++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
index 0311a00..4707b8b 100644
--- a/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
+++ b/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
@@ -1,7 +1,7 @@
-Index: libdrm-2.4.23/include/drm/drm.h
+Index: include/drm/drm.h
 ===================================================================
---- libdrm-2.4.23.orig/include/drm/drm.h
-+++ libdrm-2.4.23/include/drm/drm.h
+--- include/drm/drm.h
++++ include/drm/drm.h
 @@ -54,7 +54,11 @@ typedef int32_t  __s32;
  typedef uint32_t __u32;
  typedef int64_t  __s64;
@@ -47,10 +47,10 @@ Index: libdrm-2.4.23/include/drm/drm.h
  };
  
  /**
-Index: libdrm-2.4.23/radeon/radeon_bo_gem.c
+Index: radeon/radeon_bo_gem.c
 ===================================================================
---- libdrm-2.4.23.orig/radeon/radeon_bo_gem.c
-+++ libdrm-2.4.23/radeon/radeon_bo_gem.c
+--- radeon/radeon_bo_gem.c
++++ radeon/radeon_bo_gem.c
 @@ -38,6 +38,13 @@
  #include <string.h>
  #include <sys/mman.h>
@@ -62,13 +62,14 @@ Index: libdrm-2.4.23/radeon/radeon_bo_gem.c
 +#include <stropts.h>
 +#endif
 +
+ #include "libdrm.h"
  #include "xf86drm.h"
  #include "xf86atomic.h"
  #include "drm.h"
-Index: libdrm-2.4.23/xf86drm.c
+Index: xf86drm.c
 ===================================================================
---- libdrm-2.4.23.orig/xf86drm.c
-+++ libdrm-2.4.23/xf86drm.c
+--- xf86drm.c
++++ xf86drm.c
 @@ -972,7 +972,11 @@ int drmRmMap(int fd, drm_handle_t handle
  {
      drm_map_t map;
@@ -91,10 +92,10 @@ Index: libdrm-2.4.23/xf86drm.c
      if (drmIoctl(fd, DRM_IOCTL_MAP_BUFS, &bufs))
  	return NULL;
  
-Index: libdrm-2.4.23/xf86drm.h
+Index: xf86drm.h
 ===================================================================
---- libdrm-2.4.23.orig/xf86drm.h
-+++ libdrm-2.4.23/xf86drm.h
+--- xf86drm.h
++++ xf86drm.h
 @@ -64,6 +64,13 @@
  
  #endif