Update to current implementation

7 files changed, 31 insertions, 94 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bbe5493fca2c..9e75c25440bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,21 @@
 pkgbase = sundtek
 	pkgdesc = Driver for Sundtek MediaTV Pro
-	pkgver = 141118.145034
+	pkgver = 141229.102705
 	pkgrel = 1
-	url = http://www.sundtek.com/
+	url = http://www.sundtek.com
 	install = sundtek.install
 	arch = i686
 	arch = x86_64
 	arch = armv6h
 	license = custom
-	backup = etc/sundtek.conf
-	source = http://www.sundtek.de/media/sundtek_installer_141118.145034.sh
-	source = sundtek.conf
-	source = sundtek.rules
-	source = sundtek.service
-	source = sundtek-restart.service
-	sha256sums = 9637527e6954c4ce2d28c7a1583088cf677cea84a806ee2ab2aee7bce193b731
-	sha256sums = 9460c259a46b46787ca76a3e9b2fa9e3ca308d86c8bd19c73c63821e26f17f8a
-	sha256sums = 25d285416ca8b050fdd6fb21b70d448500e402767f87ce19a85520eb005da589
-	sha256sums = c8c928d5ff8f1ee48ab2eb5c287c172e33c15b4a7d7ec7a0f993e701351c3f9d
-	sha256sums = 5192c1283b2c117188d265d29f360ff99baeb87bfb703961f9d6d6e692c800db
+	depends = lib32-gcc-libs
+	depends = libpulse
+	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
+	md5sums_x86_64 = SKIP
+	source_armv6h = installer_armsysvhf.tar.gz::http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz?ARCH
+	md5sums_armv6h = SKIP
 
 pkgname = sundtek
 
diff --git a/PKGBUILD b/PKGBUILD
index 2ab2d05d6005..b7d0f0d5ced4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,65 +1,39 @@
+# Maintainer: Christopher Reimer <mail[at]creimer[dot]net>
 pkgname=sundtek
-pkgver=141118.145034
+pkgver=141229.102705
 pkgrel=1
 pkgdesc='Driver for Sundtek MediaTV Pro'
 arch=('i686' 'x86_64' 'armv6h')
-url='http://www.sundtek.com/'
+url='http://www.sundtek.com'
 license=('custom')
-backup=('etc/sundtek.conf')
 install="$pkgname.install"
-_filename="sundtek_installer_$pkgver.sh"
-source=("http://www.sundtek.de/media/$_filename"
-        'sundtek.conf'
-        'sundtek.rules'
-        'sundtek.service'
-        'sundtek-restart.service')
-sha256sums=('9637527e6954c4ce2d28c7a1583088cf677cea84a806ee2ab2aee7bce193b731'
-            '9460c259a46b46787ca76a3e9b2fa9e3ca308d86c8bd19c73c63821e26f17f8a'
-            '25d285416ca8b050fdd6fb21b70d448500e402767f87ce19a85520eb005da589'
-            'c8c928d5ff8f1ee48ab2eb5c287c172e33c15b4a7d7ec7a0f993e701351c3f9d'
-            '5192c1283b2c117188d265d29f360ff99baeb87bfb703961f9d6d6e692c800db')
-
-build() {
-  cd "$srcdir"
-
-  msg2 "extracting files stage 1"
-  sh "$_filename" -e
-
-  case "$CARCH" in
-    i686)
-       msg2 "extracting files stage 2 ($CARCH)"
-       tar xzf "$srcdir/32bit/installer.tar.gz"
-       ;;
-    x86_64)
-       msg2 "extracting files stage 2 ($CARCH)"
-       tar xzf "$srcdir/64bit/installer.tar.gz"
-       ;;
-    armv6h)
-       msg2 "extracting files stage 2 ($CARCH)"
-       tar xzf "$srcdir/armsysvhf/installer.tar.gz"
-       ;;
-    *)
-       msg2 "architecture $CARCH not supported"
-       exit 1
-       ;;
-  esac
+depends=('lib32-gcc-libs' 'libpulse')
+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')
+md5sums_i686=('SKIP')
+md5sums_x86_64=('SKIP')
+md5sums_armv6h=('SKIP')
+
+pkgver() {
+  cd "$srcdir/opt/bin"
+  _date=$(./mediasrv --build 2>&1 | cut -d' ' -f3 | cut -b3- | tr -d -)
+  _time=$(./mediasrv --build 2>&1 | cut -d' ' -f4 | tr -d :)
+  echo -n $_date.$_time
 }
 
 package() {
   cd "$srcdir"
 
   # fix broken access rights
-  chmod +r -R *
+#   chmod +r -R *
 
   mkdir -p "$pkgdir/opt/lib"
   cp -pr opt/bin "$pkgdir/opt/"
   cp -pr opt/lib/*.so "$pkgdir/opt/lib/"
-
-  install -D "sundtek.conf" "$pkgdir/etc/sundtek.conf"
-  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"
+  
+  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 "opt/doc/README" "$pkgdir/usr/share/licenses/sundtek/README"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/sundtek-restart.service b/sundtek-restart.service
deleted file mode 100644
index 5c671569b964..000000000000
--- a/sundtek-restart.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[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.conf b/sundtek.conf
deleted file mode 100644
index 6134f4074305..000000000000
--- a/sundtek.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# configuration file for sundtek empia driver
-# uncomment the following lines to trigger a script
-# DEVID will be replaced be the actual device id
-
-
-#device_attach=/usr/bin/usb_deviceattach.sh DEVID
-#device_detach=/usr/bin/usb_devicedetach.sh DEVID
-
diff --git a/sundtek.install b/sundtek.install
index ba682645b47f..d27b8daf551e 100644
--- a/sundtek.install
+++ b/sundtek.install
@@ -1,8 +1,6 @@
 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() {
@@ -10,8 +8,6 @@ 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
deleted file mode 100644
index a5fffa90f08a..000000000000
--- a/sundtek.rules
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100755
index df8075955554..000000000000
--- a/sundtek.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[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