###############################################################################

#

# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.

# Use subject to license terms.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the

# "Software"), to deal in the Software without restriction, including

# without limitation the rights to use, copy, modify, merge, publish,

# distribute, and/or sell copies of the Software, and to permit persons

# to whom the Software is furnished to do so, provided that the above

# copyright notice(s) and this permission notice appear in all copies of

# the Software and that both the above copyright notice(s) and this

# permission notice appear in supporting documentation.

# 

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

# 

# Except as contained in this notice, the name of a copyright holder

# shall not be used in advertising or otherwise to promote the sale, use

# or other dealings in this Software without prior written authorization

# of the copyright holder.

#

diff -urp -x '*~' -x '*.orig' src/glx/x11/Makefile src/glx/x11/Makefile

--- src/glx/x11/Makefile	2009-03-12 20:28:49.000000000 -0700

+++ src/glx/x11/Makefile	2009-03-31 09:12:45.627261000 -0700

@@ -69,6 +69,10 @@ INCLUDES = -I. \

diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/Makefile.template

--- src/mesa/drivers/dri/Makefile.template	2009-03-12 20:28:49.000000000 -0700

+++ src/mesa/drivers/dri/Makefile.template	2009-03-31 09:12:45.628778000 -0700

diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/common/dri_util.h src/mesa/drivers/dri/common/dri_util.h

--- src/mesa/drivers/dri/common/dri_util.h	2009-03-12 20:28:49.000000000 -0700

+++ src/mesa/drivers/dri/common/dri_util.h	2009-03-31 09:12:45.637799000 -0700

@@ -59,6 +59,10 @@

 #define GLX_BAD_CONTEXT                    5

+#define u_int64_t uint64_t

+#define u_int32_t uint32_t

+#define u_int8_t uint8_t

+

 typedef struct __DRIswapInfoRec        __DRIswapInfo;

 /* Typedefs to avoid rewriting the world. */

diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/mmio.h

--- src/mesa/drivers/dri/common/mmio.h	2009-01-22 09:38:33.000000000 -0800

+++ src/mesa/drivers/dri/common/mmio.h	2009-03-31 09:12:45.639560000 -0700

@@ -34,6 +34,7 @@

 #define MMIO_H

 #include "main/glheader.h"

+#include "dri_util.h"

 #if defined( __powerpc__ )

diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/i915/intel_tris.c src/mesa/drivers/dri/i915/intel_tris.c

--- src/mesa/drivers/dri/i915/intel_tris.c	2009-03-17 07:48:46.000000000 -0700

+++ src/mesa/drivers/dri/i915/intel_tris.c	2009-03-31 09:12:45.639052000 -0700

@@ -329,7 +329,7 @@ void intel_finish_vb(struct intel_contex

  *                    Emit primitives as inline vertices               *

  ***********************************************************************/

-#ifdef __i386__

+#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))

 #define COPY_DWORDS( j, vb, vertsize, v )			\

 do {								\

    int __tmp;							\

diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/i965/brw_draw_upload.c src/mesa/drivers/dri/i965/brw_draw_upload.c

--- src/mesa/drivers/dri/i965/brw_draw_upload.c	2009-03-12 20:28:49.000000000 -0700

+++ src/mesa/drivers/dri/i965/brw_draw_upload.c	2009-03-31 09:12:45.643357000 -0700

@@ -26,6 +26,7 @@

  **************************************************************************/

 #include <stdlib.h>

+#include <string.h>

 #include "main/glheader.h"

 #include "main/context.h"

@@ -155,6 +156,23 @@ static GLuint byte_types_scale[5] = {

    BRW_SURFACEFORMAT_R8G8B8A8_SSCALED

 };

+#if defined (sun)

+/* Solaris does not have ffsll in libc */

+#define        NBITS_INT       (CHAR_BIT * sizeof (int))

+static int ffsll(long long i)

+{

+	int i1;

+	int ret;

+

+	i1 = i & UINT_MAX;

+	ret = ffs(i1);

+	if (ret == 0) {

+		i1 = (i & 0xffffffff00000000) >> NBITS_INT;

+		ret = ffs(i1) + NBITS_INT;

+	}

+	return ret;

+}

+#endif

 static GLuint get_surface_type( GLenum type, GLuint size, GLboolean normalized )

 {

diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/intel/intel_context.c src/mesa/drivers/dri/intel/intel_context.c

--- src/mesa/drivers/dri/intel/intel_context.c	2009-03-27 17:56:14.000000000 -0700

+++ src/mesa/drivers/dri/intel/intel_context.c	2009-03-31 09:12:45.630903000 -0700

@@ -70,6 +70,11 @@

 #define need_GL_ARB_occlusion_query

@@ -993,6 +998,9 @@ void LOCK_HARDWARE( struct intel_context

@@ -1008,6 +1016,7 @@ void LOCK_HARDWARE( struct intel_context

     if (!sPriv->dri2.enabled) {

 	DRM_CAS(intel->driHwLock, intel->hHWContext,

@@ -1046,5 +1055,9 @@ void UNLOCK_HARDWARE( struct intel_conte

    if (intel->batch->cliprect_mode == REFERENCES_CLIPRECTS)

       intel_batchbuffer_flush(intel->batch);

diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/intel/intel_context.h src/mesa/drivers/dri/intel/intel_context.h

--- src/mesa/drivers/dri/intel/intel_context.h	2009-03-27 17:56:14.000000000 -0700

+++ src/mesa/drivers/dri/intel/intel_context.h	2009-03-31 09:12:45.655815000 -0700

@@ -309,8 +309,12 @@

 void LOCK_HARDWARE( struct intel_context *intel );

 void UNLOCK_HARDWARE( struct intel_context *intel );

+#if defined(__sun)

+#    include <stdlib.h>

+#    define __progname getexecname()

+#else

 extern char *__progname;

-

+#endif

 #define SUBPIXEL_X 0.125

 #define SUBPIXEL_Y 0.125

@@ -352,7 +352,7 @@ do {						\

  * than COPY_DWORDS would:

  * XXX Put this in src/mesa/main/imports.h ???

  */

-#if defined(i386) || defined(__i386__)

+#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))

 static INLINE void * __memcpy(void * to, const void * from, size_t n)

 {

    int d0, d1, d2;

diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/intel/intel_screen.c src/mesa/drivers/dri/intel/intel_screen.c

--- src/mesa/drivers/dri/intel/intel_screen.c	2009-03-17 07:48:46.000000000 -0700

+++ src/mesa/drivers/dri/intel/intel_screen.c	2009-03-31 09:12:45.636871000 -0700

 #include "main/glheader.h"

 #include "main/context.h"

 #include "main/framebuffer.h"

 #include "intel_bufmgr.h"

@@ -292,6 +303,12 @@ static GLboolean intelInitDriver(__DRIsc

diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/intel/server/i830_dri.h src/mesa/drivers/dri/intel/server/i830_dri.h

--- src/mesa/drivers/dri/intel/server/i830_dri.h	2008-08-25 07:46:43.000000000 -0700

+++ src/mesa/drivers/dri/intel/server/i830_dri.h	2009-03-31 09:12:45.654900000 -0700

@@ -21,16 +21,20 @@ typedef struct _I830DRIRec {

diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/radeon/server/radeon_dri.h src/mesa/drivers/dri/radeon/server/radeon_dri.h

--- src/mesa/drivers/dri/radeon/server/radeon_dri.h	2009-01-22 09:38:33.000000000 -0800

+++ src/mesa/drivers/dri/radeon/server/radeon_dri.h	2009-03-31 09:12:45.642139000 -0700

@@ -89,6 +89,7 @@ typedef struct {

     /*@{*/

     drm_handle_t     registerHandle; /**< \brief MMIO register map size */

     drmSize       registerSize;   /**< \brief MMIO register map handle */

+    int      	  padding0;

     /*@}*/

     /**

@@ -97,6 +98,7 @@ typedef struct {

     /*@{*/

     drm_handle_t     statusHandle;   /**< \brief status map handle */

     drmSize       statusSize;     /**< \brief status map size */

+    int		  padding1;

     /*@}*/

     /**

@@ -105,11 +107,13 @@ typedef struct {

     /*@{*/

     drm_handle_t     gartTexHandle;   /**< \brief AGP texture area map handle */

     drmSize       gartTexMapSize;  /**< \brief AGP texture area map size */

+    int 	  padding2;

     int           log2GARTTexGran; /**< \brief AGP texture granularity in log base 2 */

     int           gartTexOffset;   /**< \brief AGP texture area offset in AGP space */

     /*@}*/

     unsigned int  sarea_priv_offset; /**< \brief offset of the private SAREA data*/

+    int		  padding3;

 } RADEONDRIRec, *RADEONDRIPtr;

 #endif