Attachment #83722 for bug #119559

View | Details | Raw Unified | Return to bug 119559
Collapse All | Expand All




 #else
   /* change all ; to : in shader search path */
   Tcl_DStringInit(&ds);
@@ -415,7 +415,11 @@
 	}
 
       /* XXXX temporarily discard array arguments   */
+#ifdef AYAQSIS10
       if(symbol->svd_arraylen < 1)
+#else
+      if(symbol->svd_arraylen < 2)
+#endif
 	{
 
       Tcl_DStringAppend(&ds, "{ ", -1);
@@ -450,7 +454,10 @@
 	  break;
 	}
 
-      arraylen = symbol->svd_arraylen;
+      arraylen = symbol->svd_arraylen-1;
+#ifdef AYAQSIS10
+      arraylen++;
+#endif
       sprintf(buffer, "%d ", arraylen);
       Tcl_DStringAppend(&ds, buffer, -1);

@@ -1094,7 +1094,8 @@
  ay_mat_object *material = NULL;
  ay_shader *newshader = NULL, **shader = NULL;

Lines 7-12 Link Here

(-)Makefile (+1 lines)
7		7
8	PORTNAME= ayam	8	PORTNAME= ayam
9	PORTVERSION= 1.13	9	PORTVERSION= 1.13
		10	PORTREVISION= 1
10	CATEGORIES= graphics	11	CATEGORIES= graphics
11	MASTER_SITES= SF	12	MASTER_SITES= SF
12	DISTNAME= ${PORTNAME}${PORTVERSION}.src	13	DISTNAME= ${PORTNAME}${PORTVERSION}.src

Return to bug 119559

Lines 9-14 Link Here

(-)files/patch-aycore_shader.c (+24 lines)
9	#else	9	#else
10	/* change all ; to : in shader search path */	10	/* change all ; to : in shader search path */
11	Tcl_DStringInit(&ds);	11	Tcl_DStringInit(&ds);
		12	@@ -415,7 +415,11 @@
		13	}
		14
		15	/* XXXX temporarily discard array arguments */
		16	+#ifdef AYAQSIS10
		17	if(symbol->svd_arraylen < 1)
		18	+#else
		19	+ if(symbol->svd_arraylen < 2)
		20	+#endif
		21	{
		22
		23	Tcl_DStringAppend(&ds, "{ ", -1);
		24	@@ -450,7 +454,10 @@
		25	break;
		26	}
		27
		28	- arraylen = symbol->svd_arraylen;
		29	+ arraylen = symbol->svd_arraylen-1;
		30	+#ifdef AYAQSIS10
		31	+ arraylen++;
		32	+#endif
		33	sprintf(buffer, "%d ", arraylen);
		34	Tcl_DStringAppend(&ds, buffer, -1);
		35
12	@@ -1094,7 +1094,8 @@	36	@@ -1094,7 +1094,8 @@
13	ay_mat_object *material = NULL;	37	ay_mat_object *material = NULL;
14	ay_shader newshader = NULL, *shader = NULL;	38	ay_shader newshader = NULL, *shader = NULL;