From owner-svn-ports-all@FreeBSD.ORG Tue Apr 21 09:37:15 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 441C65A6; Tue, 21 Apr 2015 09:37:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 258171D2D; Tue, 21 Apr 2015 09:37:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3L9bFNG060908; Tue, 21 Apr 2015 09:37:15 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3L9bEW3060895; Tue, 21 Apr 2015 09:37:14 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201504210937.t3L9bEW3060895@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 21 Apr 2015 09:37:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384416 - in head/graphics/iulib: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Apr 2015 09:37:15 -0000 Author: marino Date: Tue Apr 21 09:37:13 2015 New Revision: 384416 URL: https://svnweb.freebsd.org/changeset/ports/384416 Log: graphics/iulib: Fix c++ template so gcc5 can build iulib, but use clang This error should have appeared with gcc 4.9. According to documentation, "Default arguments on redeclaration of member functions of class template now rejected" The default argument has to appear in first declaration of the template. Fixing this for gcc5 has the pleasant side effect of allowing USE_GCC requirement to be dropped. Clang needed this fix too! Approved by: blanket (gcc5, clang) Added: head/graphics/iulib/files/patch-imglib_imgops.cc (contents, props changed) head/graphics/iulib/files/patch-imglib_imgops.h (contents, props changed) Modified: head/graphics/iulib/Makefile Modified: head/graphics/iulib/Makefile ============================================================================== --- head/graphics/iulib/Makefile Tue Apr 21 09:21:13 2015 (r384415) +++ head/graphics/iulib/Makefile Tue Apr 21 09:37:13 2015 (r384416) @@ -3,7 +3,7 @@ PORTNAME= iulib PORTVERSION= 0.4 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE @@ -21,7 +21,6 @@ SDL_DESC= Enable SDL for graphical debug VIDIO_DESC= Enable Video Input/Output (using ffmpeg) USES= autoreconf libtool python:build tar:tgz -USE_GCC= any GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include Added: head/graphics/iulib/files/patch-imglib_imgops.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/iulib/files/patch-imglib_imgops.cc Tue Apr 21 09:37:13 2015 (r384416) @@ -0,0 +1,11 @@ +--- imglib/imgops.cc.orig 2009-06-09 22:32:20 UTC ++++ imglib/imgops.cc +@@ -133,7 +133,7 @@ namespace iulib { + + template + void addscaled(narray &dest,narray &src, +- V scale=1,int dx=0,int dy=0) { ++ V scale,int dx,int dy) { + for (int i=0; i +- void addscaled(colib::narray &, colib::narray &, V, int, int); ++ void addscaled(colib::narray &dest, colib::narray &src, ++ V scale=1, int dx=0, int dy=0); + template + void tighten(colib::narray &image); + template