Attachment #225631 for bug #256476

View | Details | Raw Unified | Return to bug 256476
Collapse All | Expand All




# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>

PORTNAME=	sayonara
DISTVERSION=	1.7.0-stable1
CATEGORIES=	audio

MAINTAINER=	adridg@FreeBSD.org

		libmtp.so:multimedia/libmtp

USES=		cmake compiler:c++11-lib desktop-file-utils gnome pkgconfig \
		qt:5 python shebangfix
USE_GNOME=	glib20
USE_GSTREAMER1=	flac libav mpg123 ogg opus vorbis
USE_QT=		dbus core gui network sql sql-sqlite3_run widgets xml \
		buildtools_build qmake_build linguisttools_build svg

USE_GITLAB=	yes
GL_ACCOUNT=	luciocarreras
GL_PROJECT=	${PORTNAME}-player
GL_COMMIT=	5bbf1399332d5d59362ad03bf625f9132be72206

SHEBANG_FILES=	src/DBus/sayonara-ctl src/DBus/sayonara-query

post-patch:
	@${REINPLACE_CMD} -e '/man1/s,share/,,; \
			      /DESTINATION/s,share/metainfo,share/appdata,' \
		${WRKSRC}/resources/CMakeLists.txt
	@${REINPLACE_CMD} -e '/DESTINATION/s,/usr/,,' \
		${WRKSRC}/src/Gui/Resources/Icons/CMakeLists.txt

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/audio/sayonara/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1617884296	1	TIMESTAMP = 1623128617
2	SHA256 (luciocarreras-sayonara-player-328203669eac9156db6f72356b47ebfbfee978ef_GL0.tar.gz) = 014f164e7846fd35aa760464da2fb24a6502bad4ab13e8321554f0ab292a3db3	2	SHA256 (luciocarreras-sayonara-player-5bbf1399332d5d59362ad03bf625f9132be72206_GL0.tar.gz) = d320bcff0595a9d030932b31e7a86f6533a2a8fc443d982697009c30c9fdad5f
3	SIZE (luciocarreras-sayonara-player-328203669eac9156db6f72356b47ebfbfee978ef_GL0.tar.gz) = 2035792	3	SIZE (luciocarreras-sayonara-player-5bbf1399332d5d59362ad03bf625f9132be72206_GL0.tar.gz) = 1890837

Removed Link Here

(-)a/audio/sayonara/files/patch-src_Components_Covers_LocalCoverSearcher.cpp (-11 lines)
1	--- src/Components/Covers/LocalCoverSearcher.cpp.orig 2019-12-30 12:19:50 UTC
2	+++ src/Components/Covers/LocalCoverSearcher.cpp
3	@@ -75,7 +75,7 @@ QStringList LocalSearcher::cover_paths_from_path_hint(
4	continue;
5	}
6
7	- double d = std::abs(height - width) / (width * 1.0) + 1.0;
8	+ double d = std::abs(static_cast<double>(height - width)) / (width * 1.0) + 1.0;
9	double pixels = double(width * height);
10
11	d = (d * d * std::max(width, height)) / pixels;




--- src/Components/Streaming/LastFM/LastFM.cpp.orig	2019-12-30 14:17:48 UTC
+++ src/Components/Streaming/LastFM/LastFM.cpp
@@ -51,6 +51,7 @@
 #include <QUrl>
 
 #include <ctime>
+#include <random>
 
 namespace Algorithm=Util::Algorithm;
 
@@ -320,14 +321,14 @@ void Base::similar_artists_fetched(IdList artist_ids)
 
 	const MetaDataList& v_md = active_playlist->tracks();
 
-	std::random_shuffle(artist_ids.begin(), artist_ids.end());
+	std::shuffle(artist_ids.begin(), artist_ids.end(), std::default_random_engine());
 
 	for( auto it=artist_ids.begin(); it != artist_ids.end(); it++ )
 	{
 		MetaDataList artist_tracks;
 		lib_db->getAllTracksByArtist(IdList{*it}, artist_tracks);
 
-		std::random_shuffle(artist_tracks.begin(), artist_tracks.end());
+		std::shuffle(artist_tracks.begin(), artist_tracks.end(), std::default_random_engine());
 
 		// try all songs of artist
 		for(int rounds=0; rounds < artist_tracks.count(); rounds++)

Removed Link Here

(-)a/audio/sayonara/files/patch-src_Gui_Utils_Widgets_Slider.cpp (-10 lines)
1	--- src/Gui/Utils/Widgets/Slider.cpp.orig 2020-05-21 10:59:45 UTC
2	+++ src/Gui/Utils/Widgets/Slider.cpp
3	@@ -22,6 +22,7 @@
4	#include "Gui/Utils/Style.h"
5
6	#include <QPainter>
7	+#include <QPainterPath>
8	#include <QMouseEvent>
9
10	using Gui::Slider;




bin/sayonara
bin/sayonara-ctl
bin/sayonara-query
man/man1/sayonara-ctl.1.gz
man/man1/sayonara-query.1.gz
man/man1/sayonara.1.gz
share/appdata/sayonara.appdata.xml
share/applications/com.sayonara-player.Sayonara.desktop
share/icons/hicolor/128x128/apps/sayonara.png
share/icons/hicolor/16x16/apps/sayonara.png
share/icons/hicolor/192x192/apps/sayonara.png

share/icons/hicolor/24x24/apps/sayonara.png
share/icons/hicolor/256x256/apps/sayonara.png
share/icons/hicolor/32x32/apps/sayonara.png
share/icons/hicolor/32x32/apps/sayonara.xpm
share/icons/hicolor/36x36/apps/sayonara.png
share/icons/hicolor/48x48/apps/sayonara.png
share/icons/hicolor/64x64/apps/sayonara.png
share/icons/hicolor/72x72/apps/sayonara.png
share/icons/hicolor/96x96/apps/sayonara.png
share/icons/sayonara.png
share/pixmaps/sayonara.png
%%DATADIR%%/bg-checker.png
%%DATADIR%%/dark.css
%%DATADIR%%/favicon.ico
%%DATADIR%%/logo.png
%%DATADIR%%/player.db
%%DATADIR%%/soundcloud.db
%%DATADIR%%/standard.css
%%DATADIR%%/translations/icons/ar_SA.png
%%DATADIR%%/translations/icons/cs_CZ.png
%%DATADIR%%/translations/icons/de_DE.png
%%DATADIR%%/translations/icons/el.png
%%DATADIR%%/translations/icons/en.png
%%DATADIR%%/translations/icons/es_ES.png
%%DATADIR%%/translations/icons/fi_FI.png
%%DATADIR%%/translations/icons/fr_FR.png

%%DATADIR%%/translations/sayonara_lang_ar_SA.qm
%%DATADIR%%/translations/sayonara_lang_cs_CZ.qm
%%DATADIR%%/translations/sayonara_lang_de_DE.qm
%%DATADIR%%/translations/sayonara_lang_el.qm
%%DATADIR%%/translations/sayonara_lang_en.qm
%%DATADIR%%/translations/sayonara_lang_es_ES.qm
%%DATADIR%%/translations/sayonara_lang_fi_FI.qm
%%DATADIR%%/translations/sayonara_lang_fr_FR.qm

Return to bug 256476

Lines 1-7 Link Here

(-)b/audio/sayonara/Makefile (-7 / +8 lines)
1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>	1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
2		2
3	PORTNAME= sayonara	3	PORTNAME= sayonara
4	DISTVERSION= 1.5.1	4	DISTVERSION= 1.7.0-stable1
5	CATEGORIES= audio	5	CATEGORIES= audio
6		6
7	MAINTAINER= adridg@FreeBSD.org	7	MAINTAINER= adridg@FreeBSD.org
Lines 14-34 LIB_DEPENDS= libtag.so:audio/taglib \ Link Here
14	libmtp.so:multimedia/libmtp	14	libmtp.so:multimedia/libmtp
15		15
16	USES= cmake compiler:c++11-lib desktop-file-utils gnome pkgconfig \	16	USES= cmake compiler:c++11-lib desktop-file-utils gnome pkgconfig \
17	qt:5	17	qt:5 python shebangfix
18	USE_GNOME= glib20	18	USE_GNOME= glib20
19	USE_GSTREAMER1= flac libav mpg123 ogg opus vorbis	19	USE_GSTREAMER1= flac libav mpg123 ogg opus vorbis
20	USE_QT= dbus core gui network sql sql-sqlite3_run widgets xml \	20	USE_QT= dbus core gui network sql sql-sqlite3_run widgets xml \
21	buildtools_build qmake_build linguisttools_build	21	buildtools_build qmake_build linguisttools_build svg
22		22
23	USE_GITLAB= yes	23	USE_GITLAB= yes
24	GL_ACCOUNT= luciocarreras	24	GL_ACCOUNT= luciocarreras
25	GL_PROJECT= ${PORTNAME}-player	25	GL_PROJECT= ${PORTNAME}-player
26	GL_COMMIT= 328203669eac9156db6f72356b47ebfbfee978ef # 1.5.1-stable5	26	GL_COMMIT= 5bbf1399332d5d59362ad03bf625f9132be72206
		27
		28	SHEBANG_FILES= src/DBus/sayonara-ctl src/DBus/sayonara-query
27		29
28	post-patch:	30	post-patch:
29	@${REINPLACE_CMD} -e '/man1/s,share/,,' \	31	@${REINPLACE_CMD} -e '/man1/s,share/,,; \
		32	/DESTINATION/s,share/metainfo,share/appdata,' \
30	${WRKSRC}/resources/CMakeLists.txt	33	${WRKSRC}/resources/CMakeLists.txt
31	@${REINPLACE_CMD} -e '/DESTINATION/s,/usr/,,' \
32	${WRKSRC}/src/Gui/Resources/Icons/CMakeLists.txt
33		34
34	.include <bsd.port.mk>	35	.include <bsd.port.mk>

Removed Link Here

(-)a/audio/sayonara/files/patch-src_Components_Streaming_LastFM_LastFM.cpp (-27 lines)
1	--- src/Components/Streaming/LastFM/LastFM.cpp.orig 2019-12-30 14:17:48 UTC
2	+++ src/Components/Streaming/LastFM/LastFM.cpp
3	@@ -51,6 +51,7 @@
4	#include <QUrl>
5
6	#include <ctime>
7	+#include <random>
8
9	namespace Algorithm=Util::Algorithm;
10
11	@@ -320,14 +321,14 @@ void Base::similar_artists_fetched(IdList artist_ids)
12
13	const MetaDataList& v_md = active_playlist->tracks();
14
15	- std::random_shuffle(artist_ids.begin(), artist_ids.end());
16	+ std::shuffle(artist_ids.begin(), artist_ids.end(), std::default_random_engine());
17
18	for( auto it=artist_ids.begin(); it != artist_ids.end(); it++ )
19	{
20	MetaDataList artist_tracks;
21	lib_db->getAllTracksByArtist(IdList{*it}, artist_tracks);
22
23	- std::random_shuffle(artist_tracks.begin(), artist_tracks.end());
24	+ std::shuffle(artist_tracks.begin(), artist_tracks.end(), std::default_random_engine());
25
26	// try all songs of artist
27	for(int rounds=0; rounds < artist_tracks.count(); rounds++)

Lines 1-7 Link Here

(-)b/audio/sayonara/pkg-plist (-13 / +9 lines)
1	bin/sayonara	1	bin/sayonara
		2	bin/sayonara-ctl
		3	bin/sayonara-query
		4	man/man1/sayonara-ctl.1.gz
		5	man/man1/sayonara-query.1.gz
2	man/man1/sayonara.1.gz	6	man/man1/sayonara.1.gz
3	share/appdata/sayonara.appdata.xml	7	share/appdata/sayonara.appdata.xml
4	share/applications/sayonara.desktop	8	share/applications/com.sayonara-player.Sayonara.desktop
5	share/icons/hicolor/128x128/apps/sayonara.png	9	share/icons/hicolor/128x128/apps/sayonara.png
6	share/icons/hicolor/16x16/apps/sayonara.png	10	share/icons/hicolor/16x16/apps/sayonara.png
7	share/icons/hicolor/192x192/apps/sayonara.png	11	share/icons/hicolor/192x192/apps/sayonara.png
Lines 9-33 share/icons/hicolor/22x22/apps/sayonara.png Link Here
9	share/icons/hicolor/24x24/apps/sayonara.png	13	share/icons/hicolor/24x24/apps/sayonara.png
10	share/icons/hicolor/256x256/apps/sayonara.png	14	share/icons/hicolor/256x256/apps/sayonara.png
11	share/icons/hicolor/32x32/apps/sayonara.png	15	share/icons/hicolor/32x32/apps/sayonara.png
12	share/icons/hicolor/32x32/apps/sayonara.xpm
13	share/icons/hicolor/36x36/apps/sayonara.png	16	share/icons/hicolor/36x36/apps/sayonara.png
14	share/icons/hicolor/48x48/apps/sayonara.png	17	share/icons/hicolor/48x48/apps/sayonara.png
15	share/icons/hicolor/64x64/apps/sayonara.png	18	share/icons/hicolor/64x64/apps/sayonara.png
16	share/icons/hicolor/72x72/apps/sayonara.png	19	share/icons/hicolor/72x72/apps/sayonara.png
17	share/icons/hicolor/96x96/apps/sayonara.png	20	share/icons/hicolor/96x96/apps/sayonara.png
18	share/icons/sayonara.png
19	share/pixmaps/sayonara.png
20	%%DATADIR%%/bg-checker.png
21	%%DATADIR%%/dark.css
22	%%DATADIR%%/favicon.ico
23	%%DATADIR%%/logo.png
24	%%DATADIR%%/player.db
25	%%DATADIR%%/soundcloud.db
26	%%DATADIR%%/standard.css
27	%%DATADIR%%/translations/icons/ar_SA.png	21	%%DATADIR%%/translations/icons/ar_SA.png
28	%%DATADIR%%/translations/icons/cs_CZ.png	22	%%DATADIR%%/translations/icons/cs_CZ.png
29	%%DATADIR%%/translations/icons/de_DE.png	23	%%DATADIR%%/translations/icons/de_DE.png
30	%%DATADIR%%/translations/icons/en_US.png	24	%%DATADIR%%/translations/icons/el.png
		25	%%DATADIR%%/translations/icons/en.png
31	%%DATADIR%%/translations/icons/es_ES.png	26	%%DATADIR%%/translations/icons/es_ES.png
32	%%DATADIR%%/translations/icons/fi_FI.png	27	%%DATADIR%%/translations/icons/fi_FI.png
33	%%DATADIR%%/translations/icons/fr_FR.png	28	%%DATADIR%%/translations/icons/fr_FR.png
Lines 47-53 share/pixmaps/sayonara.png Link Here
47	%%DATADIR%%/translations/sayonara_lang_ar_SA.qm	42	%%DATADIR%%/translations/sayonara_lang_ar_SA.qm
48	%%DATADIR%%/translations/sayonara_lang_cs_CZ.qm	43	%%DATADIR%%/translations/sayonara_lang_cs_CZ.qm
49	%%DATADIR%%/translations/sayonara_lang_de_DE.qm	44	%%DATADIR%%/translations/sayonara_lang_de_DE.qm
50	%%DATADIR%%/translations/sayonara_lang_en_US.qm	45	%%DATADIR%%/translations/sayonara_lang_el.qm
		46	%%DATADIR%%/translations/sayonara_lang_en.qm
51	%%DATADIR%%/translations/sayonara_lang_es_ES.qm	47	%%DATADIR%%/translations/sayonara_lang_es_ES.qm
52	%%DATADIR%%/translations/sayonara_lang_fi_FI.qm	48	%%DATADIR%%/translations/sayonara_lang_fi_FI.qm
53	%%DATADIR%%/translations/sayonara_lang_fr_FR.qm	49	%%DATADIR%%/translations/sayonara_lang_fr_FR.qm