updated to 2.3.1

1 files changed, 97 insertions, 112 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 40c8839df8dd..2697f628f6a5 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,125 +1,110 @@
 # Maintainer: M0Rf30
 
 pkgname=vdr-devel
-pkgver=2.1.6
+pkgver=2.3.1
 pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="The video disk recorder (VDR)"
+pkgdesc="'open' digital satellite receiver and timer controlled video disk recorder"
 url="ftp://ftp.tvdr.de/vdr/Developer/"
+arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
-depends=('fontconfig' 'gettext' 'libjpeg' 'perl')
-conflicts=('vdr')
-makedepends=('linux-api-headers')
-optdepends=('lirc: To use a remote control'
-            'runvdr-extreme: An alternative runvdr script'
-            'vdrsymbols-ttf: Symbols that some VDR plugins and patches use')
-backup=('etc/vdr/channels.conf'
-        'etc/vdr/diseqc.conf'
-        'etc/vdr/keymacros.conf'
-        'etc/vdr/sources.conf'
-        'etc/vdr/svdrphosts.conf')
-options=(!emptydirs)
-install="${pkgname}.install"
-source=(ftp://ftp.tvdr.de/vdr/Developer/vdr-${pkgver}.tar.bz2
-        Make.config
-	vdr.conf
-	vdr.service
-        vdr-shutdown.sh
-	vdr-check-setup.sh
-	vdr-config.sh
-	vdr-moveto.sh
-	vdr.tmpfiles
-	vdr.sudoers
-	vdr-runvdr.sh
-	51-vdr.rules)
+depends=('libcap' 'libjpeg-turbo' 'libsystemd' 'perl' 'ttf-font')
+makedepends=('systemd') #libsystemd should be enough but the pkg-config file is missing in the libsystemd package
+optdepends=('lirc-utils: remote control support'
+            'ncurses: skincurses plugin'
+            'xlogin: To start X11')
+replaces=('runvdr-extreme')
+conflicts=('runvdr-extreme' 'vdr')
+provides=("vdr-api=2.2.0")
+install='vdr.install'
+source=("ftp://ftp.tvdr.de/vdr/Developer/vdr-$pkgver.tar.bz2"
+        'MainMenuHooks-v1_0_2.diff::http://www.vdr-portal.de/index.php?page=Attachment&attachmentID=30330'
+        '00-vdr.conf' '50-dvbsddevice.conf' '50-hello.conf' '50-pictures.conf' '50-rcu.conf'
+        '60-create-dvb-device-units.rules'
+        'gen-sddropin'
+        'shutdown.sh'
+        'shutdown-wrapper.c'
+        'vdr.service'
+        'vdr.sysuser')
+backup=("etc/vdr/conf.avail/"50-dvb{s,h}ddevice.conf
+        "etc/vdr/conf.avail/"50-{epgtableid0,hello,osddemo,pictures,rcu,skincurses,status,svdrpdemo}.conf
+        "etc/vdr/conf.avail/"50-svc{cli,svr}.conf
+        'etc/vdr/conf.d/00-vdr.conf'
+        'var/lib/vdr/channels.conf'
+        'var/lib/vdr/diseqc.conf'
+        'var/lib/vdr/keymacros.conf'
+        'var/lib/vdr/scr.conf'
+        'var/lib/vdr/sources.conf'
+        'var/lib/vdr/svdrphosts.conf')
+
+prepare() {
+  cd "${srcdir}/vdr-${pkgver}"
+
+  echo 'CFLAGS      += -O3' > Make.config
+  echo 'CXXFLAGS    += -O3' >> Make.config
+  echo 'PREFIX       = /usr' >> Make.config
+  echo 'LIBDIR       = /usr/lib/vdr/plugins' >> Make.config
+  echo 'VDR_USER     = vdr' >> Make.config
+  echo 'SDNOTIFY     = 1' >> Make.config
+  echo 'LIRC_DEVICE  = /run/lirc/lircd' >> Make.config
+
+  sed -i 's/NULL, 0, true/NULL, 0, OpenSubMenus/g' "$srcdir/MainMenuHooks-v1_0_2.diff"
+  patch -p1 -i "$srcdir/MainMenuHooks-v1_0_2.diff"
+
+  sed -i '/define DEPRECATED_VIDEOSYSTEM/d' device.h
+  sed -i '/define DEPRECATED_VDR_CHARSET_OVERRIDE/d' vdr.c
+}
 
 build() {
-  cd $srcdir/vdr-$pkgver
-
-# Patches
-msg2 "Disable some graphs that end up too big to be useful"
-	for g in COLLABORATION INCLUDE INCLUDED_BY ; do
-	    sed -i -e 's/^\(\s*'$g'_GRAPH\s*=\s*\).*/\1NO/' Doxyfile
-	done
-  
-msg2 "Update lirc socket location in man page"
-  sed -i "s|/dev/lircd|/var/run/lirc/lircd|g" vdr.1
-
-msg2 "Don't install runvdr"
-  sed -i "s|runvdr ||g" Makefile
-
-  # VDR directory environment (Make.config):
-  # MANDIR       = /usr/share/man
-  # BINDIR       = /usr/bin
-  # LOCDIR       = /usr/share/locale
-  # PLUGINLIBDIR = /usr/lib/vdr
-  # VIDEODIR     = /var/spool/video
-  # CONFDIR      = /etc/vdr
-  # Also:
-  # VDR_USER = vdr
-
-  cp ../Make.config Make.config
-msg2 "Buildin..."
-  #unset PREFIX
-  make PREFIX=/usr
+  gcc -o shutdown-wrapper shutdown-wrapper.c
+
+  cd "${srcdir}/vdr-${pkgver}"
+  make
 }
 
-package(){
-  cd $srcdir/vdr-$pkgver
-  make DESTDIR="$pkgdir" PREFIX=/usr install 
-  
-  install -d -m755 $pkgdir/usr/bin
-  install -d -m755 $pkgdir/usr/include/vdr/include
-  install -d -m755 $pkgdir/usr/include/vdr/libsi
-  install -d -m755 $pkgdir/usr/share/doc/vdr
-  install -d -m755 $pkgdir/etc/vdr/vdr-plugins.d
-
-msg2 "Install utility scripts"
-  install -m755 ../vdr-check-setup.sh $pkgdir/usr/bin/vdr-check-setup
-  install -m755 ../vdr-config.sh $pkgdir/usr/bin/vdr-config
-  install -m755 ../vdr-moveto.sh $pkgdir/usr/bin/vdr-moveto
-  chmod +x $pkgdir/usr/bin/*
-  install -m755 epg2html $pkgdir/usr/bin/epg2html
-
-msg2 "Install Make.config and vdr header files"
-  install -m644 Make.config $pkgdir/usr/include/vdr
-  install -m644 *.h $pkgdir/usr/include/vdr
-  install -m644 libsi/*.h $pkgdir/usr/include/vdr/libsi
-  ln -sf .. $pkgdir/usr/include/vdr/include/vdr
-  ln -sf ../libsi $pkgdir/usr/include/vdr/include/libsi
-
-msg2 "Install udev rules"
-  mkdir -p $pkgdir/usr/lib/udev/rules.d/
-  cp $srcdir/51-vdr.rules $pkgdir/usr/lib/udev/rules.d/51-vdr.rules
-  chmod a+r $pkgdir/usr/lib/udev/rules.d/51-vdr.rules
-
-msg2 "Init services file" 
-  install -D -m644 ../vdr.conf $pkgdir/etc/vdr/vdr
-  install -D -m644 ../vdr.service $pkgdir/usr/lib/systemd/system/vdr.service
-  install -D -m644 ../vdr.tmpfiles $pkgdir/usr/lib/tmpfiles.d/vdr.conf
-  install -m644 ../vdr-runvdr.sh $pkgdir/usr/sbin/runvdr
-  chmod +x $pkgdir/usr/sbin/runvdr
-
-msg2 "Sudoers file"
-  install -D -m755 ../vdr.sudoers $pkgdir/etc/sudoers.d/vdr
-msg2 "Vdr-shutdown.sh"
-  install -m755 $srcdir/vdr-shutdown.sh $pkgdir/usr/bin/vdr-shutdown.sh
-
-msg2 "Install documents"
-  for _document in channels.conf* *.template CONTRIBUTORS HISTORY INSTALL MANUAL PLUGINS.html README* UPDATE*; do
-    install -m644 ${_document} $pkgdir/usr/share/doc/vdr
+package() {
+  for i in dvbsddevice hello pictures rcu; do
+    install -Dm644 50-$i.conf "$pkgdir/etc/vdr/conf.avail/50-$i.conf"
   done
+
+  install -Dm644 00-vdr.conf "$pkgdir/etc/vdr/conf.d/00-vdr.conf"
+  install -Dm644 60-create-dvb-device-units.rules "$pkgdir/usr/lib/udev/rules.d/60-create-dvb-device-units.rules"
+  install -Dm644 vdr.service "$pkgdir/usr/lib/systemd/system/vdr.service"
+
+  install -Dm754 shutdown-wrapper "$pkgdir/usr/lib/vdr/bin/shutdown-wrapper"
+  chgrp 666 "$pkgdir/usr/lib/vdr/bin/shutdown-wrapper"
+  chmod u+s "$pkgdir/usr/lib/vdr/bin/shutdown-wrapper"
+
+  install -Dm755 gen-sddropin "$pkgdir/usr/bin/vdr-gensddropin"
+  install -Dm755 shutdown.sh "$pkgdir/usr/lib/vdr/bin/shutdown.sh"
+
+  #Install sysuser config
+  install -Dm644 ${srcdir}/vdr.sysuser "$pkgdir/usr/lib/sysusers.d/vdr.conf"
+
+  for i in dvbhddevice epgtableid0 osddemo skincurses status svc{cli,svr} svdrpdemo; do
+    echo "[$i]" > "$pkgdir/etc/vdr/conf.avail/50-$i.conf"
+  done
+
+  cd "${srcdir}/vdr-${pkgver}"
+  mkdir -p "$pkgdir/var/lib/vdr"
+  make DESTDIR="${pkgdir}" install
+
+  mkdir -p "$pkgdir/usr/share/vdr/shutdown-hooks"
+
+  chown -R 666:666 "$pkgdir/srv/vdr"
+  chown -R 666:666 "$pkgdir/var/cache/vdr"
+  chown -R 666:666 "$pkgdir/var/lib/vdr"
 }
 
-md5sums=('79519dac59166fabc2029b916bd61d00'
-         'b2daabab143f879e8fb02f939d942202'
-         '729bd6dffe7493f30b70f1a76ba8da43'
-         'b216bcc3c7f44f9d47284a2df54f62a4'
-         'd96642acceb658209d7a4d3867a9dab4'
-         '7cc69205b789906a59563fe94bd03db7'
-         '39ea8344b770a9f9fba7b71f1e2640da'
-         '01b49f61a78690e8894ab662e84d6f2f'
-         '3b19cfb57d7632246798f115bf60b4cb'
-         'a05c9ef5d30e33d5ea5bee43c72eac31'
-         'e867e399822ca441e60c8daa7867ba11'
-         'cb8ce90f5602fa99e13f72be57ad0954')
+md5sums=('391c2ed60e2f7d24563fe3ed5854bc4f'
+         '301c9b9766ed5182b07f1debc79abc21'
+         'de3dcdea1a4282211c6dac370019548b'
+         '9cb821ebb6a25e603f9c32bafabde362'
+         'fc450f75037b8712673db4969a1dd758'
+         'f00583e3f5507b0ff935b4d5919e7df2'
+         '1d637e4f97adc66ef84615897116f29a'
+         '23d6e1ca0a36cfdbd35d3b1a61f0a105'
+         '3565ca5ad9be5c75f66478f0796b120d'
+         'dd20f932b846b5f50ac455b65e9432ad'
+         '7cad811b4ac5ee6c0b5496d006f1e0ee'
+         '64979737d26758a75dda488b323c293c'
+         '59ce04d1d01bf92bf6cfc0b74223191c')