On Wed, Mar 17, 2021 at 06:49:59PM +0100, Theo Buehler wrote:
> Updated to the latest github tag which avoids the namespace collision.
>
> This results in the awkward
>
> clementine-1.4.0rc1pl510
>
> PKGNAME - better suggestions welcome.
>
> I could stream some radio and play some mp3. I hit "Your gstreamer
> installation is missing a plugin" rather often, but that doesn't seem to
> be a result of this update.
>
> HOMEPAGE is one of these servers that really wants www.
Sorry, I made two mistakes. I forgot to delete a warning in
src/CMakeLists.txt that is unsupported on gcc 4.8 and I managed to drop
a hunk in the libexecinfo detection. This should be better and hopefully
build on sparc64 as well.
I should also have said that the dropped diffs are due to different
upstream fixes presumably for newer clang and Qt versions.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/clementine/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile 18 Feb 2021 20:55:17 -0000 1.45
+++ Makefile 17 Mar 2021 17:03:01 -0000
@@ -4,13 +4,12 @@ COMMENT = music player
GH_ACCOUNT = clementine-player
GH_PROJECT = Clementine
-GH_TAGNAME = 1.4.0rc1
-PKGNAME = clementine-${GH_TAGNAME}
-REVISION= 3
+GH_TAGNAME = 1.4.0rc1-510-g3f34b332c
+PKGNAME = clementine-${GH_TAGNAME:C/-510.*/pl510/}
CATEGORIES = audio x11
-HOMEPAGE = https://clementine-player.org/
+HOMEPAGE = https://www.clementine-player.org/
# GPLv2/LGPLv2/GFDL
PERMIT_PACKAGE = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/clementine/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 26 Jan 2020 17:37:07 -0000 1.5
+++ distinfo 17 Mar 2021 17:01:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (Clementine-1.4.0rc1.tar.gz) =
rUk6GVRZQoPUGhV1NBEY4ZCYRjulYmo3uJPYOE4KH3s=
-SIZE (Clementine-1.4.0rc1.tar.gz) = 8571013
+SHA256 (Clementine-1.4.0rc1-510-g3f34b332c.tar.gz) =
0uGcH0B0u9R/tpFkTI3Ej5iAqKvPR904/oF6bzXKWcw=
+SIZE (Clementine-1.4.0rc1-510-g3f34b332c.tar.gz) = 9031179
Index: patches/patch-3rdparty_libprojectm_MilkdropPresetFactory_Parser_cpp
===================================================================
RCS file: patches/patch-3rdparty_libprojectm_MilkdropPresetFactory_Parser_cpp
diff -N patches/patch-3rdparty_libprojectm_MilkdropPresetFactory_Parser_cpp
--- patches/patch-3rdparty_libprojectm_MilkdropPresetFactory_Parser_cpp 17 Apr
2018 14:06:03 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-$OpenBSD: patch-3rdparty_libprojectm_MilkdropPresetFactory_Parser_cpp,v 1.1
2018/04/17 14:06:03 naddy Exp $
-
-Index: 3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp
---- 3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp.orig
-+++ 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: patches/patch-3rdparty_libprojectm_Renderer_VideoEcho_cpp
===================================================================
RCS file: patches/patch-3rdparty_libprojectm_Renderer_VideoEcho_cpp
diff -N patches/patch-3rdparty_libprojectm_Renderer_VideoEcho_cpp
--- patches/patch-3rdparty_libprojectm_Renderer_VideoEcho_cpp 17 Apr 2018
14:06:03 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-3rdparty_libprojectm_Renderer_VideoEcho_cpp,v 1.1 2018/04/17
14:06:03 naddy Exp $
-
-Index: 3rdparty/libprojectm/Renderer/VideoEcho.cpp
---- 3rdparty/libprojectm/Renderer/VideoEcho.cpp.orig
-+++ 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] = {{(float)(-0.5*flipx),
(float)(-0.5*flipy)},
-+ {(float)(-0.5*flipx), (float)(
0.5*flipy)},
-+ {(float)( 0.5*flipx), (float)(
0.5*flipy)},
-+ {(float)( 0.5*flipx),
(float)(-0.5*flipy)}};
-
- glVertexPointer(2,GL_FLOAT,0,pointsFlip);
- glDrawArrays(GL_TRIANGLE_FAN,0,4);
Index: patches/patch-ext_clementine-tagreader_CMakeLists_txt
===================================================================
RCS file: patches/patch-ext_clementine-tagreader_CMakeLists_txt
diff -N patches/patch-ext_clementine-tagreader_CMakeLists_txt
--- patches/patch-ext_clementine-tagreader_CMakeLists_txt 10 Jul 2018
10:55:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-ext_clementine-tagreader_CMakeLists_txt,v 1.1 2018/07/10
10:55:07 tb Exp $
-
-Respect CXXFLAGS
-
-Index: ext/clementine-tagreader/CMakeLists.txt
---- ext/clementine-tagreader/CMakeLists.txt.orig
-+++ ext/clementine-tagreader/CMakeLists.txt
-@@ -7,7 +7,7 @@ include_directories(${CMAKE_BINARY_DIR}/ext/libclement
- include_directories(${CMAKE_SOURCE_DIR}/src)
- include_directories(${CMAKE_BINARY_DIR}/src)
-
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -U__STRICT_ANSI__")
-+set(CMAKE_CXX_FLAGS "--std=c++0x -U__STRICT_ANSI__ ${CMAKE_CXX_FLAGS}")
-
- set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
-
Index: patches/patch-ext_libclementine-common_core_logging_cpp
===================================================================
RCS file:
/cvs/ports/audio/clementine/patches/patch-ext_libclementine-common_core_logging_cpp,v
retrieving revision 1.5
diff -u -p -r1.5 patch-ext_libclementine-common_core_logging_cpp
--- patches/patch-ext_libclementine-common_core_logging_cpp 26 Jan 2020
17:37:07 -0000 1.5
+++ patches/patch-ext_libclementine-common_core_logging_cpp 17 Mar 2021
18:51:15 -0000
@@ -9,16 +9,16 @@ Index: ext/libclementine-common/core/log
+#include <config.h>
+
- #include <QtGlobal>
-
#include <cxxabi.h>
+
+ #include <QtGlobal>
-#ifdef Q_OS_UNIX
-#include <execinfo.h>
-#endif
- #include <iostream>
+ #include <glib.h>
-@@ -254,7 +253,7 @@ QString DemangleSymbol(const QString& symbol) {
+@@ -315,7 +314,7 @@ QString DemangleSymbol(const QString& symbol) {
}
void DumpStackTrace() {
@@ -27,7 +27,7 @@ Index: ext/libclementine-common/core/log
void* callstack[128];
int callstack_size =
backtrace(reinterpret_cast<void**>(&callstack), sizeof(callstack));
-@@ -267,7 +266,7 @@ void DumpStackTrace() {
+@@ -328,7 +327,7 @@ void DumpStackTrace() {
}
free(symbols);
#else
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/clementine/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt 26 Jan 2020 17:37:07 -0000 1.5
+++ patches/patch-src_CMakeLists_txt 17 Mar 2021 19:20:07 -0000
@@ -1,5 +1,5 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.5 2020/01/26 17:37:07 rsadowski Exp $
-1. -Wno-unused-private-field -Wno-unknown-warning-option dont exist on gcc 4.8
+1. -Wno-unused-private-field -Wno-unknown-warning-option don't exist on gcc 4.8
2. Respect CXXFLAGS
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
@@ -7,8 +7,8 @@ Index: src/CMakeLists.txt
@@ -1,6 +1,6 @@
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall
-Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs
-Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x
-U__STRICT_ANSI__")
-+set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall -Wno-sign-compare
-Wno-deprecated-declarations -Wno-unused-local-typedefs --std=c++0x
-U__STRICT_ANSI__ ${CMAKE_CXX_FLAGS}")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall
-Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs
-Wno-unused-private-field -Wno-unknown-warning-option")
++set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall -Wno-sign-compare
-Wno-deprecated-declarations -Wno-unused-local-typedefs ${CMAKE_CXX_FLAGS}")
option(BUILD_WERROR "Build with -Werror" ON)
Index: patches/patch-src_core_utilities_cpp
===================================================================
RCS file: /cvs/ports/audio/clementine/patches/patch-src_core_utilities_cpp,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_core_utilities_cpp
--- patches/patch-src_core_utilities_cpp 26 Jan 2020 17:37:07 -0000
1.5
+++ patches/patch-src_core_utilities_cpp 17 Mar 2021 17:07:33 -0000
@@ -4,7 +4,7 @@ $OpenBSD: patch-src_core_utilities_cpp,v
Index: src/core/utilities.cpp
--- src/core/utilities.cpp.orig
+++ src/core/utilities.cpp
-@@ -66,6 +66,14 @@
+@@ -67,6 +67,14 @@
#ifdef Q_OS_DARWIN
#include <sys/resource.h>
#endif
@@ -18,8 +18,8 @@ Index: src/core/utilities.cpp
+#endif
#ifdef Q_OS_DARWIN
- #include "core/mac_startup.h"
-@@ -690,9 +698,25 @@ bool IsLaptop() {
+ #include <QProcess>
+@@ -697,9 +705,25 @@ bool IsLaptop() {
}
}
return false;
Index: patches/patch-src_devices_giolister_cpp
===================================================================
RCS file: patches/patch-src_devices_giolister_cpp
diff -N patches/patch-src_devices_giolister_cpp
--- patches/patch-src_devices_giolister_cpp 26 Jan 2020 17:37:07 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_devices_giolister_cpp,v 1.2 2020/01/26 17:37:07 rsadowski
Exp $
-
-Add missing header for ports-gcc, from upstream:
-https://github.com/clementine-player/Clementine/pull/5630/commits/a2f7d018c7bdee96d4cefd5a1ec0c4f710fea226
-
-Index: src/devices/giolister.cpp
---- src/devices/giolister.cpp.orig
-+++ src/devices/giolister.cpp
-@@ -17,7 +17,6 @@
-
- #include "config.h"
-
--#include <functional>
- #include <memory>
-
- #include <QFile>
Index: patches/patch-src_library_groupbydialog_h
===================================================================
RCS file:
/cvs/ports/audio/clementine/patches/patch-src_library_groupbydialog_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_library_groupbydialog_h
--- patches/patch-src_library_groupbydialog_h 26 Jan 2020 17:37:07 -0000
1.2
+++ patches/patch-src_library_groupbydialog_h 17 Mar 2021 17:07:33 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-src_library_groupbydialo
Index: src/library/groupbydialog.h
--- src/library/groupbydialog.h.orig
+++ src/library/groupbydialog.h
-@@ -21,6 +21,7 @@
- #include <QDialog>
+@@ -20,6 +20,7 @@
+ #include <QDialog>
#include <memory>
+#include <functional>
Index: patches/patch-src_ripper_ripper_h
===================================================================
RCS file: /cvs/ports/audio/clementine/patches/patch-src_ripper_ripper_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_ripper_ripper_h
--- patches/patch-src_ripper_ripper_h 26 Jan 2020 17:37:07 -0000 1.1
+++ patches/patch-src_ripper_ripper_h 17 Mar 2021 17:14:54 -0000
@@ -3,11 +3,12 @@ $OpenBSD: patch-src_ripper_ripper_h,v 1.
Index: src/ripper/ripper.h
--- src/ripper/ripper.h.orig
+++ src/ripper/ripper.h
-@@ -18,9 +18,10 @@
+@@ -18,10 +18,10 @@
#ifndef SRC_RIPPER_RIPPER_H_
#define SRC_RIPPER_RIPPER_H_
-#include <cdio/cdio.h>
+-
#include <QMutex>
#include <QObject>
+
Index: patches/patch-src_widgets_freespacebar_cpp
===================================================================
RCS file: patches/patch-src_widgets_freespacebar_cpp
diff -N patches/patch-src_widgets_freespacebar_cpp
--- patches/patch-src_widgets_freespacebar_cpp 19 Jan 2021 06:54:01 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_widgets_freespacebar_cpp,v 1.1 2021/01/19 06:54:01
rsadowski Exp $
-
-Index: src/widgets/freespacebar.cpp
---- src/widgets/freespacebar.cpp.orig
-+++ 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: patches/patch-src_widgets_osdpretty_cpp
===================================================================
RCS file: patches/patch-src_widgets_osdpretty_cpp
diff -N patches/patch-src_widgets_osdpretty_cpp
--- patches/patch-src_widgets_osdpretty_cpp 19 Jan 2021 06:54:01 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_widgets_osdpretty_cpp,v 1.1 2021/01/19 06:54:01 rsadowski
Exp $
-
-Index: src/widgets/osdpretty.cpp
---- src/widgets/osdpretty.cpp.orig
-+++ src/widgets/osdpretty.cpp
-@@ -29,6 +29,7 @@
- #include <QSettings>
- #include <QTimer>
- #include <QTimeLine>
-+#include <QPainterPath>
-
- #include <QtDebug>
-
Index: patches/patch-src_widgets_sliderwidget_cpp
===================================================================
RCS file: patches/patch-src_widgets_sliderwidget_cpp
diff -N patches/patch-src_widgets_sliderwidget_cpp
--- patches/patch-src_widgets_sliderwidget_cpp 19 Jan 2021 06:54:01 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_widgets_sliderwidget_cpp,v 1.1 2021/01/19 06:54:01
rsadowski Exp $
-
-Index: src/widgets/sliderwidget.cpp
---- src/widgets/sliderwidget.cpp.orig
-+++ src/widgets/sliderwidget.cpp
-@@ -24,6 +24,7 @@
- #include <QBrush>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSize>
- #include <QTimer>
- #include <QStyle>
Index: patches/patch-tests_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/clementine/patches/patch-tests_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-tests_CMakeLists_txt
--- patches/patch-tests_CMakeLists_txt 26 Jan 2020 17:37:07 -0000 1.2
+++ patches/patch-tests_CMakeLists_txt 17 Mar 2021 17:07:47 -0000
@@ -8,8 +8,8 @@ Index: tests/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8.11)
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fpermissive
-Wno-c++11-narrowing -U__STRICT_ANSI__")
-+set(CMAKE_CXX_FLAGS "-std=c++0x -fpermissive -Wno-c++11-narrowing
-U__STRICT_ANSI__ ${CMAKE_CXX_FLAGS}")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wno-c++11-narrowing")
++set(CMAKE_CXX_FLAGS "-fpermissive -Wno-c++11-narrowing -${CMAKE_CXX_FLAGS}")
if(USE_SYSTEM_GMOCK)
include_directories(${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS})
