Date: Thu, 1 Feb 2018 14:54:04 +0000 (UTC) From: Sean Bruno <sbruno@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460605 - head/audio/clementine-player/files Message-ID: <201802011454.w11Es476066818@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sbruno Date: Thu Feb 1 14:54:03 2018 New Revision: 460605 URL: https://svnweb.freebsd.org/changeset/ports/460605 Log: audio/clementine-player: Fixup build breakage after clang 6 update. Thanks to dim@ and others for the suggestions and fixes. Added: head/audio/clementine-player/files/patch-3rdParty_libprojectm_MilkdropPresetFactory_Parser.cpp (contents, props changed) head/audio/clementine-player/files/patch-3rdParty_libprojectm_Renderer_VideoEcho.cpp (contents, props changed) Added: head/audio/clementine-player/files/patch-3rdParty_libprojectm_MilkdropPresetFactory_Parser.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/clementine-player/files/patch-3rdParty_libprojectm_MilkdropPresetFactory_Parser.cpp Thu Feb 1 14:54:03 2018 (r460605) @@ -0,0 +1,47 @@ +--- 3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp.orig 2018-01-31 22:06:57.261592000 +0000 ++++ 3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp 2018-01-31 22:07:38.081299000 +0000 +@@ -1373,7 +1373,7 @@ + PerFrameEqn * per_frame_eqn; + GenExpr * gen_expr; + +- if (fs == NULL) ++ if (!fs) + return NULL; + if (param_string == NULL) + return NULL; +@@ -1528,7 +1528,7 @@ + + if (preset == NULL) + return NULL; +- if (fs == NULL) ++ if (!fs) + return NULL; + + if ((token = parseToken(fs, name)) != tEq) +@@ -1842,7 +1842,7 @@ + /* Null argument checks */ + if (preset == NULL) + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (!fs) + return PROJECTM_FAILURE; + if (token == NULL) + return PROJECTM_FAILURE; +@@ -2133,7 +2133,7 @@ + + if (token == NULL) + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (!fs) + return PROJECTM_FAILURE; + if (preset == NULL) + return PROJECTM_FAILURE; +@@ -2315,7 +2315,7 @@ + if (token == NULL) + + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (!fs) + return PROJECTM_FAILURE; + if (preset == NULL) + return PROJECTM_FAILURE; Added: head/audio/clementine-player/files/patch-3rdParty_libprojectm_Renderer_VideoEcho.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/clementine-player/files/patch-3rdParty_libprojectm_Renderer_VideoEcho.cpp Thu Feb 1 14:54:03 2018 (r460605) @@ -0,0 +1,17 @@ +--- 3rdparty/libprojectm/Renderer/VideoEcho.cpp.orig 2018-01-31 22:10:05.891427000 +0000 ++++ 3rdparty/libprojectm/Renderer/VideoEcho.cpp 2018-01-31 22:14:31.332885000 +0000 +@@ -77,10 +77,10 @@ + default: flipx=1;flipy=1; break; + } + +- float pointsFlip[4][2] = {{-0.5*flipx, -0.5*flipy}, +- {-0.5*flipx, 0.5*flipy}, +- { 0.5*flipx, 0.5*flipy}, +- { 0.5*flipx, -0.5*flipy}}; ++ float pointsFlip[4][2] = {{static_cast<float>(-0.5)*flipx, static_cast<float>(-0.5)*flipy}, ++ {static_cast<float>(-0.5)*flipx, static_cast<float>(0.5)*flipy}, ++ { static_cast<float>(0.5)*flipx, static_cast<float>(0.5)*flipy}, ++ { static_cast<float>(0.5)*flipx, static_cast<float>(-0.5)*flipy}}; + + glVertexPointer(2,GL_FLOAT,0,pointsFlip); + glDrawArrays(GL_TRIANGLE_FAN,0,4);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802011454.w11Es476066818>