Index: audio/clementine-player/Makefile
===================================================================
--- audio/clementine-player/Makefile
+++ audio/clementine-player/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	clementine
 DISTVERSION=	1.4.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-player
 
@@ -38,7 +38,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	clementine-player
 GH_PROJECT=	Clementine
-GH_TAGNAME=     1.4.0rc1
+GH_TAGNAME=     1.4.0rc1-579-g8fddc816a
 
 
 USE_GL=		gl glew glu
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 = 1619632204
+SHA256 (clementine-player-Clementine-1.4.0-1.4.0rc1-579-g8fddc816a_GH0.tar.gz) = fafb402adee954a63b535cd136a2ca021861a87af5d99503762d81636c549683
+SIZE (clementine-player-Clementine-1.4.0-1.4.0rc1-579-g8fddc816a_GH0.tar.gz) = 9039279
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<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);
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 <cdio/cdio.h>
+-
  #include <QMutex>
  #include <QObject>
 +#include <cdio/cdio.h>
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 <QLinearGradient>
- #include <QPainter>
-+#include <QPainterPath>
- 
- 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 <QLayout>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSettings>
- #include <QTimer>
- #include <QTimeLine>
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 <QBrush>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSize>
- #include <QTimer>
- #include <QStyle>