Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD

* 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD:
  mythtv-svn: fix pretty script
  dvb-fimware: bump so that I can build an ISO
  lirc: fix syntax error in lirc.fdi
  dvb-firmware:Added firmware for HVR 1600.
  LinHES-scripts:Updated screenshoot.sh to account for multiple dirs.

7 files changed, 23 insertions, 15 deletions

diff --git a/abs/core-testing/dvb-firmware/PKGBUILD b/abs/core-testing/dvb-firmware/PKGBUILD
index 839e571..5531f86 100644
--- a/abs/core-testing/dvb-firmware/PKGBUILD
+++ b/abs/core-testing/dvb-firmware/PKGBUILD
@@ -3,19 +3,23 @@
 
 pkgname=dvb-firmware
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="Firmware for DVB cards"
 arch=('i586' 'i686' 'x86_64')
-license=('GPL2')
 url="http://linuxtv.org/"
 source=(ftp://ftp.knoppmyth.net/R6/sources/dvb-firmware.tar.bz2
+http://dl.ivtvdriver.org/ivtv/firmware/cx18-firmware.tar.gz
 	xc3028-v27.fw
 	dvb-usb-dib0700-1.20.fw)
-md5sums=('6932d0b4f763424e35b7fa3a6cc82a2e')
+md5sums=('6932d0b4f763424e35b7fa3a6cc82a2e'
+	 '667fa0ee6b79e054736beef922966333'
+	 '293dc5e915d9a0f74a368f8a2ce3cc10'
+	 'f42f86e2971fd994003186a055813237')
 
 build() {
   cd $startdir/src/
   mkdir -p $startdir/pkg/lib/firmware
   cp -a dvb-fw/* $startdir/pkg/lib/firmware
+  cp -a cx18-firmware/*.fw $startdir/pkg/lib/firmware
   cp $startdir/src/*.fw $startdir/pkg/lib/firmware
 }
diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index fb66bff..de72624 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=23
+pkgrel=24
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/abs/core-testing/linhes-scripts/screenshooter.sh b/abs/core-testing/linhes-scripts/screenshooter.sh
index 9e35786..94ea6fd 100755
--- a/abs/core-testing/linhes-scripts/screenshooter.sh
+++ b/abs/core-testing/linhes-scripts/screenshooter.sh
@@ -87,11 +87,16 @@ if [ ! -d "$VIDEO_CAPTURE_HOME" ] ; then
 fi
 
 VIDEO_HOME=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select data from settings where value='VideoStartupDir' limit 1")
-if [ ! -d "$VIDEO_HOME" ] ; then
-    echo "Directory $VIDEO_HOME does not exist, nowhere to put the screen shot!"
-    echo "Have you configured MythVideo yet?"
-    exit 1
-fi
+VIDEO_HOME=(${VIDEO_HOME//:/ });
+VIDEO_HOME_COUNT=${#VIDEO_HOME[@]}
+for (( i=0; i<${VIDEO_HOME_COUNT}; i++ ));
+do
+    if [ ! -d "${VIDEO_HOME[${i}]}" ] ; then
+        echo "Directory ${VIDEO_HOME[${i}]} does not exist, nowhere to put the screen shot!"
+        echo "Have you configured MythVideo yet?"
+        exit 1
+    fi
+done
 
 VIDEO_FILENAME=$(basename "$VIDEO_PATHNAME")
 VIDEO_EXTENSION=${VIDEO_FILENAME##*.}
diff --git a/abs/core-testing/lirc/PKGBUILD b/abs/core-testing/lirc/PKGBUILD
index 5406783..d15cf1d 100644
--- a/abs/core-testing/lirc/PKGBUILD
+++ b/abs/core-testing/lirc/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=lirc
 pkgver=0.8.5CVS
-pkgrel=14
+pkgrel=15
 _kernver=2.6.28-LinHES
 pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
 arch=(i686 x86_64)
@@ -83,4 +83,4 @@ md5sums=('b96dae91b566143b3af433fa2714ec9a'
          'f059f4030afc682c9539a03bf837c1cf'
          '4e698654cc44fc6c4163814acda5a7ee'
          '9a3a6dc03647ee6674a166dfb884ddd6'
-         '664fb04b51396628300daf8befd0db77')
+         '203d9cd014c4276be4c84cecd103919d')
diff --git a/abs/core-testing/lirc/lirc.fdi b/abs/core-testing/lirc/lirc.fdi
index 7a8c8ad..6f2443a 100644
--- a/abs/core-testing/lirc/lirc.fdi
+++ b/abs/core-testing/lirc/lirc.fdi
@@ -3,7 +3,7 @@
 <deviceinfo version="0.2">
   <device>
      <!-- This rule prevents the Dvico dual digital4 rev 2
-          remote input device from making your keyboard act wierd>
+          remote input device from making your keyboard act wierd. -->
      <match key="info.product" contains_ncase="IR-receiver inside an USB DVB receiver">
         <merge key="info.ignore" type="bool">true</merge>
      </match>
diff --git a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
index df4afb8..422ec64 100755
--- a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
@@ -86,7 +86,6 @@ build() {
 	mkdir -p $startdir/pkg/etc/logrotate.d
 	cp $startdir/src/*.lr $startdir/pkg/etc/logrotate.d
 	mkdir -p $startdir/pkg/etc/cron.hourly/
-	cp $startdir/src/pretty $startdir/pkg/etc/cron.hourly/
-
+	install -m0755 $startdir/src/pretty $startdir/pkg/etc/cron.hourly/
 }
 
diff --git a/abs/core-testing/mythtv/trunk/mythtv/pretty b/abs/core-testing/mythtv/trunk/mythtv/pretty
index e47aaec..24b7658 100644..100755
--- a/abs/core-testing/mythtv/trunk/mythtv/pretty
+++ b/abs/core-testing/mythtv/trunk/mythtv/pretty
@@ -1,2 +1,2 @@
 #!/bin/bash
-su mythtv -c "perl /usr/share/mythtv/contrib/mythrename.pl --link /myth/pretty"
+su mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythrename.pl --link /myth/pretty"