From owner-svn-ports-all@FreeBSD.ORG Mon Jun 1 14:22:13 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 A988F77A; Mon, 1 Jun 2015 14:22:13 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) 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 8C42D13F0; Mon, 1 Jun 2015 14:22:13 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t51EMDEP009087; Mon, 1 Jun 2015 14:22:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t51EMCSV009080; Mon, 1 Jun 2015 14:22:12 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201506011422.t51EMCSV009080@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 1 Jun 2015 14:22:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388231 - in head/emulators: ppsspp ppsspp-devel ppsspp-devel/files ppsspp/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: Mon, 01 Jun 2015 14:22:13 -0000 Author: jbeich Date: Mon Jun 1 14:22:11 2015 New Revision: 388231 URL: https://svnweb.freebsd.org/changeset/ports/388231 Log: emulators/ppsspp{,-devel}: unbreak build with gcc5 (for dragonfly) ext/xbrz/xbrz.cpp:619:28: sorry, unimplemented: non-trivial designated initializers not supported const bool doLineBlend = [&]() -> bool ^ Submitted by: @Bigpet via hrydgard/ppsspp#7717 Added: head/emulators/ppsspp-devel/files/patch-ext_xbrz_xbrz.cpp (contents, props changed) head/emulators/ppsspp/files/patch-ext_xbrz_xbrz.cpp (contents, props changed) Modified: head/emulators/ppsspp-devel/Makefile (contents, props changed) head/emulators/ppsspp/Makefile (contents, props changed) Modified: head/emulators/ppsspp-devel/Makefile ============================================================================== --- head/emulators/ppsspp-devel/Makefile Mon Jun 1 14:21:53 2015 (r388230) +++ head/emulators/ppsspp-devel/Makefile Mon Jun 1 14:22:11 2015 (r388231) @@ -2,7 +2,7 @@ DISTVERSION= 1.0.1-551 DISTVERSIONSUFFIX= -gee1299b -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -devel GH_TAGNAME= f7a2cb6:lang 9fe3f59:native a0b878f:ext_armips Added: head/emulators/ppsspp-devel/files/patch-ext_xbrz_xbrz.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/ppsspp-devel/files/patch-ext_xbrz_xbrz.cpp Mon Jun 1 14:22:11 2015 (r388231) @@ -0,0 +1,37 @@ +--- ext/xbrz/xbrz.cpp.orig 2015-05-28 17:02:46 UTC ++++ ext/xbrz/xbrz.cpp +@@ -648,23 +648,21 @@ void scalePixel(const Kernel_3x3& ker, + auto eq = [&](uint32_t pix1, uint32_t pix2) { return ColorDistance::dist(pix1, pix2, cfg.luminanceWeight_) < cfg.equalColorTolerance_; }; + auto dist = [&](uint32_t pix1, uint32_t pix2) { return ColorDistance::dist(pix1, pix2, cfg.luminanceWeight_); }; + +- const bool doLineBlend = [&]() -> bool +- { ++ bool doLineBlend; ++ + if (getBottomR(blend) >= BLEND_DOMINANT) +- return true; ++ doLineBlend = true; + + //make sure there is no second blending in an adjacent rotation for this pixel: handles insular pixels, mario eyes +- if (getTopR(blend) != BLEND_NONE && !eq(e, g)) //but support double-blending for 90° corners +- return false; +- if (getBottomL(blend) != BLEND_NONE && !eq(e, c)) +- return false; +- ++ else if (getTopR(blend) != BLEND_NONE && !eq(e, g)) //but support double-blending for 90° corners ++ doLineBlend = false; ++ else if (getBottomL(blend) != BLEND_NONE && !eq(e, c)) ++ doLineBlend = false; + //no full blending for L-shapes; blend corner only (handles "mario mushroom eyes") +- if (!eq(e, i) && eq(g, h) && eq(h , i) && eq(i, f) && eq(f, c)) +- return false; +- +- return true; +- }(); ++ else if (!eq(e, i) && eq(g, h) && eq(h, i) && eq(i, f) && eq(f, c)) ++ doLineBlend = false; ++ else ++ doLineBlend = true; + + const uint32_t px = dist(e, f) <= dist(e, h) ? f : h; //choose most similar color + Modified: head/emulators/ppsspp/Makefile ============================================================================== --- head/emulators/ppsspp/Makefile Mon Jun 1 14:21:53 2015 (r388230) +++ head/emulators/ppsspp/Makefile Mon Jun 1 14:22:11 2015 (r388231) @@ -3,7 +3,7 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v DISTVERSION?= 1.0.1 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= emulators PATCH_SITES= https://projects.archlinux.org/svntogit/community.git/plain/trunk/ Added: head/emulators/ppsspp/files/patch-ext_xbrz_xbrz.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/ppsspp/files/patch-ext_xbrz_xbrz.cpp Mon Jun 1 14:22:11 2015 (r388231) @@ -0,0 +1,37 @@ +--- ext/xbrz/xbrz.cpp.orig 2015-02-26 20:05:06 UTC ++++ ext/xbrz/xbrz.cpp +@@ -616,23 +616,21 @@ void scalePixel(const Kernel_3x3& ker, + auto eq = [&](uint32_t col1, uint32_t col2) { return ColorDistance::dist(col1, col2, cfg.luminanceWeight_) < cfg.equalColorTolerance_; }; + auto dist = [&](uint32_t col1, uint32_t col2) { return ColorDistance::dist(col1, col2, cfg.luminanceWeight_); }; + +- const bool doLineBlend = [&]() -> bool +- { ++ bool doLineBlend; ++ + if (getBottomR(blend) >= BLEND_DOMINANT) +- return true; ++ doLineBlend = true; + + //make sure there is no second blending in an adjacent rotation for this pixel: handles insular pixels, mario eyes +- if (getTopR(blend) != BLEND_NONE && !eq(e, g)) //but support double-blending for 90° corners +- return false; +- if (getBottomL(blend) != BLEND_NONE && !eq(e, c)) +- return false; +- ++ else if (getTopR(blend) != BLEND_NONE && !eq(e, g)) //but support double-blending for 90° corners ++ doLineBlend = false; ++ else if (getBottomL(blend) != BLEND_NONE && !eq(e, c)) ++ doLineBlend = false; + //no full blending for L-shapes; blend corner only (handles "mario mushroom eyes") +- if (eq(g, h) && eq(h , i) && eq(i, f) && eq(f, c) && !eq(e, i)) +- return false; +- +- return true; +- }(); ++ else if (eq(g, h) && eq(h, i) && eq(i, f) && eq(f, c) && !eq(e, i)) ++ doLineBlend = false; ++ else ++ doLineBlend = true; + + const uint32_t px = dist(e, f) <= dist(e, h) ? f : h; //choose most similar color +