Merge pull request #43 from nilsding/master

Initial BSD support

GNUmakefile

@@ -0,0 +1,96 @@
+SINGLE_USER	= false
+
+ifndef VLC_SUPPORT
+	VLC_SUPPORT = true
+endif
+
+ifeq ($(SINGLE_USER),false)
+	BASE_PATH    = /usr
+	VLC_LIB_PATH = ${PREFIX}/usr/lib
+else
+	BASE_PATH    = ${HOME}/.local
+	VLC_LIB_PATH = ${HOME}/.local/share
+endif
+
+	BIN_PATH          = ${PREFIX}$(BASE_PATH)/bin
+	LIB_PATH          = ${PREFIX}$(BASE_PATH)/lib
+	APP_SHORTCUT_PATH = ${PREFIX}$(BASE_PATH)/share/applications
+	SHARE_PATH        = ${PREFIX}$(BASE_PATH)/share
+
+common:
+	-mkdir -p $(LIB_PATH)/syncplay/resources/
+	-mkdir -p $(LIB_PATH)/syncplay/resources/lua
+	-mkdir -p $(LIB_PATH)/syncplay/resources/lua/intf
+	-mkdir -p $(APP_SHORTCUT_PATH)
+	-mkdir -p $(SHARE_PATH)/app-install/icons
+	-mkdir -p $(SHARE_PATH)/pixmaps/
+	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/intf/*.lua $(LIB_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/
+
+u-common:
+	-rm -rf $(LIB_PATH)/syncplay
+	-rm $(SHARE_PATH)/icons/hicolor/*/apps/syncplay.png
+	-rm $(SHARE_PATH)/app-install/icons/syncplay.png
+	-rm $(SHARE_PATH)/pixmaps/syncplay.png
+
+client:
+	-mkdir -p $(BIN_PATH)
+	cp syncplayClient.py $(BIN_PATH)/syncplay
+	sed -i -e 's%# libpath%site.addsitedir\("$(BASE_PATH)/lib/syncplay"\)%' $(BIN_PATH)/syncplay
+	chmod 755 $(BIN_PATH)/syncplay
+	cp syncplayClient.py $(LIB_PATH)/syncplay/
+	cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/
+
+ifeq ($(SINGLE_USER),false)
+	chmod 755 $(APP_SHORTCUT_PATH)/syncplay.desktop
+endif
+	
+ifeq ($(VLC_SUPPORT),true)
+	-mkdir -p $(VLC_LIB_PATH)/vlc/lua/intf/
+	cp resources/lua/intf/syncplay.lua $(VLC_LIB_PATH)/vlc/lua/intf/
+endif
+
+u-client:
+	-rm $(BIN_PATH)/syncplay
+	-rm $(LIB_PATH)/syncplay/syncplayClient.py
+	-rm $(VLC_LIB_PATH)/vlc/lua/intf/syncplay.lua
+	-rm $(APP_SHORTCUT_PATH)/syncplay.desktop
+
+server:
+	-mkdir -p $(BIN_PATH)
+	cp syncplayServer.py $(BIN_PATH)/syncplay-server
+	sed -i -e 's%# libpath%site.addsitedir\("$(BASE_PATH)/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)/
+
+ifeq ($(SINGLE_USER),false)
+	chmod 755 $(APP_SHORTCUT_PATH)/syncplay-server.desktop
+endif
+
+u-server:
+	-rm $(BIN_PATH)/syncplay-server
+	-rm $(LIB_PATH)/syncplay/syncplayServer.py
+	-rm $(APP_SHORTCUT_PATH)/syncplay-server.desktop
+	
+warnings:
+ifeq ($(SINGLE_USER),true)
+	@echo -e "\n**********\n**********\n \nRemeber to add ${HOME}/.local/bin to your \$$PATH with 'echo \"export PATH=\$$PATH:${HOME}/.local/bin\" >> ${HOME}/.profile' \nThis will take effect after you logoff.\n \n**********\n**********\n"
+endif
+
+install-client: common client warnings
+
+uninstall-client: u-client u-common 
+
+install-server: common server warnings
+
+uninstall-server: u-server u-common
+
+install: common client server warnings 
+
+uninstall: u-client u-server u-common

Makefile

@@ -1,96 +1,5 @@
-SINGLE_USER	= false
+GNU=gmake $*
-
+all:
-ifndef VLC_SUPPORT
+	@$(GNU)
-	VLC_SUPPORT = true
+.DEFAULT:
-endif
+	@$(GNU)
-
-ifeq ($(SINGLE_USER),false)
-	BASE_PATH    = /usr
-	VLC_LIB_PATH = ${PREFIX}/usr/lib
-else
-	BASE_PATH    = ${HOME}/.local
-	VLC_LIB_PATH = ${HOME}/.local/share
-endif
-
-	BIN_PATH          = ${PREFIX}$(BASE_PATH)/bin
-	LIB_PATH          = ${PREFIX}$(BASE_PATH)/lib
-	APP_SHORTCUT_PATH = ${PREFIX}$(BASE_PATH)/share/applications
-	SHARE_PATH        = ${PREFIX}$(BASE_PATH)/share
-
-common:
-	-mkdir -p $(LIB_PATH)/syncplay/resources/
-	-mkdir -p $(LIB_PATH)/syncplay/resources/lua
-	-mkdir -p $(LIB_PATH)/syncplay/resources/lua/intf
-	-mkdir -p $(APP_SHORTCUT_PATH)
-	-mkdir -p $(SHARE_PATH)/app-install/icons
-	-mkdir -p $(SHARE_PATH)/pixmaps/
-	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/intf/*.lua $(LIB_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/
-
-u-common:
-	-rm -rf $(LIB_PATH)/syncplay
-	-rm $(SHARE_PATH)/icons/hicolor/*/apps/syncplay.png
-	-rm $(SHARE_PATH)/app-install/icons/syncplay.png
-	-rm $(SHARE_PATH)/pixmaps/syncplay.png
-
-client:
-	-mkdir -p $(BIN_PATH)
-	cp syncplayClient.py $(BIN_PATH)/syncplay
-	sed -i -e 's%# libpath%site.addsitedir\("$(BASE_PATH)/lib/syncplay"\)%' $(BIN_PATH)/syncplay
-	chmod 755 $(BIN_PATH)/syncplay
-	cp syncplayClient.py $(LIB_PATH)/syncplay/
-	cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/
-
-ifeq ($(SINGLE_USER),false)
-	chmod 755 $(APP_SHORTCUT_PATH)/syncplay.desktop
-endif
-	
-ifeq ($(VLC_SUPPORT),true)
-	-mkdir -p $(VLC_LIB_PATH)/vlc/lua/intf/
-	cp resources/lua/intf/syncplay.lua $(VLC_LIB_PATH)/vlc/lua/intf/
-endif
-
-u-client:
-	-rm $(BIN_PATH)/syncplay
-	-rm $(LIB_PATH)/syncplay/syncplayClient.py
-	-rm $(VLC_LIB_PATH)/vlc/lua/intf/syncplay.lua
-	-rm $(APP_SHORTCUT_PATH)/syncplay.desktop
-
-server:
-	-mkdir -p $(BIN_PATH)
-	cp syncplayServer.py $(BIN_PATH)/syncplay-server
-	sed -i -e 's%# libpath%site.addsitedir\("$(BASE_PATH)/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)/
-
-ifeq ($(SINGLE_USER),false)
-	chmod 755 $(APP_SHORTCUT_PATH)/syncplay-server.desktop
-endif
-
-u-server:
-	-rm $(BIN_PATH)/syncplay-server
-	-rm $(LIB_PATH)/syncplay/syncplayServer.py
-	-rm $(APP_SHORTCUT_PATH)/syncplay-server.desktop
-	
-warnings:
-ifeq ($(SINGLE_USER),true)
-	@echo -e "\n**********\n**********\n \nRemeber to add ${HOME}/.local/bin to your \$$PATH with 'echo \"export PATH=\$$PATH:${HOME}/.local/bin\" >> ${HOME}/.profile' \nThis will take effect after you logoff.\n \n**********\n**********\n"
-endif
-
-install-client: common client warnings
-
-uninstall-client: u-client u-common 
-
-install-server: common server warnings
-
-uninstall-server: u-server u-common
-
-install: common client server warnings 
-
-uninstall: u-client u-server u-common

resources/lua/intf/syncplay.lua

@@ -21,6 +21,7 @@ Place the syncplay.lua file in the main (all user) VLC /lua/intf/ sub-directory:
 * Window: %ProgramFiles%\VideoLAN\VLC\lua\intf\
 * Linux: /usr/lib/vlc/lua/intf/
 * Mac OS X: /Applications/VLC.app/Contents/MacOS/share/lua/intf/
+* FreeBSD, OpenBSD etc.: /usr/local/lib/vlc/lua/intf/
 
 You may also need to re-copy the syncplay.lua file when you update VLC.
 

syncplay/constants.py

@@ -70,7 +70,9 @@ VLC_PATHS = [
     r"C:\Program Files\VideoLAN\VLC\vlc.exe",
     "/usr/bin/vlc",
     "/usr/bin/vlc-wrapper",
-    "/Applications/VLC.app/Contents/MacOS/VLC"
+    "/Applications/VLC.app/Contents/MacOS/VLC",
+    "/usr/local/bin/vlc",
+    "/usr/local/bin/vlc-wrapper"
 ]
 
 VLC_ICONPATH = "vlc.png"

syncplay/players/vlc.py

@@ -261,6 +261,11 @@ class VlcPlayer(BasePlayer):
             elif sys.platform.startswith('darwin'):
                 playerController.vlcIntfPath = "/Applications/VLC.app/Contents/MacOS/share/lua/intf/"
                 playerController.vlcIntfUserPath = os.path.join(os.getenv('HOME', '.'), "Library/Application Support/org.videolan.vlc/lua/intf/")
+            elif 'bsd' in sys.platform or sys.platform.startswith('dragonfly'):
+                # *BSD ports/pkgs install to /usr/local by default.
+                # This should also work for all the other BSDs, such as OpenBSD or DragonFly.
+                playerController.vlcIntfPath = "/usr/local/lib/vlc/lua/intf/"
+                playerController.vlcIntfUserPath = os.path.join(os.getenv('HOME', '.'), ".local/share/vlc/lua/intf/")
             else:
                 playerController.vlcIntfPath = os.path.dirname(playerPath).replace("\\", "/") + "/lua/intf/"
                 playerController.vlcIntfUserPath = os.path.join(os.getenv('APPDATA', '.'), "VLC\\lua\\intf\\")

syncplay/ui/GuiConfiguration.py

@@ -131,6 +131,8 @@ class ConfigDialog(QtGui.QDialog):
             defaultdirectory = "/usr/bin"
         elif sys.platform.startswith('darwin'):
             defaultdirectory = "/Applications/"
+        elif "bsd" in sys.platform or sys.platform.startswith('dragonfly'):
+            defaultdirectory = "/usr/local/bin"
 
         fileName, filtr = QtGui.QFileDialog.getOpenFileName(self,
                 "Browse for media player executable",