git: 6e691118fccc - main - multimedia/smplayer: update to 21.10.0

From: Tobias C. Berner <tcberner_at_FreeBSD.org>
Date: Sat, 30 Oct 2021 16:51:58 UTC
The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6e691118fccc3295ea32165fe0d5dd86e26a8483

commit 6e691118fccc3295ea32165fe0d5dd86e26a8483
Author:     VVD <vvd@unislabs.com>
AuthorDate: 2021-10-30 16:47:38 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2021-10-30 16:48:32 +0000

    multimedia/smplayer: update to 21.10.0
    
    Version 21.10.0 Latest
    [21.10] - 2021-10-29
        The support for YouTube has been improved by using yt-dlp. Fixes buffering and playback of age-restricted videos.
        Possibility to use yt-dlp instead of youtube-dl.
        Option to use the AV1 codec with YouTube videos.
        Improve support for FreeBSD.
        Auto-rotate videos that have been recorded in vertical mode or upside down.
        Some bug fixes.
    
    Linux
        Ignore KDE's "single click". It causes unexpected behaviour.
    
    Windows
        It's easier to update the YouTube code.
        The installer is digitally signed.
        SMPlayer is now also available in the Windows Store.
    
    Mac OS
        Fix playback with mplayer when screenshots are enabled.
    
    Removed
        Support for the obsolete mplayer2.
    
    Version 21.8.0
    [21.8]
        A version for Mac OS is now available.
        Better automatic resizing of the main window, trying to prevent
        black borders.
        Fix loading YouTube playlists.
        Add an option to rotate the video by 180 degrees.
        Playlist: try to prevent a one second delay when using play prev/next.
        Add some predefined speeds (0.25x, 0.5x, 1.25x, 1.5x, 1.75x).
        Fix audio CD playback with mpv.
        Fix audio channels.
    
    Windows
        The installation of YouTube support is now optional.
        Using Qt 5.15.2.
    
    Linux
        Disable power saving on Wayland during playback.
        Remove KDE from the categories in the *.desktop files.
        SMPlayer is now also available as appimage, flatpak and snap.
    
    PR:             259551
---
 multimedia/smplayer/Makefile                        | 13 ++++++++-----
 multimedia/smplayer/distinfo                        |  6 +++---
 multimedia/smplayer/files/patch-Makefile            |  6 +++---
 multimedia/smplayer/files/patch-src_prefgeneral.cpp | 18 ++++++++++++++++++
 multimedia/smplayer/pkg-plist                       |  1 +
 5 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index 8aeeb57807d7..420293e9ece1 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -1,8 +1,7 @@
 # Created by: Diego Depaoli <trebestie@gmail.com> and Yinghong Liu <relaxbsd@gmail.com>
 
 PORTNAME=	smplayer
-DISTVERSION=	21.1.0
-PORTREVISION=	1
+DISTVERSION=	21.10.0
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	SF/${PORTNAME}/SMPlayer/${PORTVERSION}
 
@@ -27,8 +26,10 @@ CONFIGURE_WRKSRC=	${WRKSRC}/src
 MAKE_ARGS=	PREFIX=${PREFIX} DESTDIR=${STAGEDIR}
 QMAKE_ARGS=	"DEFINES_DISABLED+=MPLAYER2_SUPPORT"
 
-PORTDOCS=	Changelog Not_so_obvious_things.txt \
-		Readme.txt Release_notes.txt Watching_TV.txt
+PORTDOCS=	${DOCS:T}
+DOCS=		old-docs/Changelog old-docs/dvdmenus.txt old-docs/Finding_subtitles.txt \
+		old-docs/Not_so_obvious_things.txt old-docs/Release_notes.txt \
+		old-docs/Watching_TV.txt README.md Readme.txt Release_notes.md
 
 OPTIONS_MULTI=		ENGINE
 OPTIONS_MULTI_ENGINE=	MPLAYER MPV
@@ -62,6 +63,8 @@ post-patch:
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|-O2 -W -Wall -Werror|${CFLAGS}|' \
 		${WRKSRC}/webserver/Makefile
+	@${REINPLACE_CMD} -e 's|^sed|#sed|' \
+		${WRKSRC}/install_appdata.sh
 
 post-patch-DEBUG-on:
 	@${REINPLACE_CMD} -e '/CONFIG += debug/s|#||' \
@@ -77,6 +80,6 @@ post-install:
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/smplayer/distinfo b/multimedia/smplayer/distinfo
index 422b973c460d..f11d679cde33 100644
--- a/multimedia/smplayer/distinfo
+++ b/multimedia/smplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612951928
-SHA256 (smplayer-21.1.0.tar.bz2) = 634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
-SIZE (smplayer-21.1.0.tar.bz2) = 5199956
+TIMESTAMP = 1635601042
+SHA256 (smplayer-21.10.0.tar.bz2) = 2c0bf10add4bea2582104281553cda9792b74d41273a98bceaa147c70065db8a
+SIZE (smplayer-21.10.0.tar.bz2) = 5186253
diff --git a/multimedia/smplayer/files/patch-Makefile b/multimedia/smplayer/files/patch-Makefile
index bc748120602d..7559e40252aa 100644
--- a/multimedia/smplayer/files/patch-Makefile
+++ b/multimedia/smplayer/files/patch-Makefile
@@ -8,7 +8,7 @@
  TRANSLATION_PATH=$(PREFIX)/share/smplayer/translations
  THEMES_PATH=$(PREFIX)/share/smplayer/themes
  SHORTCUTS_PATH=$(PREFIX)/share/smplayer/shortcuts
-@@ -18,7 +17,7 @@ LRELEASE=lrelease
+@@ -19,7 +18,7 @@ LRELEASE=lrelease
  
  DEFS=DATA_PATH=\\\"$(DATA_PATH)\\\" \
       TRANSLATION_PATH=\\\"$(TRANSLATION_PATH)\\\" \
@@ -17,12 +17,12 @@
       SHORTCUTS_PATH=\\\"$(SHORTCUTS_PATH)\\\"
  
  all: src/smplayer webserver/simple_web_server
-@@ -43,13 +42,8 @@ install: all
+@@ -44,13 +43,8 @@ install: all
  	install -m 644 src/input.conf $(DESTDIR)$(DATA_PATH)
  	-install -d $(DESTDIR)$(TRANSLATION_PATH)
  	install -m 644 src/translations/*.qm $(DESTDIR)$(TRANSLATION_PATH)
 -	-install -d $(DESTDIR)$(DOC_PATH)
--	install -m 644 Changelog *.txt $(DESTDIR)$(DOC_PATH)
+-	install -m 644 Release_notes.md *.txt $(DESTDIR)$(DOC_PATH)
  
  	install -m 755 webserver/simple_web_server $(DESTDIR)$(PREFIX)/bin/
 -
diff --git a/multimedia/smplayer/files/patch-src_prefgeneral.cpp b/multimedia/smplayer/files/patch-src_prefgeneral.cpp
new file mode 100644
index 000000000000..c1133dedc2dc
--- /dev/null
+++ b/multimedia/smplayer/files/patch-src_prefgeneral.cpp
@@ -0,0 +1,18 @@
+--- src/prefgeneral.cpp
++++ src/prefgeneral.cpp
+@@ -324,6 +324,7 @@
+ 	filesettings_method_changed = false;
+ 
+ 	QString player_path = mplayerPath();
++#ifdef MPLAYER_MPV_SELECTION
+ 	#ifdef OS_UNIX_NOT_MAC
+ 	if (player_path == PLAYER_COMBO_MPLAYER_PATH || player_path == PLAYER_COMBO_MPV_PATH || !QFile::exists(player_path)) {
+ 		QString player_name = QFileInfo(player_path).fileName();
+@@ -331,6 +332,7 @@
+ 		if (!found_player.isEmpty()) player_path = found_player;
+ 	}
+ 	#endif
++#endif
+ 	qDebug() << "PrefGeneral::getData: player_path:" << player_path;
+ 
+ 	if (pref->mplayer_bin != player_path) {
diff --git a/multimedia/smplayer/pkg-plist b/multimedia/smplayer/pkg-plist
index 39088a9be309..8b57b1b52dc5 100644
--- a/multimedia/smplayer/pkg-plist
+++ b/multimedia/smplayer/pkg-plist
@@ -12,6 +12,7 @@ share/icons/hicolor/512x512/apps/smplayer.png
 share/icons/hicolor/64x64/apps/smplayer.png
 share/icons/hicolor/scalable/apps/smplayer.svg
 share/man/man1/smplayer.1.gz
+share/metainfo/smplayer.appdata.xml
 %%DATADIR%%/input.conf
 %%DATADIR%%/shortcuts/default.keys
 %%DATADIR%%/shortcuts/euskara.keys