From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 11 08:10:04 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3130B16A418 for ; Fri, 11 Jan 2008 08:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1E62313C45B for ; Fri, 11 Jan 2008 08:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m0B8A3wl051031 for ; Fri, 11 Jan 2008 08:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m0B8A3lk051030; Fri, 11 Jan 2008 08:10:03 GMT (envelope-from gnats) Resent-Date: Fri, 11 Jan 2008 08:10:03 GMT Resent-Message-Id: <200801110810.m0B8A3lk051030@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pietro Cerutti" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A0C016A419 for ; Fri, 11 Jan 2008 08:05:43 +0000 (UTC) (envelope-from gahr@gahr.ch) Received: from cpanel03.rubas-s03.net (cpanel03.rubas-s03.net [195.182.222.73]) by mx1.freebsd.org (Postfix) with ESMTP id 1BF6E13C458 for ; Fri, 11 Jan 2008 08:05:43 +0000 (UTC) (envelope-from gahr@gahr.ch) Received: from 80-218-191-236.dclient.hispeed.ch ([80.218.191.236] helo=gahrtop.localhost) by cpanel03.rubas-s03.net with esmtpa (Exim 4.68) (envelope-from ) id 1JDEta-0005iX-73; Fri, 11 Jan 2008 09:05:42 +0100 Received: from gahrtop.localhost (localhost [127.0.0.1]) by gahrtop.localhost (Postfix) with ESMTP id 1961D50848; Fri, 11 Jan 2008 09:03:56 +0100 (CET) Message-Id: <1200038636.13090@gahrtop.localhost> Date: Fri, 11 Jan 2008 09:03:56 +0100 From: "Pietro Cerutti" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: randolf.schultz@gmail.com Subject: ports/119559: [patch] games/ayam fix crash when parsing shaders X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 08:10:04 -0000 >Number: 119559 >Category: ports >Synopsis: [patch] games/ayam fix crash when parsing shaders >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jan 11 08:10:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Pietro Cerutti >Release: FreeBSD 8.0-CURRENT i386 >Organization: >Environment: System: FreeBSD 8.0-CURRENT #20: Tue Jan 8 15:03:14 CET 2008 root@gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034 >Description: Author notes that since aqsis 1.2, parsing shaders causes ayam to crash. >How-To-Repeat: >Fix: --- _ayam.diff begins here --- --- files/patch-aycore_shader.c.orig 2008-01-10 19:21:46.000000000 +0100 +++ files/patch-aycore_shader.c 2008-01-10 19:24:01.000000000 +0100 @@ -9,6 +9,30 @@ #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; --- Makefile.orig 2008-01-10 19:27:42.000000000 +0100 +++ Makefile 2008-01-10 20:51:45.000000000 +0100 @@ -7,6 +7,7 @@ PORTNAME= ayam PORTVERSION= 1.13 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF DISTNAME= ${PORTNAME}${PORTVERSION}.src --- _ayam.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: