diff options
| -rw-r--r-- | Makefile | 30 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | README.vdrplugin | 2 | ||||
| -rw-r--r-- | README.webvi | 4 | ||||
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | examples/webvi.plugin.conf | 4 | ||||
| -rw-r--r-- | src/libwebvi/Makefile | 7 |
7 files changed, 31 insertions, 24 deletions
@@ -26,7 +26,7 @@ all-noinstall: libwebvi vdr-plugin all: libwebvi vdr-plugin $(LIBDIR)/libvdr-webvideo.so.$(APIVERSION) webvi.conf vdr-plugin: libwebvi - $(MAKE) -C src/vdr-plugin LOCALEDIR=./locale LIBDIR=. VDRDIR=$(VDRDIR) CXXFLAGS="-fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses" + $(MAKE) -C src/vdr-plugin LOCALEDIR=./locale LIBDIR=. VDRDIR=$(VDRDIR) CXXFLAGS="-fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses $(CXXFLAGS)" libwebvi: build-python $(MAKE) -C src/libwebvi all libwebvi.a @@ -34,32 +34,30 @@ libwebvi: build-python build-python: webvi.conf python setup.py build -webvi.conf: - sed 's_templatepath = /usr/local/share/webvi/templates_templatepath = $(PREFIX)/share/webvi/templates_g' < examples/webvi.conf > webvi.conf - -webvi.plugin.conf: - cp -f examples/webvi.plugin.conf webvi.plugin.conf +webvi.conf webvi.plugin.conf: %.conf: examples/%.conf + sed 's_templatepath = /usr/local/share/webvi/templates_templatepath = $(PREFIX)/share/webvi/templates_g' < $< > $@ $(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION): vdr-plugin - mkdir -p $(VDRPLUGINDIR) - cp -f src/vdr-plugin/libvdr-webvideo.so.$(APIVERSION) $(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION) + mkdir -p $(DESTDIR)$(VDRPLUGINDIR) + cp -f src/vdr-plugin/libvdr-webvideo.so.$(APIVERSION) $(DESTDIR)$(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION) install-vdr-plugin: vdr-plugin $(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION) - mkdir -p $(VDRLOCALEDIR) - cp -rf src/vdr-plugin/locale/* $(VDRLOCALEDIR) - mkdir -p $(VDRPLUGINCONFDIR)/webvideo - cp -f src/vdr-plugin/mime.types $(VDRPLUGINCONFDIR)/webvideo + mkdir -p $(DESTDIR)$(VDRLOCALEDIR) + cp -rf src/vdr-plugin/locale/* $(DESTDIR)$(VDRLOCALEDIR) + mkdir -p $(DESTDIR)$(VDRPLUGINCONFDIR)/webvideo + cp -f src/vdr-plugin/mime.types $(DESTDIR)$(VDRPLUGINCONFDIR)/webvideo install-libwebvi: libwebvi $(MAKE) -C src/libwebvi install install-python: - python setup.py install --prefix $(PREFIX) + python setup.py install --skip-build --prefix $(PREFIX) $${DESTDIR:+--root $(DESTDIR)} install-conf: webvi.conf webvi.plugin.conf - cp -f webvi.conf /etc/ - mkdir -p $(VDRPLUGINCONFDIR)/webvideo - cp -f webvi.plugin.conf $(VDRPLUGINCONFDIR)/webvideo + mkdir -p $(DESTDIR)/etc + cp -f webvi.conf $(DESTDIR)/etc + mkdir -p $(DESTDIR)$(VDRPLUGINCONFDIR)/webvideo + cp -f webvi.plugin.conf $(DESTDIR)$(VDRPLUGINCONFDIR)/webvideo install-webvi: install-libwebvi install-python @@ -2,7 +2,7 @@ Written by: Antti Ajanki <antti.ajanki@iki.fi> Project's homepage: http://users.tkk.fi/~aajanki/vdr/webvideo Webvi is a tool for downloading and playing videos from popular video -sharing webvites such as YouTube. There are two interfaces: a plugin +sharing websites such as YouTube. There are two interfaces: a plugin for Video Disk Recorder (VDR), and a command line client. The two interfaces are described in README.vdrplugin and README.webvi. @@ -22,7 +22,7 @@ Supported video sites: * YLE Areena [2] * YouTube -[1] Only videos hosted by Google, Youtube, Vimeo and SVT +[1] Only videos hosted by Google, YouTube, Vimeo and SVT [2] Requires rtmpdump-yle (http://users.tkk.fi/~aajanki/rtmpdump-yle/index.html). Streaming diff --git a/README.vdrplugin b/README.vdrplugin index 19c8b04..6154aa6 100644 --- a/README.vdrplugin +++ b/README.vdrplugin @@ -17,7 +17,7 @@ See the file COPYING for more information. Description: Webvideo is a VDR plugin for downloading videos from popular video -sharing webvites such as YouTube. With the help of xineliboutput +sharing websites such as YouTube. With the help of xineliboutput plugin the videos can be played directly in VDR without downloading them first. See README for the full list of supported sites. diff --git a/README.webvi b/README.webvi index 8dbf9a7..b1dc246 100644 --- a/README.webvi +++ b/README.webvi @@ -12,7 +12,7 @@ Description ----------- Webvi is a tool for downloading and playing videos from popular video -sharing webvites such as YouTube. See README for the full list of +sharing websites such as YouTube. See README for the full list of supported sites. Installation @@ -97,7 +97,7 @@ templatepath Path to video site templates. Quality of the downloaded and streamed videos can be selected in video -site specific sections. Currently only Youtube module (section should +site specific sections. Currently only YouTube module (section should be called [site-youtube]) supports multiple qualities. The following options are recognized: @@ -18,3 +18,7 @@ when using external downloader process (YLE Areena) Streaming does not work with external downloader process (YLE Areena) Fix support for mplayer plugin + +Ville Skytän patchit + +transcode: GPL3 or later diff --git a/examples/webvi.plugin.conf b/examples/webvi.plugin.conf index 675f8d7..75830bf 100644 --- a/examples/webvi.plugin.conf +++ b/examples/webvi.plugin.conf @@ -1,3 +1,7 @@ +[webvi] + +templatepath = /usr/local/share/webvi/templates + [site-youtube] stream-max-quality = 50 diff --git a/src/libwebvi/Makefile b/src/libwebvi/Makefile index 131c4a7..fc68277 100644 --- a/src/libwebvi/Makefile +++ b/src/libwebvi/Makefile @@ -1,4 +1,5 @@ PREFIX ?= /usr/local +SYSLIBDIR = $(PREFIX)/lib LIBNAME=libwebvi.so LIBSONAME=$(LIBNAME).0 @@ -27,8 +28,8 @@ clean: rm -f webvi/*.pyc webvi/*~ install: $(LIBMINOR) - mkdir -p $(PREFIX)/lib - cp --remove-destination -d $(LIBNAME)* $(PREFIX)/lib - /sbin/ldconfig $(PREFIX)/lib + mkdir -p $(DESTDIR)$(SYSLIBDIR) + cp --remove-destination -d $(LIBNAME)* $(DESTDIR)$(SYSLIBDIR) + /sbin/ldconfig $${DESTDIR:+-N} $(DESTDIR)$(SYSLIBDIR) .PHONY: clean install |