diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile index 8aeeb57807d7..420293e9ece1 100644 --- a/multimedia/smplayer/Makefile +++ b/multimedia/smplayer/Makefile @@ -1,82 +1,85 @@ # Created by: Diego Depaoli and Yinghong Liu PORTNAME= smplayer -DISTVERSION= 21.1.0 -PORTREVISION= 1 +DISTVERSION= 21.10.0 CATEGORIES= multimedia audio kde MASTER_SITES= SF/${PORTNAME}/SMPlayer/${PORTVERSION} MAINTAINER= vvd@unislabs.com COMMENT= Complete front-end based on Qt for mplayer LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/Copying.txt USES= cpe compiler:c++11-lang desktop-file-utils dos2unix gl \ gmake qmake qt:5 tar:bzip2 xorg USE_GL= gl USE_QT= buildtools_build linguisttools_build \ core dbus gui network script widgets xml USE_XORG= x11 xext CPE_VENDOR= ricardo_villalba DOS2UNIX_REGEX= .*.[^p][^n][^g]$ ALL_TARGET= src/smplayer 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 OPTIONS_DEFINE= DOCS DEBUG SKINS THEMES OPTIONS_DEFAULT= MPV SKINS THEMES ENGINE_DESC= Multimedia engine MPLAYER_DESC= Allow to use MPlayer as multimedia engine MPV_DESC= Allow to use mpv as multimedia engine SKINS_DESC= Install additional skins THEMES_DESC= Install additional themes MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer MPLAYER_QMAKE_OFF= "DEFINES_DISABLED+=MPLAYER_SUPPORT" MPV_RUN_DEPENDS= mpv:multimedia/mpv MPV_QMAKE_OFF= "DEFINES_DISABLED+=MPV_SUPPORT" SKINS_RUN_DEPENDS= smplayer-skins>=0:multimedia/smplayer-skins THEMES_RUN_DEPENDS= smplayer-themes>=0:multimedia/smplayer-themes # Do not use unstable versions PORTSCOUT= site:http://sourceforge.net/projects/smplayer/files/Unstable/releases/ SUB_FILES= pkg-message post-patch: @${REINPLACE_CMD} -e 's|&& $$(QMAKE) $$(QMAKE_OPTS)||; \ s|lrelease|${LRELEASE}|; \ s| make| ${MAKE_CMD}|g' \ ${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|#||' \ ${WRKSRC}/src/smplayer.pro post-patch-DEBUG-off: @${REINPLACE_CMD} -e '/DEFINES += NO_DEBUG_ON_CONSOLE/s|#||' \ ${WRKSRC}/src/smplayer.pro post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/simple_web_server post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .include 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 @@ -1,33 +1,33 @@ --- Makefile.orig 2018-01-12 15:20:18 UTC +++ Makefile @@ -5,7 +5,6 @@ PREFIX=/usr/local CONF_PREFIX=$(PREFIX) DATA_PATH=$(PREFIX)/share/smplayer -DOC_PATH=$(PREFIX)/share/doc/packages/smplayer 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)\\\" \ - DOC_PATH=\\\"$(DOC_PATH)\\\" THEMES_PATH=\\\"$(THEMES_PATH)\\\" \ + THEMES_PATH=\\\"$(THEMES_PATH)\\\" \ 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/ - - -install -d $(DESTDIR)$(DOC_PATH) - tar -C docs/ --exclude=.svn -c -f - . | tar -C $(DESTDIR)$(DOC_PATH) -x -f - -install -d $(DESTDIR)$(SHORTCUTS_PATH) cp src/shortcuts/* $(DESTDIR)$(SHORTCUTS_PATH) 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 @@ -1,70 +1,71 @@ bin/simple_web_server bin/smplayer share/applications/smplayer.desktop share/applications/smplayer_enqueue.desktop share/icons/hicolor/128x128/apps/smplayer.png share/icons/hicolor/16x16/apps/smplayer.png share/icons/hicolor/192x192/apps/smplayer.png share/icons/hicolor/22x22/apps/smplayer.png share/icons/hicolor/256x256/apps/smplayer.png share/icons/hicolor/32x32/apps/smplayer.png 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 %%DATADIR%%/shortcuts/vlc.keys %%DATADIR%%/translations/smplayer_am.qm %%DATADIR%%/translations/smplayer_ar.qm %%DATADIR%%/translations/smplayer_ar_SY.qm %%DATADIR%%/translations/smplayer_bg.qm %%DATADIR%%/translations/smplayer_ca.qm %%DATADIR%%/translations/smplayer_cs.qm %%DATADIR%%/translations/smplayer_da.qm %%DATADIR%%/translations/smplayer_de.qm %%DATADIR%%/translations/smplayer_el.qm %%DATADIR%%/translations/smplayer_en.qm %%DATADIR%%/translations/smplayer_en_GB.qm %%DATADIR%%/translations/smplayer_en_US.qm %%DATADIR%%/translations/smplayer_es.qm %%DATADIR%%/translations/smplayer_es_ES.qm %%DATADIR%%/translations/smplayer_et.qm %%DATADIR%%/translations/smplayer_eu.qm %%DATADIR%%/translations/smplayer_fa.qm %%DATADIR%%/translations/smplayer_fi.qm %%DATADIR%%/translations/smplayer_fr.qm %%DATADIR%%/translations/smplayer_gl.qm %%DATADIR%%/translations/smplayer_he_IL.qm %%DATADIR%%/translations/smplayer_hr.qm %%DATADIR%%/translations/smplayer_hu.qm %%DATADIR%%/translations/smplayer_id.qm %%DATADIR%%/translations/smplayer_it.qm %%DATADIR%%/translations/smplayer_ja.qm %%DATADIR%%/translations/smplayer_ka.qm %%DATADIR%%/translations/smplayer_ko.qm %%DATADIR%%/translations/smplayer_ku.qm %%DATADIR%%/translations/smplayer_lt.qm %%DATADIR%%/translations/smplayer_mk.qm %%DATADIR%%/translations/smplayer_ms_MY.qm %%DATADIR%%/translations/smplayer_nb_NO.qm %%DATADIR%%/translations/smplayer_nl.qm %%DATADIR%%/translations/smplayer_nn_NO.qm %%DATADIR%%/translations/smplayer_pl.qm %%DATADIR%%/translations/smplayer_pt.qm %%DATADIR%%/translations/smplayer_pt_BR.qm %%DATADIR%%/translations/smplayer_ro_RO.qm %%DATADIR%%/translations/smplayer_ru_RU.qm %%DATADIR%%/translations/smplayer_sk.qm %%DATADIR%%/translations/smplayer_sl_SI.qm %%DATADIR%%/translations/smplayer_sq_AL.qm %%DATADIR%%/translations/smplayer_sr.qm %%DATADIR%%/translations/smplayer_sv.qm %%DATADIR%%/translations/smplayer_th.qm %%DATADIR%%/translations/smplayer_tr.qm %%DATADIR%%/translations/smplayer_uk_UA.qm %%DATADIR%%/translations/smplayer_uz.qm %%DATADIR%%/translations/smplayer_vi_VN.qm %%DATADIR%%/translations/smplayer_zh_CN.qm %%DATADIR%%/translations/smplayer_zh_TW.qm