From owner-freebsd-bugs@FreeBSD.ORG Sun Mar 23 19:40:01 2014 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24FFE41D for ; Sun, 23 Mar 2014 19:40:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 014A5D5C for ; Sun, 23 Mar 2014 19:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2NJe0kO097664 for ; Sun, 23 Mar 2014 19:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2NJe0PF097663; Sun, 23 Mar 2014 19:40:00 GMT (envelope-from gnats) Resent-Date: Sun, 23 Mar 2014 19:40:00 GMT Resent-Message-Id: <201403231940.s2NJe0PF097663@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Hannes Hauswedell Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4FE342F8 for ; Sun, 23 Mar 2014 19:35:38 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3C692D1C for ; Sun, 23 Mar 2014 19:35:38 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s2NJZbRK052309 for ; Sun, 23 Mar 2014 19:35:37 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s2NJZbnK052304; Sun, 23 Mar 2014 19:35:37 GMT (envelope-from nobody) Message-Id: <201403231935.s2NJZbnK052304@cgiserv.freebsd.org> Date: Sun, 23 Mar 2014 19:35:37 GMT From: Hannes Hauswedell To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: misc/187858: update graphics/luminance to latest Qt4-Version X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Mar 2014 19:40:01 -0000 >Number: 187858 >Category: misc >Synopsis: update graphics/luminance to latest Qt4-Version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Mar 23 19:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Hannes Hauswedell >Release: 10.0-RELEASE >Organization: FSFE >Environment: FreeBSD fbsdmain 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Update to 2.3.1. 2.4.0 requires Qt5, so we have to wait for that to get the latest version. >How-To-Repeat: - >Fix: apply patch Patch attached with submission follows: diff -u luminance/Makefile luminanceNEW/Makefile --- luminance/Makefile 2013-03-22 21:06:14.000000000 +0100 +++ luminanceNEW/Makefile 2014-03-23 20:24:48.518562234 +0100 @@ -1,13 +1,8 @@ -# New ports collection makefile for: Luminance HDR (nee Qtpfsgui) -# Date created: 28 Jul 2007 -# Whom: Yinghong Liu -# -# $FreeBSD: graphics/luminance/Makefile 314960 2013-03-22 20:06:14Z makc $ -# +# Created by: Yinghong Liu +# $FreeBSD: head/graphics/luminance/Makefile 341289 2014-01-26 21:20:03Z rakuco $ PORTNAME= luminance-hdr -PORTREVISION= 1 -DISTVERSION= 2.3.0 +DISTVERSION= 2.3.1 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} @@ -30,8 +25,8 @@ USE_QT4= gui sql webkit xml linguist_build moc_build qmake_build \ rcc_build uic_build imageformats_run INSTALLS_ICONS= yes -MAKE_JOBS_SAFE= yes +NO_STAGE= yes post-patch: # Do not install yet another copy of GPL (we use license framework instead) # and fix installation path for docs (but not for internal help files) @@ -49,4 +44,20 @@ 's,@GIT_SHA1@,be5409f2ed028b0a509d3f4cd44a970a09d2ef6c,' \ ${WRKSRC}/src/Common/GitSHA1.cpp.in +# Include in addition to where necessary, as this +# is required for building with libc++ + @${REINPLACE_CMD} -E '1s|^|#include \|;' \ + ${WRKSRC}/src/TonemappingOperators/drago03/pfstmo_drago03.cpp \ + ${WRKSRC}/src/TonemappingOperators/reinhard02/pfstmo_reinhard02.cpp \ + ${WRKSRC}/src/TonemappingOperators/reinhard05/pfstmo_reinhard05.cpp \ + ${WRKSRC}/src/TonemappingOperators/mantiuk08/display_function.cpp \ + ${WRKSRC}/src/TonemappingOperators/mantiuk08/display_size.cpp \ + ${WRKSRC}/src/TonemappingOperators/mantiuk08/pfstmo_mantiuk08.cpp \ + ${WRKSRC}/src/TonemappingOperators/fattal02/pfstmo_fattal02.cpp \ + ${WRKSRC}/src/TonemappingOperators/durand02/pfstmo_durand02.cpp \ + ${WRKSRC}/src/TonemappingOperators/pattanaik00/pfstmo_pattanaik00.cpp \ + ${WRKSRC}/src/Libpfs/io/pfsreader.cpp \ + ${WRKSRC}/src/Libpfs/io/rgbereader.cpp \ + ${WRKSRC}/src/Libpfs/colorspace/colorspace.cpp + .include diff -u luminance/distinfo luminanceNEW/distinfo --- luminance/distinfo 2012-09-21 17:19:13.000000000 +0200 +++ luminanceNEW/distinfo 2014-03-23 19:12:16.914558094 +0100 @@ -1,2 +1,2 @@ -SHA256 (luminance-hdr-2.3.0.tar.bz2) = dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676 -SIZE (luminance-hdr-2.3.0.tar.bz2) = 5398576 +SHA256 (luminance-hdr-2.3.1.tar.bz2) = c2a4764986bf8860d448530f3c8d76143d7504cebb07b3e58e37eb0db5347722 +SIZE (luminance-hdr-2.3.1.tar.bz2) = 10323806 Only in luminance: files diff -u luminance/pkg-plist luminanceNEW/pkg-plist --- luminance/pkg-plist 2012-09-21 17:19:13.000000000 +0200 +++ luminanceNEW/pkg-plist 2014-03-23 20:17:28.540561608 +0100 @@ -60,9 +60,6 @@ %%DATADIR%%/help/en/tonemapping_cli.html %%DATADIR%%/help/en/tonemapping_interactive.html %%DATADIR%%/help/en/workflow.html -%%DATADIR%%/help/js/jquery.js -%%DATADIR%%/help/js/jquery.jtabs.pack.js -@dirrm %%DATADIR%%/help/js @dirrm %%DATADIR%%/help/en/images @dirrm %%DATADIR%%/help/en @dirrm %%DATADIR%%/help >Release-Note: >Audit-Trail: >Unformatted: