diff options
| author | sbruno <sbruno@FreeBSD.org> | 2018-02-01 22:54:03 +0800 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2018-02-01 22:54:03 +0800 |
| commit | 6111f2ebb2ee98b0aee82b7ebb8a331c409f1d11 (patch) | |
| tree | c099bd663828f3752994ea8bc5b30152d48b788e /audio | |
| parent | 1a96faa78b759a52f746b34c5ada7180ca744c8a (diff) | |
| download | freebsd-ports-gnome-6111f2ebb2ee98b0aee82b7ebb8a331c409f1d11.tar.gz freebsd-ports-gnome-6111f2ebb2ee98b0aee82b7ebb8a331c409f1d11.tar.zst freebsd-ports-gnome-6111f2ebb2ee98b0aee82b7ebb8a331c409f1d11.zip | |
audio/clementine-player: Fixup build breakage after clang 6 update.
Thanks to dim@ and others for the suggestions and fixes.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/clementine-player/files/patch-3rdParty_libprojectm_MilkdropPresetFactory_Parser.cpp | 47 | ||||
| -rw-r--r-- | audio/clementine-player/files/patch-3rdParty_libprojectm_Renderer_VideoEcho.cpp | 17 |
2 files changed, 64 insertions, 0 deletions
diff --git a/audio/clementine-player/files/patch-3rdParty_libprojectm_MilkdropPresetFactory_Parser.cpp b/audio/clementine-player/files/patch-3rdParty_libprojectm_MilkdropPresetFactory_Parser.cpp new file mode 100644 index 000000000000..275354eb42f0 --- /dev/null +++ b/audio/clementine-player/files/patch-3rdParty_libprojectm_MilkdropPresetFactory_Parser.cpp @@ -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; diff --git a/audio/clementine-player/files/patch-3rdParty_libprojectm_Renderer_VideoEcho.cpp b/audio/clementine-player/files/patch-3rdParty_libprojectm_Renderer_VideoEcho.cpp new file mode 100644 index 000000000000..b3736399b9e8 --- /dev/null +++ b/audio/clementine-player/files/patch-3rdParty_libprojectm_Renderer_VideoEcho.cpp @@ -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); |