From owner-p4-projects@FreeBSD.ORG  Wed Nov  7 01:33:30 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 6F72EEBE; Wed,  7 Nov 2012 01:33:30 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2F22FEBC
 for <perforce@freebsd.org>; Wed,  7 Nov 2012 01:33:30 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 15AA98FC08
 for <perforce@freebsd.org>; Wed,  7 Nov 2012 01:33:30 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id qA71XTvk088622
 for <perforce@freebsd.org>; Wed, 7 Nov 2012 01:33:29 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id qA71XTh8088619
 for perforce@freebsd.org; Wed, 7 Nov 2012 01:33:29 GMT
 (envelope-from brooks@freebsd.org)
Date: Wed, 7 Nov 2012 01:33:29 GMT
Message-Id: <201211070133.qA71XTh8088619@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 219635 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Nov 2012 01:33:30 -0000

http://p4web.freebsd.org/@@219635?ac=10

Change 219635 by brooks@brooks_zenith on 2012/11/07 01:33:18

	Integrate updates to libimagebox and fix buildworld.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/Makefile#4 edit
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/Makefile#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/readpng/Makefile#2 delete
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/readpng/readpng.c#2 delete
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#7 integrate
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng/readpng.c#1 branch

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/Makefile#4 (text+ko) ====

@@ -4,8 +4,8 @@
 .include <bsd.own.mk>
 
 SUBDIR=	libde4tc \
-	libimagebox \
 	libvuln_magic \
-	libvuln_png
+	libvuln_png \
+	libimagebox
 
 .include <bsd.subdir.mk>

==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/Makefile#2 (text+ko) ====

@@ -19,6 +19,4 @@
 
 #WARNS?=		6
 
-SUBDIR=	readpng
-
 .include <bsd.lib.mk>

==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#2 (text+ko) ====

@@ -112,8 +112,6 @@
 	png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth,
 	    &color_type, &interlace_type, NULL, NULL);
 
-	printf("bit_depth = %d, color_type = %d\n", bit_depth, color_type);
-
 	if (width != ids->is->width || height != ids->is->height) {
 		ids->is->error = 1;
 		goto error;

==== //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#7 (text+ko) ====

@@ -3,6 +3,7 @@
 SUBDIR=		browser \
 		cycle_led \
 		flashit \
+		libexec \
 		minifile \
 		mtlctl \
 		pictview \