webvideo/webvideo-arch.patch

   1 --- webvideo-0.4.0//Makefile    2010-11-18 19:52:56.000000000 +0200
   2 +++ webvideo-0.4.0-arch//Makefile       2011-02-19 17:29:37.736916562 +0200
   3 @@ -1,5 +1,5 @@
   4  # prefix for non-VDR stuff
   5 -PREFIX ?= /usr/local
   6 +PREFIX ?= /usr/
   7  # VDR directory
   8  VDRDIR ?= /usr/src/vdr-1.6.0
   9  # VDR's library directory
  10 @@ -32,7 +32,7 @@
  11         $(MAKE) -C src/libwebvi all libwebvi.a
  12
  13  build-python: webvi.conf
  14 -       python setup.py build
  15 +       python2 setup.py build
  16
  17  webvi.conf webvi.plugin.conf: %.conf: examples/%.conf
  18         sed 's_templatepath = /usr/local/share/webvi/templates_templatepath = $(PREFIX)/share/webvi/templates_g' < $< > $@
  19 @@ -56,7 +56,7 @@
  20         $(MAKE) -C src/libwebvi install
  21
  22  install-python: uninstall-deprecated-templates
  23 -       python setup.py install --skip-build --prefix $(PREFIX) $${DESTDIR:+--root $(DESTDIR)}
  24 +       python2 setup.py install --skip-build --prefix $(PREFIX) $${DESTDIR:+--root $(DESTDIR)}
  25
  26  install-conf: webvi.conf webvi.plugin.conf
  27         mkdir -p $(DESTDIR)/etc
  28 @@ -93,7 +93,7 @@
  29         $(MAKE) -C src/vdr-plugin clean
  30         $(MAKE) -C src/libwebvi clean
  31         rm -rf src/vdr-plugin/locale webvi.conf
  32 -       python setup.py clean -a
  33 +       python2 setup.py clean -a
  34         find . -name "*~" -exec rm {} \;
  35         find . -name "*.pyc" -exec rm {} \;
  36
  37 diff -Naur webvideo-0.4.0//src/libwebvi/Makefile webvideo-0.4.0-arch//src/libwebvi/Makefile
  38 --- webvideo-0.4.0//src/libwebvi/Makefile       2010-11-15 19:16:23.000000000 +0200
  39 +++ webvideo-0.4.0-arch//src/libwebvi/Makefile  2011-02-20 00:09:19.067260793 +0200
  40 @@ -1,4 +1,4 @@
  41 -PREFIX ?= /usr/local
  42 +PREFIX ?= /usr/
  43  SYSLIBDIR = $(PREFIX)/lib
  44
  45  LIBNAME=libwebvi.so
  46 @@ -6,17 +6,17 @@
  47  LIBMINOR=$(LIBSONAME).4
  48
  49  VERSION:=$(shell grep VERSION webvi/version.py | cut -d \' -f 2)
  50 -PYLIB:=$(shell python pythonlibname.py)
  51 +PYLIB:=$(shell python2 pythonlibname.py)
  52  DEFINES:=-DPYTHONSHAREDLIB=\"$(PYLIB)\" -DLIBWEBVI_VERSION=\"$(VERSION)\"
  53  # append -DDEBUG to DEFINES to get debug output
  54
  55  all: $(LIBMINOR)
  56
  57  libwebvi.o: libwebvi.c libwebvi.h
  58 -       $(CC) -fPIC -Wall -O2 -g $(CFLAGS) $(DEFINES) `python-config --cflags` -c -o libwebvi.o libwebvi.c
  59 +       $(CC) -fPIC -Wall -O2 -g $(CFLAGS) $(DEFINES) `python2-config --cflags` -c -o libwebvi.o libwebvi.c
  60
  61  $(LIBMINOR): libwebvi.o
  62 -       $(CC) -shared -Wl,-soname,$(LIBSONAME) -Wl,--as-needed libwebvi.o `python-config --ldflags` -o $(LIBMINOR)
  63 +       $(CC) -shared -Wl,-soname,$(LIBSONAME) -Wl,--as-needed libwebvi.o `python2-config --ldflags` -o $(LIBMINOR)
  64         ln -sf $(LIBMINOR) $(LIBSONAME)
  65         ln -sf $(LIBSONAME) $(LIBNAME)
  66
  67 diff -Naur webvideo-0.4.0//src/libwebvi/pythonlibname.py webvideo-0.4.0-arch//src/libwebvi/pythonlibname.py
  68 --- webvideo-0.4.0//src/libwebvi/pythonlibname.py       2010-11-15 19:16:23.000000000 +0200
  69 +++ webvideo-0.4.0-arch//src/libwebvi/pythonlibname.py  2011-02-19 16:57:48.632174476 +0200
  70 @@ -1,4 +1,4 @@
  71 -#!/usr/bin/python
  72 +#!/usr/bin/python2
  73
  74  import distutils.sysconfig
  75  import os