mythtv-contrib: Add mythlink, Add stb-command, remove sa3250cmd, patch 6200ch for menu and exit commands.

2 files changed, 44 insertions, 14 deletions

diff --git a/abs/extra-testing/community/mythtv-contrib/PKGBUILD b/abs/extra-testing/community/mythtv-contrib/PKGBUILD
index 4e5bf12..8c55013 100644
--- a/abs/extra-testing/community/mythtv-contrib/PKGBUILD
+++ b/abs/extra-testing/community/mythtv-contrib/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Hanson <hansonorders@verizon.net>
 pkgname=mythtv-contrib
 pkgver=0.23
-pkgrel=2
+pkgrel=3
 pkgdesc="User contributed scripts and utilities for mythtv."
 arch=('i686' 'x86_64')
 url="http://mythtv.org"
@@ -12,9 +12,12 @@ depends=('perl' 'mythtv')
 makedepends=('gcc' 'subversion' 'libavc1394' 'libraw1394' 'libiec61883')
 install='mythtv-contrib.install'
 source=('http://www.pdp8.net/directv/directv.pl' \
-        'http://sa3250cmd.googlecode.com/files/sa3250cmd1.1.tar.gz' \
+        'http://stb-command.googlecode.com/files/stb-command0.1.tar.gz' \
+        'http://mysite.verizon.net/mjhanson/linux/6200ch.c_qip_v3.patch' \
+        'http://mythtv.mlaronson.com/myth-xbmc-connect/downloads/xbmc_mythlink.tgz' \
         'mythchanger.10f.beta.tar')
-patches=('sa3250cmd_make.patch' '6200ch.c.r21651.patch'
+patches=('6200ch.c_qip_v3.patch'
+         '6200ch.c.r21651.patch'
          'mythchanger_make.patch')
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-23-fixes/mythtv/contrib
 _svnver=23566
@@ -28,19 +31,24 @@ build() {
 	cd $startdir/src/contrib
 
 	# build and install
+        echo "Building 6200ch..."
         cd $srcdir/contrib/channel_changers/6200ch
-        patch -p3 <$startdir/6200ch.c.r21651.patch
-        gcc -std=gnu99 -o 6200ch 6200ch.c -lavc1394 -lrom1394 -lraw1394
-        install -D -m755 6200ch $startdir/pkg/usr/bin/6200ch
-        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.6200ch
+        patch -p3 <$startdir/6200ch.c.r21651.patch || return 1
+        patch -p0 <$srcdir/6200ch.c_qip_v3.patch || return 1
+        gcc -std=gnu99 -o 6200ch 6200ch.c -lavc1394 -lrom1394 -lraw1394 || return 1
+        install -D -m755 6200ch $startdir/pkg/usr/bin/6200ch || return 1
+        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.6200ch || return 1
 
+        echo "Building change-channel-lirc..."
         cd $srcdir/contrib/channel_changers/change-channel-lirc || return 1
         install -D -m755 *{.pl,.sh} $startdir/pkg/usr/bin || return 1
 
+        echo "Building d10control..."
         cd $srcdir/contrib/channel_changers/d10control || return 1
         install -D -m755 d10control.pl $startdir/pkg/usr/bin/d10control.pl  || return 1
         install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.d10control
 
+        echo "Building dct-channel..."
         cd $srcdir/contrib/channel_changers/dct-channel
         patch -p4 <$startdir/dct-channel_make.patch || return 1
         cd $srcdir/contrib/channel_changers/dct-channel || return 1
@@ -50,70 +58,92 @@ build() {
         install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.dct-channel
         install -D -m644 COPYING $startdir/pkg/usr/share/licenses/mythtv-contrib/COPYING.dct-channel
 
+        echo "Building dct2000serial..."
         cd $srcdir/contrib/channel_changers/dct2000serial || return 1
         install -D -m755 *.py $startdir/pkg/usr/bin || return 1
         install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.dct2000serial
 
+        echo "Building redeye..."
         cd $srcdir/contrib/channel_changers/red_eye || return 1
         gcc -Wall -o red_eye red_eye.c || return 1
         install -D -m755 red_eye $startdir/pkg/usr/bin/red_eye || return 1
         install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.red_eye
 
+        echo "Building sa3250ch..."
         cd $srcdir/contrib/channel_changers/sa3250ch || return 1
         gcc -Wall -o sa3250ch sa3250ch.c -lrom1394 -lavc1394 -lraw1394 || return 1
         install -D -m755 sa3250ch $startdir/pkg/usr/bin/sa3250ch || return 1
         install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.sa3250ch
 
+        echo "Building firewire_tester..."
         cd $srcdir/contrib/development/firewire_tester || return 1
         gcc -Wall -o firewire_tester firewire_tester.c -liec61883 -lraw1394 || return 1
         install -D -m755 firewire_tester $startdir/pkg/usr/bin || return 1
         install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.firewire_tester
 
+        echo "Building tsc-calibrate..."
         cd $srcdir/contrib/development/tsc-calibrate || return 1
         gcc -o tsc-calibrate tsc-calibrate.c || return 1
         install -D -m755 tsc-calibrate $startdir/pkg/usr/bin || return 1
 
+        echo "Building mythname..."
         cd $srcdir/contrib/info/mythname || return 1
         install -D -m755 mythname.pl $startdir/pkg/usr/bin || return 1
         install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.mythname
 
+        echo "Building misc_status_info..."
         cd $srcdir/contrib/info/misc_status_info || return 1
         install -D -m755 *{.sh,.pl} $startdir/pkg/usr/bin || return 1
         install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.misc_status_info
 
+        echo "Building maintenance..."
         cd $srcdir/contrib/maintenance || return 1
         install -D -m755 *.pl $startdir/pkg/usr/bin || return 1
 
+        echo "Building mythmail..."
         cd $srcdir/contrib/mythmail || return 1
         install -D -m755 *.pl $startdir/pkg/usr/bin || return 1
 
+        echo "Building recovery..."
         cd $srcdir/contrib/recovery || return 1
         install -D -m755 *.pl $startdir/pkg/usr/bin || return 1
 
+        echo "Building user_jobs..."
         cd $srcdir/contrib/user_jobs || return 1
         install -D -m755 *.pl $startdir/pkg/usr/bin || return 1
         install -D -m755 setbookmark $startdir/pkg/usr/bin/setbookmark.pl || return 1
 
+        echo "Building directv.pl..."
         cd $srcdir || return 1
         install -D -m755 directv.pl $startdir/pkg/usr/bin || return 1
 
-        tar zxf sa3250cmd1.1.tar.gz || return 1
+        echo "Building stb-command..."
         cd $srcdir
-        patch -p1 <$startdir/sa3250cmd_make.patch || return 1
-        cd $srcdir/sa3250cmd
+        tar zxf stb-command0.1.tar.gz || return 1
+        cd $srcdir/stb-command
         make || return 1
-	install -D -m755 sa3250cmd $startdir/pkg/usr/bin || return 1
+	install -D -m755 stb-command $startdir/pkg/usr/bin || return 1
         install -D -m755 sa3250_ch_guid  $startdir/pkg/usr/bin || return 1
-        install -D -m755 sa3250_cmd_guid  $startdir/pkg/usr/bin || return 1
+        install -D -m755 stb_cmd_guid  $startdir/pkg/usr/bin || return 1
 
+        echo "Building mythchanger..."
         cd $srcdir
         tar xf mythchanger.10f.beta.tar || return 1
         cd $srcdir/mythchanger.10f.beta
         patch -p1 <$startdir/mythchanger_make.patch || return 1
         make || return 1
-        make install || return 1
+        install -D -m755 mythchanger $pkgdir/usr/bin || return 1
         install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.mythchanger
+
+        echo "Building mythlink..."
+        cd $srcdir
+        tar zxf xbmc_mythlink.tgz || return 1
+        install -D -m755 tvdb_get.sh $startdir/pkg/usr/bin || return 1
+        install -D -m755 xbmc_cleanup.sh $startdir/pkg/usr/bin || return 1
+        install -D -m755 xbmc_mythlink.py $startdir/pkg/usr/bin || return 1
 }
 md5sums=('89cfc17883a41e365e85e0a4ac20994f'
-         '740609cbcc916e82493387ba0613f744'
+         'f489b3ae1e0a7ef8955f215d8bb39c18'
+         '4c1b2461baeadcb147813be4a6bb3fda'
+         'bbe38286da9a6d3612b56acb050e7e99'
          '34d148795f832f12973a08d59e9a0ef3')
diff --git a/abs/extra-testing/community/mythtv-contrib/mythchanger.10f.beta.tar b/abs/extra-testing/community/mythtv-contrib/mythchanger.10f.beta.tar
index c6509bd..e848866 120000..100644
--- a/abs/extra-testing/community/mythtv-contrib/mythchanger.10f.beta.tar
+++ b/abs/extra-testing/community/mythtv-contrib/mythchanger.10f.beta.tar