From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 16 20:40:05 2011 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 18F661065673 for ; Sun, 16 Jan 2011 20:40:05 +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 E229E8FC23 for ; Sun, 16 Jan 2011 20:40:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p0GKe4eE083623 for ; Sun, 16 Jan 2011 20:40:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p0GKe4NB083622; Sun, 16 Jan 2011 20:40:04 GMT (envelope-from gnats) Resent-Date: Sun, 16 Jan 2011 20:40:04 GMT Resent-Message-Id: <201101162040.p0GKe4NB083622@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, "G. Paul Ziemba" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDD0F106566B for ; Sun, 16 Jan 2011 20:39:15 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (unknown [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id ADA058FC14 for ; Sun, 16 Jan 2011 20:39:15 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p0GKdFrd064409 for ; Sun, 16 Jan 2011 20:39:15 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p0GKdEx8064408; Sun, 16 Jan 2011 20:39:14 GMT (envelope-from nobody) Message-Id: <201101162039.p0GKdEx8064408@red.freebsd.org> Date: Sun, 16 Jan 2011 20:39:14 GMT From: "G. Paul Ziemba" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/154065: dvdauthor patch file is incorrect 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: Sun, 16 Jan 2011 20:40:05 -0000 >Number: 154065 >Category: ports >Synopsis: dvdauthor patch file is incorrect >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Jan 16 20:40:04 UTC 2011 >Closed-Date: >Last-Modified: >Originator: G. Paul Ziemba >Release: 8.2-PRERELEASE >Organization: >Environment: FreeBSD hairball.ziemba.us 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Tue Jan 11 22:26:31 PST 2011 root@hairball:/usr/obj/usr/src/sys/GPZ-110111 i386 >Description: /usr/ports/multimedia/dvdauthor/files/patch-src__subgen-image.c appears to be in the form of a patch to create the actual desired patch-src__subgen-image.c. Through some luck it happens to result in the correct patch being applied on the Nth iteration of the build (N=2 maybe?), it fails for other iterations. >How-To-Repeat: cd /usr/ports/multimedia/dvdauthor sudo make sudo make sudo make >Fix: Here are the desired contents of files/patch-src__subgen-image.c: --- src/subgen-image.c.orig 2007-01-12 19:40:42.000000000 -0600 +++ src/subgen-image.c 2010-07-15 19:56:30.000000000 -0600 @@ -203,7 +203,7 @@ png_struct *ps; png_info *pi; png_byte **rowp; - unsigned long width,height; + png_uint_32 width,height; int bit_depth,color_type,channels,x,y; fp=fopen(s->fname,"rb"); >Release-Note: >Audit-Trail: >Unformatted: