Collapse the two solaris patches in one, and remove solaris patching for nouveau (meaningless). Acked by scarabeus.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

5 files changed, 48 insertions, 56 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 829d97b1e6b1..e0d50354657f 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libdrm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.152 2011/03/15 21:14:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.153 2011/03/28 22:08:38 flameeyes Exp $
+
+  28 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/libdrm-2.4.15-solaris.patch, -files/libdrm-2.4.16-solaris.patch,
+  libdrm-2.4.23.ebuild, +files/libdrm-2.4.23-solaris.patch,
+  libdrm-2.4.24.ebuild:
+  Collapse the two solaris patches in one, and remove solaris patching for
+  nouveau (meaningless). Acked by scarabeus.
 
   15 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> libdrm-2.4.24.ebuild:
   ppc/ppc64 stable wrt #359059
diff --git a/x11-libs/libdrm/files/libdrm-2.4.15-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.15-solaris.patch
deleted file mode 100644
index f344f0c75afc..000000000000
--- a/x11-libs/libdrm/files/libdrm-2.4.15-solaris.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=288064
-
---- libdrm/nouveau/nouveau_bo.c
-+++ libdrm/nouveau/nouveau_bo.c
-@@ -31,6 +31,12 @@
- #include <sys/mman.h>
- #include <sys/ioctl.h>
- 
-+/* On solaris unistd.h and stropts.h are needed for ioctl */
-+#ifdef __sun
-+#include <unistd.h>
-+#include <stropts.h>
-+#endif
-+
- #include "nouveau_private.h"
- 
- int
---- libdrm/radeon/radeon_bo_gem.c
-+++ libdrm/radeon/radeon_bo_gem.c
-@@ -39,6 +39,13 @@
- #include <sys/mman.h>
- #include <sys/ioctl.h>
- #include <errno.h>
-+
-+/* On solaris unistd.h and stropts.h are needed for ioctl */
-+#ifdef __sun
-+#include <unistd.h>
-+#include <stropts.h>
-+#endif
-+
- #include "xf86drm.h"
- #include "drm.h"
- #include "radeon_drm.h"
diff --git a/x11-libs/libdrm/files/libdrm-2.4.16-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
index 90f9a3de7c6e..5c148a41f500 100644
--- a/x11-libs/libdrm/files/libdrm-2.4.16-solaris.patch
+++ b/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
@@ -1,10 +1,8 @@
-This is a reapply (hopefully in the relevant places) of the original
-patch found here:
-http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
-
---- libdrm-2.4.16/include/drm/drm.h
-+++ libdrm-2.4.16/include/drm/drm.h
-@@ -54,7 +54,11 @@
+Index: libdrm-2.4.23/include/drm/drm.h
+===================================================================
+--- libdrm-2.4.23.orig/include/drm/drm.h
++++ libdrm-2.4.23/include/drm/drm.h
+@@ -54,7 +54,11 @@ typedef int32_t  __s32;
  typedef uint32_t __u32;
  typedef int64_t  __s64;
  typedef uint64_t __u64;
@@ -16,7 +14,7 @@ http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
  
  #endif
  
-@@ -210,12 +214,22 @@
+@@ -210,12 +214,22 @@ struct drm_ctx_priv_map {
   * \sa drmAddMap().
   */
  struct drm_map {
@@ -39,9 +37,9 @@ http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
  	int mtrr;		 /**< MTRR slot used */
  	/*   Private data */
  };
-@@ -375,6 +389,9 @@
- 	int count;		/**< Length of the buffer list */
+@@ -379,6 +393,9 @@ struct drm_buf_map {
  	void *virtual;		/**< Mmap'd area in user-virtual */
+ #endif
  	struct drm_buf_pub *list;	/**< Buffer information */
 +#ifdef __sun
 +	int fd;
@@ -49,9 +47,29 @@ http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
  };
  
  /**
---- libdrm-2.4.16/xf86drm.c
-+++ libdrm-2.4.16/xf86drm.c
-@@ -967,7 +967,11 @@
+Index: libdrm-2.4.23/radeon/radeon_bo_gem.c
+===================================================================
+--- libdrm-2.4.23.orig/radeon/radeon_bo_gem.c
++++ libdrm-2.4.23/radeon/radeon_bo_gem.c
+@@ -38,6 +38,13 @@
+ #include <string.h>
+ #include <sys/mman.h>
+ #include <errno.h>
++
++/* On solaris unistd.h and stropts.h are needed for ioctl */
++#ifdef __sun
++#include <unistd.h>
++#include <stropts.h>
++#endif
++
+ #include "xf86drm.h"
+ #include "xf86atomic.h"
+ #include "drm.h"
+Index: libdrm-2.4.23/xf86drm.c
+===================================================================
+--- libdrm-2.4.23.orig/xf86drm.c
++++ libdrm-2.4.23/xf86drm.c
+@@ -972,7 +972,11 @@ int drmRmMap(int fd, drm_handle_t handle
  {
      drm_map_t map;
  
@@ -63,7 +81,7 @@ http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
  
      if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
  	return -errno;
-@@ -1205,6 +1209,9 @@
+@@ -1210,6 +1214,9 @@ drmBufMapPtr drmMapBufs(int fd)
      bufs.count = 0;
      bufs.list  = NULL;
      bufs.virtual = NULL;
@@ -73,8 +91,10 @@ http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
      if (drmIoctl(fd, DRM_IOCTL_MAP_BUFS, &bufs))
  	return NULL;
  
---- libdrm-2.4.16/xf86drm.h
-+++ libdrm-2.4.16/xf86drm.h
+Index: libdrm-2.4.23/xf86drm.h
+===================================================================
+--- libdrm-2.4.23.orig/xf86drm.h
++++ libdrm-2.4.23/xf86drm.h
 @@ -64,6 +64,13 @@
  
  #endif
diff --git a/x11-libs/libdrm/libdrm-2.4.23.ebuild b/x11-libs/libdrm/libdrm-2.4.23.ebuild
index b0d0b9a9c735..073865381677 100644
--- a/x11-libs/libdrm/libdrm-2.4.23.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.23.ebuild,v 1.8 2011/03/05 17:55:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.23.ebuild,v 1.9 2011/03/28 22:08:38 flameeyes Exp $
 
 EAPI=3
 inherit xorg-2
@@ -28,8 +28,7 @@ RDEPEND="dev-libs/libpthread-stubs"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.16-solaris.patch
-	"${FILESDIR}"/${PN}-2.4.15-solaris.patch
+	"${FILESDIR}"/${PN}-2.4.23-solaris.patch
 )
 
 pkg_setup() {
diff --git a/x11-libs/libdrm/libdrm-2.4.24.ebuild b/x11-libs/libdrm/libdrm-2.4.24.ebuild
index e9756c751f17..80329615a1d7 100644
--- a/x11-libs/libdrm/libdrm-2.4.24.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.24.ebuild,v 1.2 2011/03/15 21:14:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.24.ebuild,v 1.3 2011/03/28 22:08:38 flameeyes Exp $
 
 EAPI=4
 inherit xorg-2
@@ -28,8 +28,7 @@ RDEPEND="dev-libs/libpthread-stubs"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.16-solaris.patch
-	"${FILESDIR}"/${PN}-2.4.15-solaris.patch
+	"${FILESDIR}"/${PN}-2.4.23-solaris.patch
 )
 
 pkg_setup() {