Restore functionality that was previously available

6 files changed, 44 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e75c25440bc..1da474923d49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sundtek
 	pkgdesc = Driver for Sundtek MediaTV Pro
-	pkgver = 141229.102705
+	pkgver = 150630.105834
 	pkgrel = 1
 	url = http://www.sundtek.com
 	install = sundtek.install
@@ -10,6 +10,12 @@ pkgbase = sundtek
 	license = custom
 	depends = lib32-gcc-libs
 	depends = libpulse
+	source = sundtek.rules
+	source = sundtek.service
+	source = sundtek-restart.service
+	sha256sums = 25d285416ca8b050fdd6fb21b70d448500e402767f87ce19a85520eb005da589
+	sha256sums = c8c928d5ff8f1ee48ab2eb5c287c172e33c15b4a7d7ec7a0f993e701351c3f9d
+	sha256sums = 5192c1283b2c117188d265d29f360ff99baeb87bfb703961f9d6d6e692c800db
 	source_i686 = installer_32bit.tar.gz::http://sundtek.de/media/netinst/32bit/installer.tar.gz?ARCH
 	md5sums_i686 = SKIP
 	source_x86_64 = installer_64bit.tar.gz::http://sundtek.de/media/netinst/64bit/installer.tar.gz?ARCH
diff --git a/PKGBUILD b/PKGBUILD
index b7d0f0d5ced4..51d54e08c393 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
-# Maintainer: Christopher Reimer <mail[at]creimer[dot]net>
+# Contributor: Christopher Reimer <mail[at]creimer[dot]net>
 pkgname=sundtek
-pkgver=141229.102705
+pkgver=150630.105834
 pkgrel=1
 pkgdesc='Driver for Sundtek MediaTV Pro'
 arch=('i686' 'x86_64' 'armv6h')
@@ -8,9 +8,15 @@ url='http://www.sundtek.com'
 license=('custom')
 install="$pkgname.install"
 depends=('lib32-gcc-libs' 'libpulse')
+source=('sundtek.rules'
+        'sundtek.service'
+        'sundtek-restart.service')
 source_x86_64=('installer_64bit.tar.gz::http://sundtek.de/media/netinst/64bit/installer.tar.gz?ARCH')
 source_i686=('installer_32bit.tar.gz::http://sundtek.de/media/netinst/32bit/installer.tar.gz?ARCH')
 source_armv6h=('installer_armsysvhf.tar.gz::http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz?ARCH')
+sha256sums=('25d285416ca8b050fdd6fb21b70d448500e402767f87ce19a85520eb005da589'
+            'c8c928d5ff8f1ee48ab2eb5c287c172e33c15b4a7d7ec7a0f993e701351c3f9d'
+            '5192c1283b2c117188d265d29f360ff99baeb87bfb703961f9d6d6e692c800db')
 md5sums_i686=('SKIP')
 md5sums_x86_64=('SKIP')
 md5sums_armv6h=('SKIP')
@@ -25,15 +31,14 @@ pkgver() {
 package() {
   cd "$srcdir"
 
-  # fix broken access rights
-#   chmod +r -R *
-
   mkdir -p "$pkgdir/opt/lib"
   cp -pr opt/bin "$pkgdir/opt/"
   cp -pr opt/lib/*.so "$pkgdir/opt/lib/"
   
   mkdir -p "$pkgdir/usr/lib/udev/rules.d"
   cp etc/udev/rules.d/* "$pkgdir/usr/lib/udev/rules.d"
-  install -D opt/doc/sundtek.service "$pkgdir/usr/lib/systemd/system/sundtek.service"
+  install -D "sundtek.rules" "$pkgdir/etc/udev/rules.d/sundtek.rules"
+  install -D "sundtek.service" "$pkgdir/usr/lib/systemd/system/sundtek.service"
+  install -D "sundtek-restart.service" "$pkgdir/usr/lib/systemd/system/sundtek-restart.service"
   install -D "opt/doc/README" "$pkgdir/usr/share/licenses/sundtek/README"
 }
diff --git a/sundtek-restart.service b/sundtek-restart.service
new file mode 100644
index 000000000000..5c671569b964
--- /dev/null
+++ b/sundtek-restart.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Restart Sundtek MediaTV Pro driver after resume
+Requisite=sundtek.service
+After=sleep.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/systemctl restart sundtek.service
+
+[Install]
+WantedBy=sleep.target
diff --git a/sundtek.install b/sundtek.install
index d27b8daf551e..ba682645b47f 100644
--- a/sundtek.install
+++ b/sundtek.install
@@ -1,6 +1,8 @@
 post_install() {
   echo "inserting /opt/lib/libmediaclient.so in /etc/ld.so.preload"
   echo "/opt/lib/libmediaclient.so" >> /etc/ld.so.preload
+
+  systemctl enable sundtek-restart.service
 }
 
 pre_remove() {
@@ -8,6 +10,8 @@ pre_remove() {
     echo "removing /opt/lib/libmediaclient.so from /etc/ld.so.preload"
     sed -i 's#/opt/lib/libmediaclient.so##' /etc/ld.so.preload
   fi
+
+  systemctl disable sundtek-restart.service
 }
 
 post_upgrade() {
diff --git a/sundtek.rules b/sundtek.rules
new file mode 100644
index 000000000000..a5fffa90f08a
--- /dev/null
+++ b/sundtek.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ENV{ID_VENDOR_ID}=="eb1a", ENV{ID_MODEL_ID}=="51b2", TAG+="systemd", ENV{SYSTEMD_WANTS}="sundtek.service"
diff --git a/sundtek.service b/sundtek.service
new file mode 100755
index 000000000000..df8075955554
--- /dev/null
+++ b/sundtek.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Sundtek MediaTV Pro driver
+
+[Service]
+Type=forking
+ExecStart=/opt/bin/mediasrv -d --pluginpath=/opt/bin
+ExecStop=/opt/bin/mediaclient --shutdown
+
+[Install]
+WantedBy=multi-user.target