Attachment 229149 Details for Bug 259551 – smplayer update to 21.10.0 v2

[patch] smplayer update to 21.10.0 v2

smplayer.diff (text/plain), 4.26 KB, created by Vladimir Druzenko on 2021-10-30 16:20:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2021-10-30 16:20:57 UTC

Size: 4.26 KB

patch

obsolete

>diff -urN multimedia/smplayer.orig/Makefile multimedia/smplayer/Makefile
>--- multimedia/smplayer.orig/Makefile
>+++ 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 @@
> 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 @@
> 		${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-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>diff -urN multimedia/smplayer.orig/distinfo multimedia/smplayer/distinfo
>--- multimedia/smplayer.orig/distinfo
>+++ 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 -urN multimedia/smplayer.orig/files/patch-Makefile multimedia/smplayer/files/patch-Makefile
>--- multimedia/smplayer.orig/files/patch-Makefile
>+++ 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 -urN multimedia/smplayer.orig/files/patch-src_prefgeneral.cpp multimedia/smplayer/files/patch-src_prefgeneral.cpp
>--- multimedia/smplayer.orig/files/patch-src_prefgeneral.cpp
>+++ multimedia/smplayer/files/patch-src_prefgeneral.cpp
>@@ -0,0 +1,18 @@
>+--- src/prefgeneral.cpp.orig
>++++ 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 -urN multimedia/smplayer.orig/pkg-plist multimedia/smplayer/pkg-plist
>--- multimedia/smplayer.orig/pkg-plist
>+++ multimedia/smplayer/pkg-plist
>@@ -12,6 +12,7 @@
> 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

Flags:

vvd: maintainer-approval+

Actions: View | Diff

Attachments on bug 259551: 229143 | 229144 | 229145 | 229147 | 229149