Attachment 304945 Details for Bug 445861 – patch

patch

mesa-6.5.1-glw.patch (text/plain), 3.70 KB, created by Alan Matsuoka on 2008-05-09 14:33:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Matsuoka

Created: 2008-05-09 14:33:56 UTC

Size: 3.70 KB

patch

obsolete

>--- Mesa-6.5.1/src/glw/GLwM2DrawA.c.glw	2008-04-29 14:42:33.000000000 -0400
>+++ Mesa-6.5.1/src/glw/GLwM2DrawA.c	2008-04-29 14:41:27.000000000 -0400
>@@ -0,0 +1,53 @@
>+/*
>+ * (c) Copyright 1993, Silicon Graphics, Inc.
>+ * ALL RIGHTS RESERVED 
>+ * Permission to use, copy, modify, and distribute this software for 
>+ * any purpose and without fee is hereby granted, provided that the above
>+ * copyright notice appear in all copies and that both the copyright notice
>+ * and this permission notice appear in supporting documentation, and that 
>+ * the name of Silicon Graphics, Inc. not be used in advertising
>+ * or publicity pertaining to distribution of the software without specific,
>+ * written prior permission. 
>+ *
>+ * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
>+ * AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
>+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
>+ * FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL SILICON
>+ * GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
>+ * SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
>+ * KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
>+ * LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
>+ * THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC.  HAS BEEN
>+ * ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
>+ * ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
>+ * POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
>+ * 
>+ * 
>+ * US Government Users Restricted Rights 
>+ * Use, duplication, or disclosure by the Government is subject to
>+ * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
>+ * (c)(1)(ii) of the Rights in Technical Data and Computer Software
>+ * clause at DFARS 252.227-7013 and/or in similar or successor
>+ * clauses in the FAR or the DOD or NASA FAR Supplement.
>+ * Unpublished-- rights reserved under the copyright laws of the
>+ * United States.  Contractor/manufacturer is Silicon Graphics,
>+ * Inc., 2011 N.  Shoreline Blvd., Mountain View, CA 94039-7311.
>+ *
>+ * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
>+ */
>+/* $XFree86$ */
>+
>+#define __GLX_MOTIF 2
>+
>+#define XmVERSION 2
>+#define XmREVISION 0
>+#define XmVersion (XmVERSION * 1000 + XmREVISION)
>+#define XmVERSION_STRING "GLwDrawingArea fake M*tif 2.X"
>+#define XmUPDATE_LEVEL 0
>+
>+
>+#define __GLX_INCLUDE_XM_H
>+#define __GLX_INCLUDE_PRIMITIVE_P_H
>+
>+#include "GLwDrawA.c"
>+
>--- Mesa-6.5.1/src/glw/GLwDrawA.h.glw	2008-04-29 14:39:44.000000000 -0400
>+++ Mesa-6.5.1/src/glw/GLwDrawA.h	2008-04-29 14:40:21.000000000 -0400
>@@ -133,12 +133,25 @@
> 
> #ifdef __GLX_MOTIF
> 
>+#if XmVERSION == 2
>+/*
>+#  define _GLwMDrawingAreaClassRec      _GLwM2DrawingAreaClassRec
>+#  define _GLwMDrawingAreaRec           _GLwM2DrawingAreaRec
>+*/
>+#  define glwMDrawingAreaWidgetClass    glwM2DrawingAreaWidgetClass
>+#  define glwMDrawingAreaClassRec       glwM2DrawingAreaClassRec
>+#  define GLwCreateMDrawingArea         GLwCreateM2DrawingArea
>+#else
>+#error "Sorry, unknown Motif version."
>+#endif /* XmVERSION */
>+
> typedef struct _GLwMDrawingAreaClassRec	*GLwMDrawingAreaWidgetClass;
> typedef struct _GLwMDrawingAreaRec	*GLwMDrawingAreaWidget;
> 
> extern WidgetClass glwMDrawingAreaWidgetClass;
> 
> 
>+
> #else 
> 
> typedef struct _GLwDrawingAreaClassRec	*GLwDrawingAreaWidgetClass;
>--- Mesa-6.5.1/configs/default.glw	2008-04-23 14:20:16.000000000 -0400
>+++ Mesa-6.5.1/configs/default	2008-04-23 14:20:16.000000000 -0400
>@@ -55,7 +55,8 @@
> 
> # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
> # order to build the Motif widget too)
>-GLW_SOURCES = GLwDrawA.c
>+GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
>+GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXm -lXt -lX11
> 
> 
> # Directories to build

Actions: View

Attachments on bug 445861: 304945 | 304947