From owner-svn-ports-head@freebsd.org Thu Aug 27 09:09:21 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AFC909C42D0; Thu, 27 Aug 2015 09:09:21 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.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 939EB1366; Thu, 27 Aug 2015 09:09:21 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7R99LQa050939; Thu, 27 Aug 2015 09:09:21 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7R99Jsb050933; Thu, 27 Aug 2015 09:09:19 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508270909.t7R99Jsb050933@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 27 Aug 2015 09:09:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395407 - in head/emulators/higan: . 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Aug 2015 09:09:21 -0000 Author: amdmi3 Date: Thu Aug 27 09:09:19 2015 New Revision: 395407 URL: https://svnweb.freebsd.org/changeset/ports/395407 Log: - Pet portlint, switch to options helpers PR: 202532 Submitted by: cyberbotx@cyberbotx.com (maintainer) Added: head/emulators/higan/files/patch-target-ethos_general_presentation.cpp (contents, props changed) head/emulators/higan/files/patch-target-ethos_utility_utility.cpp (contents, props changed) Deleted: head/emulators/higan/files/patch-shaders Modified: head/emulators/higan/Makefile head/emulators/higan/files/patch-nall-platform.hpp head/emulators/higan/files/patch-ruby__video__glx.cpp head/emulators/higan/files/patch-target-ethos-Makefile Modified: head/emulators/higan/Makefile ============================================================================== --- head/emulators/higan/Makefile Thu Aug 27 09:08:05 2015 (r395406) +++ head/emulators/higan/Makefile Thu Aug 27 09:09:19 2015 (r395407) @@ -16,7 +16,6 @@ USES= compiler:c++11-lib gmake pkgconfi USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 -#MAKE_ENV+= c="${CC} -std=gnu99" cpp="${CXX} -std=gnu++0x" MAKE_ENV+= compiler="${CXX}" cflags="-x c -std=c99 ${CFLAGS}" \ cppflags="-x c++ -std=c++11 ${CXXFLAGS}" @@ -118,19 +117,18 @@ post-patch: ${WRKSRC}/target-ethos/Makefile ${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|' \ ${WRKSRC}/nall/string/platform.hpp -.if ${PORT_OPTIONS:MDEBUG} + +post-patch-DEBUG-on: ${REINPLACE_CMD} -e 's|-O3|-g|g' \ ${WRKSRC}/ananke/Makefile \ ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's|:= -s|:= #|g' \ ${WRKSRC}/Makefile -.endif -# ${RM} ${WRKSRC}/shaders/Sepia.Direct3D.shader -do-build: -.if ${PORT_OPTIONS:MQT4} +pre-build-QT4-on: (cd ${WRKSRC}/phoenix/qt && ${MOC} -i -o platform.moc platform.moc.hpp) -.endif + +do-build: .for d in . ananke (cd ${WRKSRC}/${d} && ${MAKE_CMD} ${MAKE_ENV}) .endfor Modified: head/emulators/higan/files/patch-nall-platform.hpp ============================================================================== --- head/emulators/higan/files/patch-nall-platform.hpp Thu Aug 27 09:08:05 2015 (r395406) +++ head/emulators/higan/files/patch-nall-platform.hpp Thu Aug 27 09:09:19 2015 (r395407) @@ -1,6 +1,6 @@ ---- ./nall/platform.hpp.orig 2014-03-16 21:33:25.000000000 -0400 -+++ ./nall/platform.hpp 2014-03-16 21:45:07.000000000 -0400 -@@ -41,7 +41,7 @@ +--- nall/platform.hpp.orig 2014-01-20 06:37:12 UTC ++++ nall/platform.hpp +@@ -41,7 +41,7 @@ namespace Math { #undef interface #define dllexport __declspec(dllexport) #else Modified: head/emulators/higan/files/patch-ruby__video__glx.cpp ============================================================================== --- head/emulators/higan/files/patch-ruby__video__glx.cpp Thu Aug 27 09:08:05 2015 (r395406) +++ head/emulators/higan/files/patch-ruby__video__glx.cpp Thu Aug 27 09:09:19 2015 (r395407) @@ -1,6 +1,6 @@ ---- ./ruby/video/glx.cpp.orig 2014-01-20 01:37:14.000000000 -0500 -+++ ./ruby/video/glx.cpp 2014-06-02 23:32:39.000000000 -0400 -@@ -128,6 +128,28 @@ +--- ruby/video/glx.cpp.orig 2014-01-20 06:37:14 UTC ++++ ruby/video/glx.cpp +@@ -128,6 +128,28 @@ struct pVideoGLX : OpenGL { //require GLX 1.2+ API if(glx.version_major < 1 || (glx.version_major == 1 && glx.version_minor < 2)) return false; Modified: head/emulators/higan/files/patch-target-ethos-Makefile ============================================================================== --- head/emulators/higan/files/patch-target-ethos-Makefile Thu Aug 27 09:08:05 2015 (r395406) +++ head/emulators/higan/files/patch-target-ethos-Makefile Thu Aug 27 09:09:19 2015 (r395407) @@ -1,6 +1,6 @@ ---- ./target-ethos/Makefile.orig 2014-01-13 00:26:29.000000000 -0500 -+++ ./target-ethos/Makefile 2014-03-16 21:57:02.000000000 -0400 -@@ -27,9 +27,9 @@ +--- target-ethos/Makefile.orig 2014-01-13 05:26:29 UTC ++++ target-ethos/Makefile +@@ -27,9 +27,9 @@ else ifeq ($(platform),linux) ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao ruby += input.udev input.sdl input.x else ifeq ($(platform),bsd) Added: head/emulators/higan/files/patch-target-ethos_general_presentation.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/higan/files/patch-target-ethos_general_presentation.cpp Thu Aug 27 09:09:19 2015 (r395407) @@ -0,0 +1,11 @@ +--- target-ethos/general/presentation.cpp.orig 2013-12-06 20:19:40 UTC ++++ target-ethos/general/presentation.cpp +@@ -235,7 +235,7 @@ void Presentation::bootstrap() { + void Presentation::loadShaders() { + //only the OpenGL driver has video shader support + if(config->video.driver == "OpenGL") { +- string pathname = program->path("Video Shaders/"); ++ string pathname = program->path("shaders/"); + lstring shaders = directory::folders(pathname, "*.shader"); + for(auto& name : shaders) { + auto shader = new RadioItem; Added: head/emulators/higan/files/patch-target-ethos_utility_utility.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/higan/files/patch-target-ethos_utility_utility.cpp Thu Aug 27 09:09:19 2015 (r395407) @@ -0,0 +1,11 @@ +--- target-ethos/utility/utility.cpp.orig 2013-12-21 07:00:03 UTC ++++ target-ethos/utility/utility.cpp +@@ -203,7 +203,7 @@ void Utility::updateShader() { + video.set(Video::Filter, Video::FilterLinear); + } else if(config->video.shader == "Display Emulation") { + if(program->active) { +- string pathname = program->path("Video Shaders/"); ++ string pathname = program->path("shaders/"); + pathname.append("Display Emulation/"); + pathname.append(presentation->systemName, ".shader/"); + if(directory::exists(pathname)) {