Date: Wed, 28 Feb 2018 19:54:30 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463260 - in head/audio/milkytracker: . files Message-ID: <201802281954.w1SJsUnQ014167@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Wed Feb 28 19:54:29 2018 New Revision: 463260 URL: https://svnweb.freebsd.org/changeset/ports/463260 Log: Fix build with clang 6.0.0. PR: 226179 Added: head/audio/milkytracker/files/ head/audio/milkytracker/files/patch-src_tracker_EQConstants.cpp (contents, props changed) head/audio/milkytracker/files/patch-src_tracker_sdl_SDL__Main.cpp (contents, props changed) Modified: head/audio/milkytracker/Makefile Modified: head/audio/milkytracker/Makefile ============================================================================== --- head/audio/milkytracker/Makefile Wed Feb 28 19:34:05 2018 (r463259) +++ head/audio/milkytracker/Makefile Wed Feb 28 19:54:29 2018 (r463260) @@ -4,6 +4,7 @@ PORTNAME= milkytracker PORTVERSION= 1.02.00 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= ehaupt@FreeBSD.org @@ -28,13 +29,6 @@ OPTIONS_DEFINE= DOCS BROKEN_powerpc= Does not build on powerpc BROKEN_powerpc64= Does not build on powerpc64 -.include <bsd.port.pre.mk> - -# does not compile with clang 6.0.0 -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200056 -USE_GCC= yes -.endif - post-install: .for f in ${ICONS} ${INSTALL_DATA} ${WRKSRC}/resources/pictures/${f} \ @@ -46,4 +40,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${STAGEDIR}${DOCSDIR} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> Added: head/audio/milkytracker/files/patch-src_tracker_EQConstants.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/milkytracker/files/patch-src_tracker_EQConstants.cpp Wed Feb 28 19:54:29 2018 (r463260) @@ -0,0 +1,11 @@ +--- src/tracker/EQConstants.cpp.orig 2018-02-24 17:43:23 UTC ++++ src/tracker/EQConstants.cpp +@@ -23,7 +23,7 @@ + #include "EQConstants.h" + #include "math.h" + +-#define p(e) ldexp(0x10558, e-4*4) ++#define p(e) ldexp(66904.0f, e-4*4) + + const float EQConstants::EQ3bands[3] = + { Added: head/audio/milkytracker/files/patch-src_tracker_sdl_SDL__Main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/milkytracker/files/patch-src_tracker_sdl_SDL__Main.cpp Wed Feb 28 19:54:29 2018 (r463260) @@ -0,0 +1,20 @@ +--- src/tracker/sdl/SDL_Main.cpp.orig 2018-02-24 17:43:23 UTC ++++ src/tracker/sdl/SDL_Main.cpp +@@ -609,7 +609,7 @@ void translateKeyDownEvent(const SDL_Eve + printf ("DEBUG: Key pressed: VK: %d, SC: %d, Scancode: %d\n", toVK(keysym), toSC(keysym), keysym.sym); + #endif + +- pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym}; ++ pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), static_cast<pp_uint16> (keysym.sym)}; + + PPEvent myEvent(eKeyDown, &chr, sizeof(chr)); + RaiseEventSerialized(&myEvent); +@@ -621,7 +621,7 @@ void translateKeyUpEvent(const SDL_Event + + preTranslateKey(keysym); + +- pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym}; ++ pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), static_cast<pp_uint16> (keysym.sym)}; + + PPEvent myEvent(eKeyUp, &chr, sizeof(chr)); + RaiseEventSerialized(&myEvent);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802281954.w1SJsUnQ014167>