Index: head/multimedia/syncplay/Makefile =================================================================== --- head/multimedia/syncplay/Makefile (revision 497867) +++ head/multimedia/syncplay/Makefile (revision 497868) @@ -1,44 +1,44 @@ # $FreeBSD$ PORTNAME= syncplay DISTVERSIONPREFIX= v -DISTVERSION= 1.6.2 +DISTVERSION= 1.6.3 CATEGORIES= multimedia MAINTAINER= heckendorfc@gmail.com COMMENT= Synchronize video playback over networks LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} USES= desktop-file-utils gmake python:3.4+ shebangfix USE_GITHUB= yes GH_ACCOUNT= Syncplay SHEBANG_FILES= syncplayClient.py \ syncplayServer.py MAKEFILE= GNUmakefile NO_ARCH= yes OPTIONS_DEFINE= GUI VLC OPTIONS_DEFAULT= GUI VLC CLIENT SERVER OPTIONS_SUB= yes OPTIONS_MULTI= MODES OPTIONS_MULTI_MODES= CLIENT SERVER CLIENT_DESC= Client mode SERVER_DESC= Server mode VLC_DESC= Support for VLC media player GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyside2>=0:devel/pyside2@${PY_FLAVOR} VLC_MAKE_ARGS= VLC_SUPPORT=true VLC_MAKE_ARGS_OFF= VLC_SUPPORT=false CLIENT_INSTALL_TARGET= install-client SERVER_INSTALL_TARGET= install-server post-patch: @${REINPLACE_CMD} -e 's|path = os.path.dirname(os.path.dirname(__file__))|path = "'${DATADIR}'"|g' ${WRKSRC}/syncplay/utils.py .include Index: head/multimedia/syncplay/distinfo =================================================================== --- head/multimedia/syncplay/distinfo (revision 497867) +++ head/multimedia/syncplay/distinfo (revision 497868) @@ -1,3 +1,3 @@ -TIMESTAMP = 1549885925 -SHA256 (Syncplay-syncplay-v1.6.2_GH0.tar.gz) = 42f2e18063dbc4e540d6be423d459f6b359977dd5c2188df41846017378ba0a0 -SIZE (Syncplay-syncplay-v1.6.2_GH0.tar.gz) = 1640481 +TIMESTAMP = 1553018479 +SHA256 (Syncplay-syncplay-v1.6.3_GH0.tar.gz) = fa65ac115c2cda978d2ce41228bddc3f0954543475d091dd1db78d4ba50d3794 +SIZE (Syncplay-syncplay-v1.6.3_GH0.tar.gz) = 1755890 Index: head/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py =================================================================== --- head/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py (revision 497867) +++ head/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py (nonexistent) @@ -1,13 +0,0 @@ ---- syncplay/ui/GuiConfiguration.py.orig 2019-01-15 11:08:33 UTC -+++ syncplay/ui/GuiConfiguration.py -@@ -1109,8 +1109,8 @@ class ConfigDialog(QtWidgets.QDialog): - if lang == self.config['language']: - self.languageCombobox.setCurrentIndex(self.languageCombobox.count()-1) - self.languageCombobox.currentIndexChanged.connect(self.languageChanged) -- self.languageLayout.addWidget(self.languageLabel, 1, 0) -- self.languageLayout.addWidget(self.languageCombobox, 1, 1) -+ self.languageLayout.addWidget(self.languageLabel, 1, Qt.AlignLeft) -+ self.languageLayout.addWidget(self.languageCombobox, 1, Qt.AlignLeft) - self.displaySettingsLayout.addWidget(self.languageFrame) - - self.languageLabel.setObjectName("language") Property changes on: head/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/syncplay/files/patch-GNUmakefile =================================================================== --- head/multimedia/syncplay/files/patch-GNUmakefile (revision 497867) +++ head/multimedia/syncplay/files/patch-GNUmakefile (revision 497868) @@ -1,58 +1,49 @@ ---- GNUmakefile.orig 2018-04-07 21:02:55 UTC +--- GNUmakefile.orig 2019-03-15 11:21:49 UTC +++ GNUmakefile -@@ -38,17 +38,22 @@ endif +@@ -34,17 +34,22 @@ endif APP_SHORTCUT_PATH = ${DESTDIR}${PREFIX}/share/applications SHARE_PATH = ${DESTDIR}${PREFIX}/share +default: + +all: + common: - -mkdir -p $(LIB_PATH)/syncplay/resources/lua/intf + -mkdir -p $(SHARE_PATH)/syncplay/resources/lua/intf -mkdir -p $(APP_SHORTCUT_PATH) -mkdir -p $(SHARE_PATH)/app-install/icons -mkdir -p $(SHARE_PATH)/pixmaps/ + -mkdir -p $(LIB_PATH)/syncplay cp -r syncplay $(LIB_PATH)/syncplay/ chmod 755 $(LIB_PATH)/syncplay/ cp -r resources/hicolor $(SHARE_PATH)/icons/ - cp -r resources/*.png $(LIB_PATH)/syncplay/resources/ - cp -r resources/*.lua $(LIB_PATH)/syncplay/resources/ - cp -r resources/lua/intf/*.lua $(LIB_PATH)/syncplay/resources/lua/intf/ + cp -r resources/*.png $(SHARE_PATH)/syncplay/resources/ + cp -r resources/*.lua $(SHARE_PATH)/syncplay/resources/ + cp -r resources/lua/intf/*.lua $(SHARE_PATH)/syncplay/resources/lua/intf/ cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/app-install/icons/ cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/pixmaps/ -@@ -60,8 +65,8 @@ u-common: +@@ -56,8 +61,8 @@ u-common: client: -mkdir -p $(BIN_PATH) + sed -i '' -e 's%# libpath%import site; site.addsitedir\("${PREFIX}/lib/syncplay"\)%' syncplayClient.py cp syncplayClient.py $(BIN_PATH)/syncplay - sed -i -e '/# libpath/ a\import site\nsite.addsitedir\("${PREFIX}/lib/syncplay"\)' $(BIN_PATH)/syncplay chmod 755 $(BIN_PATH)/syncplay cp syncplayClient.py $(LIB_PATH)/syncplay/ cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/ -@@ -73,8 +78,6 @@ endif - ifeq ($(VLC_SUPPORT),true) - -mkdir -p ${DESTDIR}$(VLC_LIB_PATH)/vlc/lua/intf/ - cp resources/lua/intf/syncplay.lua ${DESTDIR}$(VLC_LIB_PATH)/vlc/lua/intf/ -- -mkdir -p ${DESTDIR}$(VLC_LIB_PATH64)/vlc/lua/intf/ -- cp resources/lua/intf/syncplay.lua ${DESTDIR}$(VLC_LIB_PATH64)/vlc/lua/intf/ - endif - - u-client: -@@ -86,8 +89,8 @@ u-client: +@@ -75,8 +80,8 @@ u-client: server: -mkdir -p $(BIN_PATH) + sed -i '' -e 's%# libpath%import site; site.addsitedir\("${PREFIX}/lib/syncplay"\)%' syncplayServer.py cp syncplayServer.py $(BIN_PATH)/syncplay-server - sed -i -e '/# libpath/ a\import site\nsite.addsitedir\("${PREFIX}/lib/syncplay"\)' $(BIN_PATH)/syncplay-server chmod 755 $(BIN_PATH)/syncplay-server cp syncplayServer.py $(LIB_PATH)/syncplay/ cp resources/syncplay-server.desktop $(APP_SHORTCUT_PATH)/ Index: head/multimedia/syncplay/pkg-plist =================================================================== --- head/multimedia/syncplay/pkg-plist (revision 497867) +++ head/multimedia/syncplay/pkg-plist (revision 497868) @@ -1,99 +1,101 @@ %%CLIENT%%bin/syncplay %%SERVER%%bin/syncplay-server %%DATADIR%%/resources/accept.png %%DATADIR%%/resources/application_get.png %%DATADIR%%/resources/arrow_refresh.png %%DATADIR%%/resources/arrow_switch.png %%DATADIR%%/resources/arrow_undo.png %%DATADIR%%/resources/bullet_right_grey.png %%DATADIR%%/resources/chevrons_right.png %%DATADIR%%/resources/clock_go.png %%DATADIR%%/resources/cog.png %%DATADIR%%/resources/cog_delete.png %%DATADIR%%/resources/comments.png %%DATADIR%%/resources/control_pause_blue.png %%DATADIR%%/resources/control_play_blue.png %%DATADIR%%/resources/cross.png %%DATADIR%%/resources/cross_checkbox.png %%DATADIR%%/resources/delete.png %%DATADIR%%/resources/door_in.png %%DATADIR%%/resources/email_go.png %%DATADIR%%/resources/empty_checkbox.png %%DATADIR%%/resources/error.png %%DATADIR%%/resources/eye.png %%DATADIR%%/resources/film_add.png %%DATADIR%%/resources/film_edit.png %%DATADIR%%/resources/film_folder_edit.png %%DATADIR%%/resources/film_go.png %%DATADIR%%/resources/film_link.png %%DATADIR%%/resources/folder_explore.png %%DATADIR%%/resources/folder_film.png %%DATADIR%%/resources/help.png %%DATADIR%%/resources/house.png %%DATADIR%%/resources/key_go.png %%DATADIR%%/resources/lock.png +%%DATADIR%%/resources/lock_green.png +%%DATADIR%%/resources/lock_green_dialog.png %%DATADIR%%/resources/lock_open.png %%DATADIR%%/resources/lua/intf/syncplay.lua %%DATADIR%%/resources/mpc-be.png %%DATADIR%%/resources/mpc-hc.png %%DATADIR%%/resources/mpc-hc64.png %%DATADIR%%/resources/mplayer.png %%DATADIR%%/resources/mpv.png %%DATADIR%%/resources/page_white_key.png %%DATADIR%%/resources/shield_add.png %%DATADIR%%/resources/shield_edit.png %%DATADIR%%/resources/syncplay.png %%DATADIR%%/resources/syncplayintf.lua %%DATADIR%%/resources/table_refresh.png %%DATADIR%%/resources/tick.png %%DATADIR%%/resources/tick_checkbox.png %%DATADIR%%/resources/timeline_marker.png %%DATADIR%%/resources/user_comment.png %%DATADIR%%/resources/user_key.png %%DATADIR%%/resources/vlc.png %%DATADIR%%/resources/world_add.png %%DATADIR%%/resources/world_explore.png %%DATADIR%%/resources/world_go.png lib/syncplay/syncplay/__init__.py lib/syncplay/syncplay/client.py lib/syncplay/syncplay/clientManager.py lib/syncplay/syncplay/constants.py lib/syncplay/syncplay/messages.py +lib/syncplay/syncplay/messages_es.py lib/syncplay/syncplay/messages_de.py lib/syncplay/syncplay/messages_en.py lib/syncplay/syncplay/messages_it.py lib/syncplay/syncplay/messages_ru.py lib/syncplay/syncplay/players/__init__.py lib/syncplay/syncplay/players/basePlayer.py lib/syncplay/syncplay/players/mpc.py lib/syncplay/syncplay/players/mpcbe.py lib/syncplay/syncplay/players/mplayer.py lib/syncplay/syncplay/players/mpv.py lib/syncplay/syncplay/players/playerFactory.py lib/syncplay/syncplay/players/vlc.py lib/syncplay/syncplay/protocols.py lib/syncplay/syncplay/server.py %%CLIENT%%lib/syncplay/syncplayClient.py %%SERVER%%lib/syncplay/syncplayServer.py lib/syncplay/syncplay/ui/ConfigurationGetter.py lib/syncplay/syncplay/ui/GuiConfiguration.py lib/syncplay/syncplay/ui/__init__.py lib/syncplay/syncplay/ui/consoleUI.py lib/syncplay/syncplay/ui/gui.py lib/syncplay/syncplay/utils.py lib/syncplay/syncplay/vendor/Qt.py lib/syncplay/syncplay/vendor/__init__.py lib/syncplay/syncplay/vendor/qt5reactor.py -%%CLIENT%%%%VLC%%lib/vlc/lua/intf/syncplay.lua share/app-install/icons/syncplay.png %%CLIENT%%share/applications/syncplay.desktop %%SERVER%%share/applications/syncplay-server.desktop share/icons/128x128/apps/syncplay.png share/icons/16x16/apps/syncplay.png share/icons/24x24/apps/syncplay.png share/icons/256x256/apps/syncplay.png share/icons/32x32/apps/syncplay.png share/icons/48x48/apps/syncplay.png share/icons/64x64/apps/syncplay.png share/icons/96x96/apps/syncplay.png share/pixmaps/syncplay.png