Index: audio/clementine-player/Makefile =================================================================== --- audio/clementine-player/Makefile +++ audio/clementine-player/Makefile @@ -1,8 +1,10 @@ # Created by: Veniamin Gvozdikov PORTNAME= clementine -DISTVERSION= 1.4.0 -PORTREVISION= 6 +DISTVERSIONPREFIX= v +DISTVERSION= 1.4.0rc1-586 +DISVERSIONSUFFIX= g20647e8a9 +PORTEPOCH= 1 CATEGORIES= audio PKGNAMESUFFIX= -player @@ -38,8 +40,7 @@ USE_GITHUB= yes GH_ACCOUNT= clementine-player GH_PROJECT= Clementine -GH_TAGNAME= 1.4.0rc1 - +GH_TAGNAME= 1.4.0rc1-586-g20647e8a9 USE_GL= gl glew glu USE_XORG= x11 Index: audio/clementine-player/distinfo =================================================================== --- audio/clementine-player/distinfo +++ audio/clementine-player/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1578173337 -SHA256 (clementine-player-Clementine-1.4.0-1.4.0rc1_GH0.tar.gz) = ad493a1954594283d41a1575341118e19098463ba5626a37b893d8384e0a1f7b -SIZE (clementine-player-Clementine-1.4.0-1.4.0rc1_GH0.tar.gz) = 8571013 +TIMESTAMP = 1619713706 +SHA256 (clementine-player-Clementine-v1.4.0rc1-586-1.4.0rc1-586-g20647e8a9_GH0.tar.gz) = 979ecf99da9632aa6cbd96316a172d6f950f10a27223abbe6480d678630f8873 +SIZE (clementine-player-Clementine-v1.4.0rc1-586-1.4.0rc1-586-g20647e8a9_GH0.tar.gz) = 9038961 Index: audio/clementine-player/files/patch-3rdparty_libprojectm_MilkdropPresetFactory_Parser.cpp =================================================================== --- audio/clementine-player/files/patch-3rdparty_libprojectm_MilkdropPresetFactory_Parser.cpp +++ /dev/null @@ -1,47 +0,0 @@ ---- 3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp.orig 2018-12-05 17:16:34 UTC -+++ 3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp -@@ -1373,7 +1373,7 @@ PerFrameEqn * Parser::parse_implicit_per_frame_eqn(std - PerFrameEqn * per_frame_eqn; - GenExpr * gen_expr; - -- if (fs == NULL) -+ if (!fs) - return NULL; - if (param_string == NULL) - return NULL; -@@ -1528,7 +1528,7 @@ InitCond * Parser::parse_per_frame_init_eqn(std::istre - - if (preset == NULL) - return NULL; -- if (fs == NULL) -+ if (!fs) - return NULL; - - if ((token = parseToken(fs, name)) != tEq) -@@ -1842,7 +1842,7 @@ int Parser::parse_shapecode(char * token, std::istream - /* 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 @@ int Parser::parse_wave(char * token, std::istream & f - - if (token == NULL) - return PROJECTM_FAILURE; -- if (fs == NULL) -+ if (!fs) - return PROJECTM_FAILURE; - if (preset == NULL) - return PROJECTM_FAILURE; -@@ -2315,7 +2315,7 @@ int Parser::parse_shape(char * token, std::istream & - if (token == NULL) - - return PROJECTM_FAILURE; -- if (fs == NULL) -+ if (!fs) - return PROJECTM_FAILURE; - if (preset == NULL) - return PROJECTM_FAILURE; Index: audio/clementine-player/files/patch-3rdparty_libprojectm_Renderer_VideoEcho.cpp =================================================================== --- audio/clementine-player/files/patch-3rdparty_libprojectm_Renderer_VideoEcho.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- 3rdparty/libprojectm/Renderer/VideoEcho.cpp.orig 2018-12-05 17:16:34 UTC -+++ 3rdparty/libprojectm/Renderer/VideoEcho.cpp -@@ -77,10 +77,10 @@ void VideoEcho::Draw(RenderContext &context) - 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(-0.5)*flipx, static_cast(-0.5)*flipy}, -+ {static_cast(-0.5)*flipx, static_cast(0.5)*flipy}, -+ { static_cast(0.5)*flipx, static_cast(0.5)*flipy}, -+ { static_cast(0.5)*flipx, static_cast(-0.5)*flipy}}; - - glVertexPointer(2,GL_FLOAT,0,pointsFlip); - glDrawArrays(GL_TRIANGLE_FAN,0,4); Index: audio/clementine-player/files/patch-src_ripper_ripper.h =================================================================== --- audio/clementine-player/files/patch-src_ripper_ripper.h +++ audio/clementine-player/files/patch-src_ripper_ripper.h @@ -1,10 +1,11 @@ ---- src/ripper/ripper.h.orig 2016-04-19 15:08:35 UTC -+++ src/ripper/ripper.h -@@ -18,9 +18,9 @@ +--- src/ripper/ripper.h.orig 2021-04-27 11:08:18.000000000 -0600 ++++ src/ripper/ripper.h 2021-04-28 10:06:50.888323000 -0600 +@@ -18,10 +18,9 @@ #ifndef SRC_RIPPER_RIPPER_H_ #define SRC_RIPPER_RIPPER_H_ -#include +- #include #include +#include Index: audio/clementine-player/files/patch-src_widgets_freespacebar.cpp =================================================================== --- audio/clementine-player/files/patch-src_widgets_freespacebar.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/widgets/freespacebar.cpp.orig 2020-05-19 17:40:21 UTC -+++ src/widgets/freespacebar.cpp -@@ -20,6 +20,7 @@ - - #include - #include -+#include - - const int FreeSpaceBar::kBarHeight = 20; - const int FreeSpaceBar::kBarBorderRadius = 8; Index: audio/clementine-player/files/patch-src_widgets_osdpretty.cpp =================================================================== --- audio/clementine-player/files/patch-src_widgets_osdpretty.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/widgets/osdpretty.cpp.orig 2020-05-19 17:43:09 UTC -+++ src/widgets/osdpretty.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include Index: audio/clementine-player/files/patch-src_widgets_sliderwidget.cpp =================================================================== --- audio/clementine-player/files/patch-src_widgets_sliderwidget.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/widgets/sliderwidget.cpp.orig 2020-05-19 17:48:49 UTC -+++ src/widgets/sliderwidget.cpp -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - #include - #include