From 0b67884c8b7910056e767fd9f5faf5e9f77efd75 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Fri, 16 Apr 2010 20:51:59 -0700 Subject: mythtv:latest -fixes. --- abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD index 11e0a35..93e35c7 100755 --- a/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.23 -pkgrel=10 +pkgrel=11 pkgdesc="A personal video recorder for Linux" url="http://www.mythtv.org" license="GPL" -- cgit v0.12 From 9822a2daa42460845b9c48ecbcf78bde5a805378 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Fri, 16 Apr 2010 22:41:14 -0700 Subject: mythinstall:recompiled w/ mythtv 0.23 --- abs/core-testing/mythinstall/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core-testing/mythinstall/PKGBUILD b/abs/core-testing/mythinstall/PKGBUILD index 37587d5..c1d0b95 100644 --- a/abs/core-testing/mythinstall/PKGBUILD +++ b/abs/core-testing/mythinstall/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: Jams pkgname=mythinstall pkgver=2 -pkgrel=40 +pkgrel=41 pkgdesc="LinHES installer/systemconfig GUI." arch=i686 depends=() -makedepends=('mythtv>=0.22') +makedepends=('mythtv>=0.23') source=('install-ui.xml') build() { -- cgit v0.12 From 111be4b518ca95965c2f9b320a36bbb4dc4c8923 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Fri, 16 Apr 2010 22:52:59 -0700 Subject: system-templates:improved lircd.conf for dct 700. --- abs/core-testing/system-templates/PKGBUILD | 2 +- .../templates/transmit/motorola_dct700/lircd.conf | 432 +++++++++++++++++---- 2 files changed, 355 insertions(+), 79 deletions(-) mode change 100755 => 100644 abs/core-testing/system-templates/templates/transmit/motorola_dct700/lircd.conf diff --git a/abs/core-testing/system-templates/PKGBUILD b/abs/core-testing/system-templates/PKGBUILD index 4a8a844..6e88b13 100755 --- a/abs/core-testing/system-templates/PKGBUILD +++ b/abs/core-testing/system-templates/PKGBUILD @@ -1,6 +1,6 @@ pkgname=system-templates pkgver=1.0 -pkgrel=43 +pkgrel=44 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() diff --git a/abs/core-testing/system-templates/templates/transmit/motorola_dct700/lircd.conf b/abs/core-testing/system-templates/templates/transmit/motorola_dct700/lircd.conf old mode 100755 new mode 100644 index 31df8aa..93a2183 --- a/abs/core-testing/system-templates/templates/transmit/motorola_dct700/lircd.conf +++ b/abs/core-testing/system-templates/templates/transmit/motorola_dct700/lircd.conf @@ -1,83 +1,359 @@ +######### # -# this config file was originally generated -# using lirc-0.6.6(serial) on Fri Mar 28 22:46:44 2003 -# modified by hand on Sunday Jul 17 00:12:00 2005 +# Modified DCT2000 entry for DCT700 (sends zeros) +# For use with the USB MCE ir receiver # -# contributed by rob scullion -# based on the DCT2000 file contrib'd by shane bradley -# -# brand: Motorola -# model no. of remote control: ? - Comcast badged -# devices being controlled by this remote: DCT2524/1612 -# -# Note: The "ON DEMAND" button on the Comcast -# badged remote just sends a "1" followed by -# an "ok/select" and is thus not included in -# this config file. - + begin remote - name DCT2524 - bits 16 - flags SPACE_ENC|CONST_LENGTH - eps 30 - aeps 100 - - header 9036 4424 - one 556 2185 - zero 556 4424 - ptrail 556 - gap 100025 - toggle_bit 0 - - - begin codes - power 0x000000000000AFF9 - rew 0x00000000000087F7 - play 0x00000000000027FD - ffwd 0x00000000000047FB - stop 0x000000000000C7F3 - pause 0x00000000000007FF - rec 0x00000000000073FC - skipback 0x000000000000C3F7 - mydvr 0x00000000000043FF - live 0x00000000000083F0 - pageup 0x000000000000A3F3 - pagedown 0x00000000000023FB - a_lock 0x00000000000097F6 - b_day- 0x00000000000063FD - c_day+ 0x000000000000E3F5 - up 0x000000000000D3F6 - down 0x00000000000053FE - left 0x00000000000093F1 - right 0x00000000000013F9 - ok/select 0x00000000000077F8 - guide 0x000000000000F3F4 - info 0x00000000000033FA - menu 0x00000000000067F9 - exit 0x000000000000B7F4 - help 0x000000000000B3F2 - last 0x00000000000037FC - vol+ 0x0000000000004FF3 - vol- 0x0000000000008FFB - mute 0x0000000000000FF7 - fav 0x00000000000057FA - ch+ 0x0000000000002FF5 - ch- 0x000000000000CFFD - 1 0x0000000000007FF0 - 2 0x000000000000BFF8 - 3 0x0000000000003FF4 - 4 0x000000000000DFFC - 5 0x0000000000005FF2 - 6 0x0000000000009FFA - 7 0x0000000000001FF6 - 8 0x000000000000EFFE - 9 0x0000000000006FF1 - 0 0x000000000000FFFF - tv/vcr_input 0x000000000000D7F2 - hdzoom_enter 0x000000000000FDFC - pnp-swap 0x0000000000003BF2 - end codes - -end remote + name DCT700 + flags RAW_CODES + eps 30 + aeps 100 + + ptrail 520 + repeat 0 0 + gap 100000 + + begin raw_codes + + name bypass + 9000 4400 550 2200 550 2150 + 550 4450 550 2150 550 4450 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 4450 550 4400 + 550 2200 550 4400 550 + + name power + 9050 4400 550 2200 550 4400 + 550 2200 550 4400 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 4400 + 550 4450 550 2150 550 + + name help + 9000 4400 600 2150 550 4450 + 550 2150 550 2200 550 4400 + 550 4450 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 4400 550 4450 + 500 2200 550 4450 550 + + name day- + 9000 4400 550 4400 550 2200 + 550 2200 550 4400 550 4400 + 600 4400 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 2200 500 2200 + 550 4450 550 2150 550 + + name day+ + 9000 4400 550 2200 550 2200 + 550 2150 550 4450 550 4400 + 550 4400 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 4450 550 2150 + 550 4450 550 2200 500 + + name rec + 9050 4400 550 4400 550 2200 + 550 2200 550 2150 550 4450 + 550 4400 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 4450 550 4400 550 + + name stop + 9000 4400 550 4400 550 2200 + 550 2200 550 4400 550 4400 + 550 4450 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 4450 500 2200 550 + + name pause + 9000 4400 550 4400 550 4450 + 550 4400 550 4450 550 4400 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 + + name rew + 9000 4400 550 2200 550 4400 + 550 4450 550 4400 550 4450 + 550 2150 550 2200 550 2200 + 500 2200 550 2200 550 2200 + 500 2200 550 4450 550 2150 + 550 2200 550 2200 500 + + name ffwd + 9050 4400 550 4400 550 2200 + 550 4400 550 4450 550 4400 + 550 2200 550 2150 600 2150 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 4450 + 550 2200 500 2200 550 + + name play + 9050 4400 550 2150 550 2200 + 550 2200 550 4400 550 4400 + 550 4450 550 2200 550 2150 + 550 2200 550 2200 500 2200 + 550 2200 550 4400 550 2200 + 550 4400 550 2200 550 + + name pageup + 9000 4400 550 2200 550 4400 + 550 2200 550 4400 550 4450 + 550 4400 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 4400 550 4450 + 550 2150 550 2200 550 + + name pagedown + 9000 4400 550 4450 550 4400 + 550 2200 550 4400 550 4450 + 550 4400 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 2200 550 4400 + 550 2200 550 2150 550 + + name info + 9050 4400 550 4400 550 4400 + 600 2150 550 2200 550 4400 + 550 4450 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 4450 + 550 2150 550 4450 550 + + name menu + 9050 4400 550 4400 550 2200 + 550 2200 550 4400 550 4400 + 550 2200 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 2200 550 4400 + 550 4400 550 2200 550 + + name guide + 9050 4400 550 2150 600 2150 + 550 2200 550 2150 550 4450 + 550 4400 550 2200 550 2150 + 600 2150 550 2200 550 2200 + 500 2200 550 4450 550 2150 + 550 4450 550 4400 550 + + name lock + 9000 4400 600 2150 550 4400 + 600 4400 550 2200 550 4400 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 4400 550 2200 + 550 2150 550 4450 550 + + name exit + 9000 4400 550 2200 550 4400 + 550 2200 550 2200 550 4400 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 4400 550 2200 + 550 4400 550 4450 550 + + name up + 9000 4450 550 2150 550 2200 + 550 4400 550 2200 550 4400 + 550 4450 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 4400 550 2200 + 550 2200 500 4450 550 + name down + 9000 4400 600 4400 550 2200 + 550 4400 550 2200 550 4400 + 550 4400 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 4450 550 + + name left + 9000 4400 550 2200 550 4400 + 550 4400 600 2150 550 4450 + 550 4400 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 4400 550 4450 + 550 4400 550 2200 550 + + name right + 9050 4400 550 4400 550 4450 + 550 4400 550 2200 550 4400 + 550 4400 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 4450 + 500 4450 550 2200 550 + + name ok + 9050 4400 550 4400 550 2200 + 550 2200 550 2150 550 4450 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 4400 + 550 4450 550 4400 550 + + name ch+ + 9000 4400 550 4400 550 4450 + 550 2150 600 4400 550 2150 + 600 2150 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 4450 500 2200 + 550 4450 550 2150 550 + + name ch- + 9050 4400 550 2150 600 2150 + 550 4450 550 4400 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 4400 550 2200 550 + + name last + 9000 4400 550 4450 550 4400 + 550 2200 550 2150 550 4450 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 4400 550 4450 500 + + name fav + 9000 4400 550 4450 550 2150 + 550 4450 550 2150 550 4450 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 4450 + 500 2200 550 4450 500 + + name enter + 9000 4400 600 2150 550 2200 + 550 2150 550 2200 550 4400 + 550 2200 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 4450 500 4450 + 550 4400 550 4450 550 + + name music + 9000 4400 550 2200 550 2200 + 550 2150 550 2200 550 4400 + 550 2200 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 4400 550 4450 + 550 4400 550 4450 500 + + name p + 9000 4400 600 4400 550 4400 + 550 4450 550 2150 550 4450 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 4450 550 + + name x1 + 9050 4400 550 4400 550 4450 + 550 4400 550 2200 550 2150 + 550 4450 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 4400 550 4450 + 500 4450 550 2200 550 + + name x2 + 9050 4400 550 2150 550 2200 + 550 2200 550 4400 550 2200 + 550 4400 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 2200 550 4400 + 550 4450 550 2150 550 + + name 1 + 9000 4400 550 4450 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 4400 550 4450 + 550 4400 550 4450 550 + + name 2 + 9000 4400 550 2200 550 4400 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 4450 + 550 4400 550 4450 500 + + name 3 + 9000 4400 550 4450 550 4400 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 4400 550 2200 + 550 4400 550 4450 500 + + name 4 + 9000 4400 550 2200 550 2150 + 550 4450 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 4400 550 4450 550 + + name 5 + 9000 4450 550 4400 550 2200 + 550 4400 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 2200 550 2150 + 550 2200 550 4400 550 4450 + 550 2200 500 4450 550 + + name 6 + 9000 4400 550 2200 550 4400 + 550 4400 600 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 500 2200 550 2200 + 550 2200 500 2200 550 4450 + 550 2150 550 4450 550 + + name 7 + 9000 4400 550 4400 600 4400 + 550 4400 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 4450 550 2150 + 550 2200 550 4400 550 + + name 8 + 9000 4400 550 2200 550 2150 + 550 2200 550 4400 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 2150 550 2200 + 550 2200 550 4400 550 + + name 9 + 9050 4400 550 4400 550 2200 + 550 2150 600 4400 550 2150 + 600 2150 550 2200 550 2200 + 500 2200 550 2200 550 2200 + 500 2200 550 4450 550 4400 + 550 4400 550 2200 550 + + name 0 + 9000 4400 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 2200 + 550 2150 550 2200 550 42050 + 9000 2250 500 + + end raw_codes + +end remote -- cgit v0.12 From 6e9e01b9a0f0054e31611ebedf4545d17282467e Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 17 Apr 2010 17:26:07 -0500 Subject: .gitignore: add more files to .gitignore. these are used by the mass update process --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 79e2a65..f59d25e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ mythinstall.bin srclinks.* *.pyc *.log +.updated_failed +.no_update +.updated -- cgit v0.12 From 23772c83c9faff87d7ba951b7690cd93ced79a1f Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 17 Apr 2010 17:34:13 -0700 Subject: mythinstall:compiled for 0.23 --- abs/core-testing/mythinstall/PKGBUILD | 2 +- abs/core-testing/mythinstall/checkout_MythVantage.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core-testing/mythinstall/PKGBUILD b/abs/core-testing/mythinstall/PKGBUILD index c1d0b95..7a8cccd 100644 --- a/abs/core-testing/mythinstall/PKGBUILD +++ b/abs/core-testing/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall pkgver=2 -pkgrel=41 +pkgrel=42 pkgdesc="LinHES installer/systemconfig GUI." arch=i686 depends=() diff --git a/abs/core-testing/mythinstall/checkout_MythVantage.sh b/abs/core-testing/mythinstall/checkout_MythVantage.sh index 58849bf..eea6727 100755 --- a/abs/core-testing/mythinstall/checkout_MythVantage.sh +++ b/abs/core-testing/mythinstall/checkout_MythVantage.sh @@ -1,6 +1,6 @@ #!/bin/bash MYDIR=`pwd` -MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable-0.22\/mythtv\/src\/mythtv" +MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable-0.23\/mythtv\/src\/mythtv" function setup_links { rm mythinstall.bin -- cgit v0.12 From 0ad1e2755d4a1614905c3081992f8299ad19b2fc Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 17 Apr 2010 19:53:12 -0700 Subject: mythtv:places "Watch TV" to the top of the main menu. latest -fixes. --- .../mythtv/stable-0.23/mythtv/PKGBUILD | 2 +- .../stable-0.23/mythtv/menu-xml/mainmenu.xml.patch | 65 ++++++++++++++++++++-- 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD index 93e35c7..a62fd65 100755 --- a/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.23 -pkgrel=11 +pkgrel=13 pkgdesc="A personal video recorder for Linux" url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/mainmenu.xml.patch b/abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/mainmenu.xml.patch index 74ace7b..0ec7b5b 100644 --- a/abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/mainmenu.xml.patch +++ b/abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/mainmenu.xml.patch @@ -1,8 +1,66 @@ ---- mainmenu.xml.orig 2010-03-24 13:11:27.223119163 -0400 -+++ mainmenu.xml 2010-03-24 14:18:33.922746799 -0400 -@@ -151,32 +151,9 @@ +--- mainmenu.xml.orig 2010-04-18 01:29:44.000000000 +0000 ++++ mainmenu.xml 2010-04-18 01:32:38.000000000 +0000 +@@ -2,6 +2,31 @@ + ++ ++ + + +- +- -- cgit v0.12 From 0336a1ac641dc82baf96c7b0489ad6efc69d56c4 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 17 Apr 2010 20:19:59 -0700 Subject: fluxbox:Add Mod1 Escape :GotoWindow {1} for feature #689. --- abs/core-testing/fluxbox/PKGBUILD | 4 ++-- abs/core-testing/fluxbox/keys | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/abs/core-testing/fluxbox/PKGBUILD b/abs/core-testing/fluxbox/PKGBUILD index 70202cc..9f4a438 100644 --- a/abs/core-testing/fluxbox/PKGBUILD +++ b/abs/core-testing/fluxbox/PKGBUILD @@ -4,7 +4,7 @@ pkgname=fluxbox pkgver=1.1.1 -pkgrel=9 +pkgrel=10 pkgdesc="A lightweight and highly-configurable window manager" arch=('i686' 'x86_64') url="http://www.fluxbox.org" @@ -33,5 +33,5 @@ build() { } md5sums=('fa9fa8fe9a44f86522de5754f8b285ca' 'eeae9c88a2526ac0bd8afcd9ce97f9ed' - '37438d3c615aec8c3335b5946923ca5f' + 'df8dd2ff7ec582d9a2221279d960750f' '82dac089f2d42bb9592debc93291846d') diff --git a/abs/core-testing/fluxbox/keys b/abs/core-testing/fluxbox/keys index a166829..bf45b79 100644 --- a/abs/core-testing/fluxbox/keys +++ b/abs/core-testing/fluxbox/keys @@ -26,3 +26,4 @@ Mod1 2 :ExecCommand sudo sv stop mythbackend Mod1 3 :ExecCommand sudo sv restart mythbackend Mod1 h :ExecCommand MythVantage -h Mod1 Control u :ExecCommand /usr/LH/bin/unclutter-toggle.sh +Mod1 Escape :GotoWindow {1} -- cgit v0.12 From 787f13cd63c75c9c5090c10c0e888f48a59c0e49 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 17 Apr 2010 20:29:43 -0700 Subject: LinHES-release:bumped. --- abs/core-testing/LinHES-config/LinHES-release | 2 +- abs/core-testing/LinHES-config/PKGBUILD | 40 ++------------------------- 2 files changed, 4 insertions(+), 38 deletions(-) diff --git a/abs/core-testing/LinHES-config/LinHES-release b/abs/core-testing/LinHES-config/LinHES-release index 79e2144..4f1b8f1 100644 --- a/abs/core-testing/LinHES-config/LinHES-release +++ b/abs/core-testing/LinHES-config/LinHES-release @@ -1 +1 @@ -LinHES R6.02.01 (hot nanners) +LinHES R6.02.02 (hot nanners) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 12849ff..61a9148 100644 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.1 -pkgrel=36 +pkgrel=37 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -101,41 +101,7 @@ build() { install -m 0755 issue $startdir/pkg/etc/issue } -md5sums=('297441b8d85820698c19e7c0ad5a3dfe' - '1a4694fcd694b362c339bda781ed0f3e' - 'e36da536dd651ef182e7642337889e77' - '3baa23764e1b6bcb2d66d7d859096940' - 'd7a8cd4a0060399ae22e69f74e04eb07' - '7a45287a07145fde5aa664583d4f6fba' - 'f88d2fb88339a4bf8ec9217a3fbcdef7' - '8ac1cfd2eca0f641737da0d0aca416a7' - 'c6c45a749a2808e70f101b697f571699' - '4620f6f498ef4523398635cb0bd59425' - '06188493e5ed79cb501d3c5694dee8ca' - 'e459ed069317bccb20351f037a9df3d2' - '26ee0932243b79484b37eb8f6cf04cd4' - '6aff504ed5e860adc1b7317cd0780900' - '55fccb1da0417a896b724f7cfc32dd5a' - 'ab2aa42c2947148c2b1cac0ade6d1d55' - 'd429b59d3cfb37b0624c6a4a71a7c2c0' - 'a225143e3df6f56d451c2875e54ddbae' - '687555968d4ca688d8f95c8f13e1d8d4' - '3d1e4a119f38cff0498bf8a67e94e4b3' - '37401edf67296d3a4467ad178958d177' - 'ee7c8e1f025ce1527ecfffabafb26806' - '41b03fb1e0a9d9ae7588e3b813212772' - 'a9ffe72c3ede99d505fdc97572a7c256' - 'df43bce1712320508d4eef8449c5d223' - '65d93f15ac85adf8299552581789a731' - '4badc3c664c55f87396a473e6c14d4bc' - 'e2aa772fe0bf366e26eaaf663f9257bd' - 'fe5e31b833cc6707209e9d656b6eb53c' - 'd328d63eaa4252f3d4888476c79bbff6' - '23d0e12b7ca1cc6ea6b993c1d7ff20b9' - '857a831e8627727306208f0e776b1b98' - 'cf35353141b70145f3ee8b0bd852c9f1' - 'cf60e7ba4cf3467bb5539d5c51da61b6' - 'a63ff9ef5250965aeabc74bfa8e43981') + md5sums=('297441b8d85820698c19e7c0ad5a3dfe' '1a4694fcd694b362c339bda781ed0f3e' 'e36da536dd651ef182e7642337889e77' @@ -148,7 +114,7 @@ md5sums=('297441b8d85820698c19e7c0ad5a3dfe' '4620f6f498ef4523398635cb0bd59425' '06188493e5ed79cb501d3c5694dee8ca' 'e459ed069317bccb20351f037a9df3d2' - '26ee0932243b79484b37eb8f6cf04cd4' + '5115da23daa4d57c2fce89b36e08bd3a' '6aff504ed5e860adc1b7317cd0780900' '55fccb1da0417a896b724f7cfc32dd5a' 'ab2aa42c2947148c2b1cac0ade6d1d55' -- cgit v0.12 From 5106977528d3d26919263bf62d504035a7720633 Mon Sep 17 00:00:00 2001 From: Greg Frost Date: Sun, 18 Apr 2010 14:47:18 +0930 Subject: test-pattern: added command line argument control --- abs/core-testing/test-pattern/PKGBUILD | 6 +-- abs/core-testing/test-pattern/test_pattern.bash | 65 ++++++++++++++++++++----- 2 files changed, 57 insertions(+), 14 deletions(-) diff --git a/abs/core-testing/test-pattern/PKGBUILD b/abs/core-testing/test-pattern/PKGBUILD index f79ae6a..3604a6f 100644 --- a/abs/core-testing/test-pattern/PKGBUILD +++ b/abs/core-testing/test-pattern/PKGBUILD @@ -1,10 +1,10 @@ pkgname=test-pattern pkgver=1.0 -pkgrel=1 +pkgrel=3 arch=('i686') pkgdesc="script to create test pattern videos" depends=(imagemagick) - +license=('GPL') source=(test_pattern.bash) build() { @@ -13,4 +13,4 @@ build() { install -m755 -D test_pattern.bash $startdir/pkg/usr/bin/test_pattern.bash } -md5sums=('a6b424b0ebc07574fa5716eced807127') +md5sums=('67359cc8826c99ac09e8a1d0d87fc381') diff --git a/abs/core-testing/test-pattern/test_pattern.bash b/abs/core-testing/test-pattern/test_pattern.bash index 9cf3228..c2af38e 100755 --- a/abs/core-testing/test-pattern/test_pattern.bash +++ b/abs/core-testing/test-pattern/test_pattern.bash @@ -1,13 +1,46 @@ #!/bin/bash -w=1280 -h=1024 +# Set default options to be overriden by command line arguments. -w=1920 -h=1080 +w=400 +h=325 +rate=50 +TEMPDIR= +unset remove_tempdir -w=640 -h=480 +while getopts ":w:h:t:r:" opt; do + case $opt in + w) + w=$OPTARG + ;; + h) + h=$OPTARG + ;; + t) + TEMPDIR=$OPTARG + ;; + r) + rate=$OPTARG + ;; + \?) + echo -n"\ +Error: Invalid option -$OPTARG + +Usage: + test_pattern.bash [options] + -w width + The width in pixels. + -h height + The height in pixels. + -t tempdir + Temporary directory for intermediate files. If no directory is specified, one is created and deleted at the end of processing. + -r framerate +" + exit 1 + esac +done + +# Calculate some dimensions based on the requested size. barw=$((w/32)) barstep=$((w/90)) @@ -29,12 +62,18 @@ echo nhgrid=$nhgrid echo gridstartx=$gridstartx echo gridstarty=$gridstarty -TEMPDIR=./tmp -if [ ! -d "$TEMPDIR" ] ; then - mkdir $TEMPDIR +echo parsed tempdir $TEMPDIR + +if [ -z "$TEMPDIR" ] ; then + TEMPDIR=$(mktemp -d --tmpdir=/tmp) + remove_tempdir=1 +else + if [ ! -d "$TEMPDIR" ] ; then + mkdir $TEMPDIR + fi fi -#TEMPDIR=$(mktemp -d --tmpdir=/tmp) +echo parsed tempdir $TEMPDIR $remove_tempdir unset checker checker=( -fill "rgb(192,192,192)" ) @@ -217,4 +256,8 @@ for ((i=0; i < $frames; i++)) ; do ${image_name} done -ffmpeg -i ${TEMPDIR}/test%03d.jpg -y test.mpg +ffmpeg -r ${rate} -i ${TEMPDIR}/test%03d.jpg -r ${rate} -y test.mpg + +if [ -n "$remove_tempdir" ] ; then + rm -Rf $TEMPDIR +fi -- cgit v0.12 From 6b896b4eeca3db7170369c57137e151cb27a00d1 Mon Sep 17 00:00:00 2001 From: Greg Frost Date: Sun, 18 Apr 2010 17:05:01 +0930 Subject: test-pattern: add interlaced support --- abs/core-testing/test-pattern/PKGBUILD | 4 +-- abs/core-testing/test-pattern/test_pattern.bash | 36 ++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/abs/core-testing/test-pattern/PKGBUILD b/abs/core-testing/test-pattern/PKGBUILD index 3604a6f..db15a0d 100644 --- a/abs/core-testing/test-pattern/PKGBUILD +++ b/abs/core-testing/test-pattern/PKGBUILD @@ -1,6 +1,6 @@ pkgname=test-pattern pkgver=1.0 -pkgrel=3 +pkgrel=4 arch=('i686') pkgdesc="script to create test pattern videos" depends=(imagemagick) @@ -13,4 +13,4 @@ build() { install -m755 -D test_pattern.bash $startdir/pkg/usr/bin/test_pattern.bash } -md5sums=('67359cc8826c99ac09e8a1d0d87fc381') +md5sums=('fbe06cf5a38090e2242f4c3e42f3fc7a') diff --git a/abs/core-testing/test-pattern/test_pattern.bash b/abs/core-testing/test-pattern/test_pattern.bash index c2af38e..6e7fff9 100755 --- a/abs/core-testing/test-pattern/test_pattern.bash +++ b/abs/core-testing/test-pattern/test_pattern.bash @@ -7,8 +7,9 @@ h=325 rate=50 TEMPDIR= unset remove_tempdir +interlaced= -while getopts ":w:h:t:r:" opt; do +while getopts ":w:h:t:r:i" opt; do case $opt in w) w=$OPTARG @@ -22,6 +23,9 @@ while getopts ":w:h:t:r:" opt; do r) rate=$OPTARG ;; + i) + interlaced=TRUE + ;; \?) echo -n"\ Error: Invalid option -$OPTARG @@ -35,6 +39,8 @@ Usage: -t tempdir Temporary directory for intermediate files. If no directory is specified, one is created and deleted at the end of processing. -r framerate + -i + Generate an interlaced test pattern " exit 1 esac @@ -240,9 +246,16 @@ convert -size ${w}x${h} xc:grey50 \ convert -size ${w}x${h} ${TEMPDIR}/grid.png ${TEMPDIR}/centre.png ${TEMPDIR}/circle.png -composite ${TEMPDIR}/background.png +if [ -n "$interlaced" ] ; then + interlaced_frame=0 + convert -size 1x${h} -tile-offset +0+1 pattern:gray50 \ + -scale ${w}x${h}\! ${TEMPDIR}/interlace.png +fi + for ((i=0; i < $frames; i++)) ; do - image_name=${TEMPDIR}/test$(printf "%03d" $i).jpg + prev_image_name=$image_name + image_name=${TEMPDIR}/test$(printf "%03d" $i).png echo creating image $image_name convert -size ${w}x${h} ${TEMPDIR}/background.png \ @@ -253,10 +266,27 @@ for ((i=0; i < $frames; i++)) ; do -fill white \ -stroke black -strokewidth 5 -annotate +$((w-2*i))+$((gridstartx+11*unit)) 'Judder Test' \ -stroke none -annotate +$((w-2*i))+$((gridstartx+11*unit)) 'Judder Test' \ + -depth 8 \ ${image_name} + + if [ -n "$interlaced" ] ; then + interlaced_frame=$((interlaced_frame + 1)) + + if [ $interlaced_frame = 2 ] ; then + echo interlacing $((i-1)) and $i + interlaced_frame=0 + convert -size ${w}x${h} -depth 8 $prev_image_name $image_name ${TEMPDIR}/interlace.png -composite ${TEMPDIR}/interlaced$(printf "%03d" $((i/2))).png + fi + fi done -ffmpeg -r ${rate} -i ${TEMPDIR}/test%03d.jpg -r ${rate} -y test.mpg +if [ -n "$interlaced" ] ; then + ffmpeg -r ${rate} -i ${TEMPDIR}/interlaced%03d.png -r ${rate} \ + -vcodec mpeg2video -flags +ilme+ildct -y test.mpg +else + ffmpeg -r ${rate} -i ${TEMPDIR}/test%03d.png -r ${rate} \ + -vcodec mpeg2video -y test.mpg +fi if [ -n "$remove_tempdir" ] ; then rm -Rf $TEMPDIR -- cgit v0.12 From ba16cf27ca4bf8150cf14735174837c361ec9f5e Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Tue, 20 Apr 2010 18:39:32 -0700 Subject: mythtv:latest -fixes. --- abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD index a62fd65..369b03a 100755 --- a/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.23 -pkgrel=13 +pkgrel=14 pkgdesc="A personal video recorder for Linux" url="http://www.mythtv.org" license="GPL" -- cgit v0.12