diff options
Diffstat (limited to 'abs')
37 files changed, 271 insertions, 1255 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 75b93a2..a47d7ea 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.1 -pkgrel=8 +pkgrel=11 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' @@ -133,7 +133,7 @@ package() { install -o root -g root -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf } -md5sums=('8ee14247b04ab4152d4919d4d4b8d869' +md5sums=('e4faaa3d5f180d796e200b701048b008' '3f6855b7bb860a44f96a972c2e80f497' 'f6e9dd7bc6cf0aaa3bd203dab4cb79b9' '2596460462cf6c889cf8f95485537b20' @@ -159,7 +159,7 @@ md5sums=('8ee14247b04ab4152d4919d4d4b8d869' 'c0549457750c4f8e8038d904a0f3012a' '075fe16ef92621ce31f41df5c5577daf' 'b845de3e05c1734cce4b9ac5e8f1baaf' - '31ad5416bf2ab1909338a16035941127' + '6356c271bf6639002d4c59406250a1f6' '8b7dce4a3a0a281fa6656aa8781a648e' 'f7f2dc11d1ba454cd25eeaa133104b62' '824e49d9b01fed295c704ab68908b464' diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py index ba88ade..fe4a395 100755 --- a/abs/core/LinHES-config/mv_install.py +++ b/abs/core/LinHES-config/mv_install.py @@ -506,6 +506,15 @@ def partition_disk(): else: create_partitions_gpt(datadisk, start_sector, hostoptions["datasize"], "primary") + #set active + logging.debug("setting active partition for mbr") + + cmd = "parted %s set 1 boot on" %rootdisk + runcmd(cmd) + + cmd = "sfdisk --force -A1 %s" %rootdisk + runcmd(cmd) + logging.debug("sleeping for 5 seconds") time.sleep(5) diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py index f481fa4..1eae985 100755 --- a/abs/core/LinHES-config/mv_ir.py +++ b/abs/core/LinHES-config/mv_ir.py @@ -202,7 +202,8 @@ def setup_ir_receiver(ReceiverType,TEMPLATES,HDHRlirc_device,myip): logging.info(" Configuring receiver %s", ReceiverType) if ReceiverType == "serial": scrub_modules("/etc/modules.mythvantage","lirc") - add_module("/etc/modules.mythvantage","lirc_serial #lirc") + #loading takes place in remotes/run + #add_module("/etc/modules.mythvantage","lirc_serial #lirc") cmd = "load-modules-mythvantage.sh" mv_common.runcmd(cmd) mv_common.remove_service("igdaemon") @@ -301,7 +302,7 @@ def setup_blaster_transmiter(HostBlasterType): mv_common.add_service("igdaemon") elif HostBlasterType == "serial": scrub_modules("/etc/modules.mythvantage","blaster") - add_module("/etc/modules/.mythvantage","lirc_serial #blaster") + #add_module("/etc/modules/.mythvantage","lirc_serial #blaster") cmd = "load-modules-mythvantage.sh" mv_common.runcmd(cmd) elif HostBlasterType == "pvr150": diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session index c6d0b09..14606fb 100755 --- a/abs/core/LinHES-system/LinHES-session +++ b/abs/core/LinHES-system/LinHES-session @@ -229,8 +229,13 @@ function first_configure_default(){ xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup sudo sv start mythbackend sudo chown -R mythtv.mythtv /home/mythtv - nice -n 19 mythfilldatabase --quiet & - msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as "unknown"\nin the program guide." + # only run mythfilldatabase for masterbackends + if [ $SystemType = "Master_backend" ] + then + nice -n 19 mythfilldatabase --quiet & + msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as "unknown"\nin the program guide." + fi + rm ~/.configure fi else @@ -268,8 +273,12 @@ function first_configure_mv(){ /usr/bin/taskset -c 0 /usr/bin/mythtv-setup /usr/MythVantage/bin/backend_control.sh start BE 127.0.0.1 fi - nice -n 19 mythfilldatabase --quiet & - msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as "unknown"\nin the program guide." + # only run mythfilldatabase for masterbackends + if [ $SystemType = "Master_backend" ] + then + nice -n 19 mythfilldatabase --quiet & + msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as "unknown"\nin the program guide." + fi rm -f ~/.configure fi else diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index b0b8ba7..94b1604 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.1 -pkgrel=10 +pkgrel=12 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -75,7 +75,7 @@ package() { } -md5sums=('7f5624a2d965a4cd3ed6a37ebee13fd9' +md5sums=('7ab2a2c643d2b286811d8303d08982ad' 'de32a1c50101265dd7f6ca5037f7a26a' '301884fb60521627fffd1160b2cf5181' '76b2637cac0452b3acdbeeb4e8a5474b' @@ -102,7 +102,7 @@ md5sums=('7f5624a2d965a4cd3ed6a37ebee13fd9' '7f7c49d859abdaa0b5fca399241d4998' '3e60b17892e5b8214d47dcfddf5215a4' '57ec994cc3964a10c00580e89ebcae35' - 'ea315f41dcd6c978e546c95fc05546cf' + '0c3509b48f11af0dc1bf989721fe9ca7' 'ac61cc460d9e97ba1f5ef69e92cdfbe5' 'f3502bb7c665750da0ecdf6918f7c838' 'b7febd04f64fe21e8cfbb888219b0b31' @@ -119,8 +119,8 @@ md5sums=('7f5624a2d965a4cd3ed6a37ebee13fd9' '34fc1f58ad1eabf4eff4979d420760c0' 'c3ada01d3a739abe3f920b02d4ea3f6e' 'a94fe6d980f4b810f2e2ae5352084b39' - 'f808e8614246913a7f633b51c7169c85' - '3fc3d584fadd47f82c5cfe8ac0f4322a' + '2c56266a79d058bf01f0de19c2cd042a' + 'c27d3fdf59b211f9d3cd76a81f6257dc' '503df99218373dfc75e7e7f5e449a44e' '4a1fda884dcd7d65fb2690fbdbd92a83' '2b7fe3b57592823a4c7e3ec132dcb7f4' diff --git a/abs/core/LinHES-system/gen_is_xml.py b/abs/core/LinHES-system/gen_is_xml.py index c7525a1..cf33764 100755 --- a/abs/core/LinHES-system/gen_is_xml.py +++ b/abs/core/LinHES-system/gen_is_xml.py @@ -49,8 +49,8 @@ def main(): filename="/usr/share/mythtv/gen_is.xml" is_xml_dir="/etc/gen_is_xml.d/" xml_snippets=read_snippets(is_xml_dir) - xml='''<mythmenu name="Internet Steams">\n\n%s\n</mythmenu>\n''' %xml_snippets + xml='''<mythmenu name="INTERNET_STREAMS">\n\n%s\n</mythmenu>\n''' %xml_snippets write_xml(xml,filename) if __name__ == "__main__": - main()
\ No newline at end of file + main() diff --git a/abs/core/LinHES-system/linhes_update.sh b/abs/core/LinHES-system/linhes_update.sh index 76501fb..afaf6d5 100644 --- a/abs/core/LinHES-system/linhes_update.sh +++ b/abs/core/LinHES-system/linhes_update.sh @@ -37,7 +37,7 @@ chck () { echo "</mythmenu>" >> /tmp/linhes.xml.tmp mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml - echo "<mythmenu name=\"LinHES\">" > /tmp/update3.xml.tmp + echo "<mythmenu name=\"LH_UPDATE\">" > /tmp/update3.xml.tmp #check for kernel update and warn reboot is required if grep linux /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded diff --git a/abs/core/LinHES-system/linhes_update2.sh b/abs/core/LinHES-system/linhes_update2.sh index b26e762..6087729 100644 --- a/abs/core/LinHES-system/linhes_update2.sh +++ b/abs/core/LinHES-system/linhes_update2.sh @@ -7,7 +7,7 @@ then sudo pacman -Su --force --noconfirm msg_client.py --clear --tag "Updating" msg_client.py --kill - msg_client.py --msg "Updates complete.|middle" + msg_client.py --msg "Updates complete.\nReturning to Main Menu.|middle" if grep linux /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded then msg_client.py --msg "Updates require a reboot.|middle" @@ -28,7 +28,7 @@ then echo " <button>" >> /tmp/linhes.xml.tmp echo " <type>UPGRADE</type>" >> /tmp/linhes.xml.tmp echo " <text>Update LinHES</text>" >> /tmp/linhes.xml.tmp - echo " <description>Update the LinHES System</description>" >> /tmp/linhes.xml.tmp + echo " <description>Update the LinHES system</description>" >> /tmp/linhes.xml.tmp echo " <action>MENU update.xml</action>" >> /tmp/linhes.xml.tmp echo " </button>" >> /tmp/linhes.xml.tmp echo "<!--#Check for updates-->" >> /tmp/linhes.xml.tmp diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index fb894fb..2b1aba3 100644 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,20 +1,19 @@ pkgname=linhes-theme pkgver=8.1 -pkgrel=15 +pkgrel=20 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') url="http://linhes.org/" patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch' - 'menu-ui-vert.xml.patch' 'recordings-ui.xml.patch' 'schedule-ui.xml.patch' - 'video-ui.xml.patch' 'config-ui.xml.patch') + 'menu-ui-vert.xml.patch' 'recordings-ui.xml.patch' 'qtlook.txt.patch') -#The LinHES theme is based on TintedGlass by Harley Peters -source=("git://github.com/MythTV-Themes/TintedGlass.git#branch=fixes/0.27" +#The LinHES theme is based on TintedGlass 4.39 by Harley Peters +source=("git+https://github.com/MythTV-Themes/TintedGlass.git#branch=fixes/0.27" `echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' - 'background.png' 'preview.png' 'qt-background.png' 'tux_thoughts.png' - 'LHLogo.png' 'LHLogoAndText.png') + 'background.png' 'preview.png' 'tux_thoughts.png' + 'LHLogoAndText.png') package() { THEMEROOT=usr/share/mythtv/themes @@ -37,12 +36,15 @@ package() { msg "Copy *.xml and adding backgrounds and images for LinHES" rsync -pL $srcdir/*.xml $pkgdir/$THEMEROOT/LinHES/ rm -r $pkgdir/$THEMEROOT/LinHES/images/backgrounds/* - rsync -pL $srcdir/*background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/ + rsync -pL $srcdir/background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/ rsync -pL $srcdir/preview.png $pkgdir/$THEMEROOT/LinHES/ #tux_thoughts.png is the thought bubble for the menu descriptions rsync -pL $srcdir/tux_thoughts.png $pkgdir/$THEMEROOT/LinHES/images/ - rsync -pL $srcdir/LHLogo*.png $pkgdir/$THEMEROOT/LinHES/images/ + rsync -pL $srcdir/LHLogoAndText.png $pkgdir/$THEMEROOT/LinHES/images/ + + #vertical menu + mv $pkgdir/$THEMEROOT/LinHES/menu-ui-vert.xml $pkgdir/$THEMEROOT/LinHES/menu-ui.xml msg "Modifying yellows and blue to LinHES yellow and blue" #yellow @@ -53,19 +55,15 @@ package() { grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#3a9ade/\#0072bc/g" } md5sums=('SKIP' - '9c2fc68864cbedb6e449056972b457aa' - 'e061490fc869e0e14d4e144c17c3ec56' - 'e7af3675fc706a7cb4ea9d0c321219d5' - '9e4fcf840f14c6f17f30432e28edd885' - '33609e27406f00bdc0243a5ef840c6f9' - 'aff82cf901edc4baa058013d93610cfc' - 'e502da82e6d76b3f43dd7ddc20c1e2e7' - '78b64e567cd799df52045d9fc5a59cc0' + '95478bd9bab15e9e4365c1048757c225' + 'ed4f8baf431e20babc345e4e2602426f' + '9c2c8f2a8d881e01ea84457ae508f655' + 'ec11d601d47cd4b2954e1609262a571b' + '4ad8bc893412eeeb890f0b1f1f1bd541' + '9fe3371a8b964a7028126405cfaa330b' '7d7bc458a8f4af408700609f3e1f412e' 'a0201e0aa1608eeab27ee754e4d2c1de' - 'cbe5f663ebb5d51abe811f81dafec303' - '4b1c27297bb5f8d9d7bbaf72b35130b5' '12d26a786fde397348653128a6d7676a' + '4b1c27297bb5f8d9d7bbaf72b35130b5' '2bd09b8049aaf5ba21db5baf3a0ce077' - 'b51ef0cbf8ed2d3a8c1a8257a89aceff' '09ad14842f828b7a8d24070ec8214fe5') diff --git a/abs/core/linhes-theme/qt-background.png b/abs/core/linhes-theme/background-with-logo.png Binary files differindex 12544b2..ffdf9ef 100644 --- a/abs/core/linhes-theme/qt-background.png +++ b/abs/core/linhes-theme/background-with-logo.png diff --git a/abs/core/linhes-theme/background.png b/abs/core/linhes-theme/background.png Binary files differindex ffdf9ef..12544b2 100644 --- a/abs/core/linhes-theme/background.png +++ b/abs/core/linhes-theme/background.png diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch index 2ff8487..bbf971d 100644 --- a/abs/core/linhes-theme/base.xml.patch +++ b/abs/core/linhes-theme/base.xml.patch @@ -1,276 +1,11 @@ ---- base.xml.orig 2013-11-22 18:52:58.956295819 +0000 -+++ base.xml 2013-12-17 16:44:18.909675491 +0000 -@@ -424,26 +424,26 @@ +--- base.xml.orig 2014-01-02 20:11:41.055260777 +0000 ++++ base.xml 2014-01-02 20:20:50.598179696 +0000 +@@ -424,7 +424,7 @@ <!-- Base definition of a base popup backdrop --> <shape name="base_popup_backdrop" from="base_backdrop"> -- <fill color="#0a0a0e" alpha="255" /> -+ <fill color="#0a0a0e" alpha="235" /> +- <fill color="#000000" alpha="255" /> ++ <fill color="#000000" alpha="235" /> </shape> <!-- Base definition of a heading group --> - <group name="base_heading_group"> - <area>0,0,1280,720</area> - <shape name="base_heading_backdrop" from="base_backdrop"> -- <area>500,-7,280,32</area> -+ <area>485,-7,310,32</area> - </shape> - <shape name="base_heading_backdrop_line" from="base_backdrop_line"> -- <area>500,-7,280,32</area> -+ <area>485,-7,310,32</area> - </shape> - <shape name="heading-left-line" from="base_highlight_vertical_line"> -- <area>501,0,2,22</area> -+ <area>486,0,2,22</area> - </shape> - <shape name="heading-right-line" from="base_highlight_vertical_line"> -- <area>777,0,2,22</area> -+ <area>792,0,2,22</area> - </shape> - <shape name="heading-bottom-line" from="base_highlight_line"> -- <area>501,22,278,2</area> -+ <area>486,22,308,2</area> - </shape> - </group> - -@@ -452,7 +452,7 @@ - <area>0,0,1280,720</area> - <imagetype name="background"> - <area>0,0,1280,720</area> -- <filename>images/backgrounds/background.png</filename> -+ <filename>images/backgrounds/qt-background.png</filename> - </imagetype> - <imagetype name="fanart"> - <area>0,0,1280,720</area> -@@ -463,25 +463,25 @@ - <!-- Base definition of a clock group --> - <group name="base_clock_backdrop_group"> - <shape name="base_clock_backdrop" from="base_backdrop"> -- <area>500,695,280,32</area> -+ <area>485,695,310,32</area> - </shape> - <shape name="base_clock_backdrop_line" from="base_backdrop_line"> -- <area>500,695,280,32</area> -+ <area>485,695,310,32</area> - </shape> - <shape name="base_clock_backdrop_top_line" from="base_highlight_line"> -- <area>501,696,278,2</area> -+ <area>486,696,308,2</area> - </shape> - <shape name="base_clock_backdrop_left_line" from="base_highlight_vertical_line"> -- <area>501,698,2,22</area> -+ <area>486,698,2,22</area> - </shape> - <shape name="clock_right_line" from="base_highlight_vertical_line"> -- <area>777,698,2,22</area> -+ <area>792,698,2,22</area> - </shape> - </group> - - <!-- Base denfinition of a clock --> - <clock name="base_clock"> -- <area>529,698,219,22</area> -+ <area>494,698,292,22</area> - <font>baseextrasmall</font> - <template>%DATE%, %TIME%</template> - <align>allcenter</align> -@@ -533,19 +533,19 @@ - - <!-- Base definition of a active button background --> - <shape name="base_button_background_active" from="base_button_background_selected"> -- <fill color="#333333" alpha="175" /> -+ <fill color="#000000" alpha="175" /> - <line color="#454545" alpha="180" width="2" /> - </shape> - - <!-- Base definition of a active button list background --> - <shape name="base_button_list_background_active" from="base_button_background_selected"> -- <fill color="#CCCCCC" alpha="150" /> -- <line color="#CCCCCC" alpha="150" width="2" /> -+ <fill color="#000000" alpha="175" /> -+ <line color="#454545" alpha="180" width="2" /> - </shape> - - <!-- Base definition of a disabled button background --> - <shape name="base_button_background_disabled" from="base_button_background_selected"> -- <fill color="#333333" alpha="175" /> -+ <fill color="#000000" alpha="175" /> - <line color="#454545" alpha="180" width="2" /> - </shape> - -@@ -563,7 +563,7 @@ - - <!-- Base definition of a inactve button background list style --> - <shape name="base_button_background_inactive_list_style" from="base_button_background_selected"> -- <fill color="#333333" alpha="175" /> -+ <fill color="#000000" alpha="175" /> - <line color="#454545" alpha="180" width="2" /> - </shape> - -@@ -571,6 +571,7 @@ - <buttonlist name="base_button_list"> - <layout>vertical</layout> - <spacing>2</spacing> -+ <wrapstyle>selection</wrapstyle> - <drawfrombottom>yes</drawfrombottom> - <buttonarea>0,0,100%,100%</buttonarea> - <statetype name="buttonitem"> -@@ -579,7 +580,7 @@ - <area>0,0,100%,100%</area> - </shape> - <textarea name="buttontext"> -- <font>basesmallblack</font> -+ <font>basesmallgrey</font> - <cutdown>yes</cutdown> - <align>allcenter</align> - </textarea> -@@ -997,7 +998,7 @@ - <shape name="buttonbackground"> - <area>0,0,100%,100%</area> - <type>roundbox</type> -- <fill color="#333333" alpha="175" /> -+ <fill color="#000000" alpha="175" /> - <line color="#454545" alpha="180" width="2" /> - <cornerradius>90</cornerradius> - </shape> -@@ -1064,7 +1065,7 @@ - <shape name="buttonbackground"> - <area>0,0,100%,100%</area> - <type>roundbox</type> -- <fill color="#333333" alpha="175" /> -+ <fill color="#000000" alpha="175" /> - <line color="#454545" alpha="180" width="2" /> - <cornerradius>90</cornerradius> - </shape> -@@ -1117,7 +1118,7 @@ - <shape name="background"> - <area>0,0,100%,100%</area> - <type>roundbox</type> -- <fill color="#333333" alpha="175" /> -+ <fill color="#000000" alpha="175" /> - <line color="#454545" alpha="180" width="2" /> - <cornerradius>90</cornerradius> - </shape> -@@ -1228,22 +1229,20 @@ - - <imagetype name="background"> - <area>0,0,1280,720</area> -- <filename>images/backgrounds/background.png</filename> -+ <filename>images/backgrounds/qt-background.png</filename> - </imagetype> - - <group name="heading-backdrop" from="base_heading_group" /> - - <group name="clock-backdrop-group" from="base_clock_backdrop_group" /> - -- <clock name="time" from="base_clock"> -- <area>529,698,219,22</area> -- </clock> -+ <clock name="time" from="base_clock" /> - - </window> - - <!-- Popup Dialogue Box --> - <window name="MythPopupBox"> -- <area>-1,-1,400,463</area> -+ <area>-1,-1,602,488</area> - - <animation trigger="AboutToShow"> - <section> -@@ -1260,76 +1259,76 @@ - </animation> - - <shape name="popup-backdrop" from="base_popup_backdrop"> -- <area>0,0,400,463</area> -+ <area>0,0,602,488</area> - </shape> - - <shape name="popup-backdrop-line" from="base_backdrop_line"> -- <area>1,1,398,461</area> -+ <area>1,1,600,486</area> - </shape> - - <shape name="popup-first-line" from="base_highlight_line"> -- <area>2,2,396,2</area> -+ <area>2,2,596,2</area> - </shape> - - <shape name="popup-second-line" from="base_line"> -- <area>23,174,354,2</area> -+ <area>23,212,552,2</area> - </shape> - - <shape name="popup-third-line" from="base_highlight_line"> -- <area>2,459,396,2</area> -+ <area>2,484,596,2</area> - </shape> - - <shape name="popup-left-line" from="base_highlight_vertical_line"> -- <area>2,4,2,455</area> -+ <area>2,4,2,480</area> - </shape> - - <shape name="popup-right-line" from="base_highlight_vertical_line"> -- <area>396,4,2,455</area> -+ <area>598,4,2,480</area> - </shape> - - <textarea name="messagearea" from="basetextarea"> -- <area>16,8,368,162</area> -+ <area>10,8,582,196</area> - <font>basesmalldarkyellow</font> - <multiline>yes</multiline> - <align>allcenter</align> - </textarea> - - <buttonlist name="list" from="base_button_list"> -- <area>15,191,370,264</area> -+ <area>15,222,570,252</area> - <statetype name="buttonitem"> - <state name="active"> -- <area>0,0,370,40</area> -+ <area>0,0,100%,34</area> - <textarea name="buttontext"> -- <area>8,0,354,40</area> -+ <area>8,0,570,34</area> - </textarea> - <imagetype name="buttonarrow"> -- <position>347,11</position> -+ <position>544,8</position> - </imagetype> - </state> - <state name="selectedactive"> -- <area>0,0,370,40</area> -+ <area>0,0,100%,34</area> - <textarea name="buttontext"> -- <area>8,0,354,40</area> -+ <area>8,0,570,34</area> - </textarea> - <imagetype name="buttonarrow"> -- <position>347,11</position> -+ <position>544,8</position> - </imagetype> - </state> - <state name="selectedinactive"> -- <area>0,0,370,40</area> -+ <area>0,0,100%,34</area> - <textarea name="buttontext"> -- <area>8,0,354,40</area> -+ <area>8,0,570,34</area> - </textarea> - <imagetype name="buttonarrow"> -- <position>347,11</position> -+ <position>544,8</position> - </imagetype> - </state> - </statetype> - <statetype name="upscrollarrow"> -- <position>0,255</position> -+ <position>0,251</position> - </statetype> - <statetype name="downscrollarrow"> -- <position>20,255</position> -+ <position>20,251</position> - </statetype> - </buttonlist> - </window> diff --git a/abs/core/linhes-theme/config-ui.xml.patch b/abs/core/linhes-theme/config-ui.xml.patch deleted file mode 100644 index 36d6b67..0000000 --- a/abs/core/linhes-theme/config-ui.xml.patch +++ /dev/null @@ -1,200 +0,0 @@ ---- config-ui.xml.orig 2013-12-14 17:21:38.882668570 +0000 -+++ config-ui.xml 2013-12-14 17:23:08.317851041 +0000 -@@ -347,6 +347,197 @@ - - </window> - -+ <window name="languageselection"> -+ -+ <textarea name="title" from="base_heading"> -+ <value>Language</value> -+ </textarea> -+ -+ <textarea name="countrylabel"> -+ <font>baselarge</font> -+ <area>40,20,580,40</area> -+ <value>Country</value> -+ <align>allcenter</align> -+ </textarea> -+ -+ <shape name="countrybackground" from="base_backdrop"> -+ <area>40,65,580,550</area> -+ </shape> -+ -+ <shape name="country-top-backdrop-line" from="base_backdrop_line"> -+ <area>41,66,578,548</area> -+ </shape> -+ -+ <shape name="country-top-line" from="base_highlight_line"> -+ <area>42,67,576,2</area> -+ </shape> -+ -+ <shape name="country-bottom-line" from="base_highlight_line"> -+ <area>42,613,576,2</area> -+ </shape> -+ -+ <shape name="country-left-line" from="base_highlight_vertical_line"> -+ <area>42,69,2,544</area> -+ </shape> -+ -+ <shape name="country-right-line" from="base_highlight_vertical_line"> -+ <area>616,69,2,544</area> -+ </shape> -+ -+ <shape name="country-arrows-backdrop" from="base_arrows_backdrop"> -+ <area>48,615,50,12</area> -+ </shape> -+ -+ <buttonlist name="countries" from="base_list"> -+ <area>50,78,560,530</area> -+ <scrollstyle>center</scrollstyle> -+ <statetype name="buttonitem"> -+ <state name="active"> -+ <area>0,0,100%,55</area> -+ <shape name="buttonbackground" from="base_select_bar_active"> -+ <area>0,0,100%,100%</area> -+ </shape> -+ <imagetype name="buttonimage"> -+ <area>5,7,60,40</area> -+ </imagetype> -+ <textarea name="buttontext" from="basetextarea"> -+ <area>70,0,90%,30</area> -+ <font>basemediumgrey</font> -+ <cutdown>yes</cutdown> -+ <align>left,vcenter</align> -+ </textarea> -+ <textarea name="nativecountry" from="basetextarea"> -+ <area>70,30,90%,20</area> -+ <font>basesmallgrey</font> -+ <cutdown>yes</cutdown> -+ <align>left,vcenter</align> -+ </textarea> -+ </state> -+ <state name="inactive" from="active"/> -+ <state name="selectedactive" from="active"> -+ <shape name="buttonbackground" from="base_select_bar_selectedactive"> -+ <area>0,0,100%,100%</area> -+ </shape> -+ <textarea name="buttontext" from="basetextarea"> -+ <area>70,0,90%,30</area> -+ <font>basemediumyellow</font> -+ <cutdown>yes</cutdown> -+ <align>left,vcenter</align> -+ </textarea> -+ <textarea name="nativecountry" from="basetextarea"> -+ <area>70,30,90%,20</area> -+ <font>basesmall</font> -+ <cutdown>yes</cutdown> -+ <align>left,vcenter</align> -+ </textarea> -+ </state> -+ <state name="selectedinactive" from="inactive"> -+ <shape name="buttonbackground" from="base_select_bar_selectedinactive"> -+ <area>0,0,100%,100%</area> -+ </shape> -+ </state> -+ </statetype> -+ <statetype name="upscrollarrow"> -+ <position>5,539</position> -+ </statetype> -+ <statetype name="downscrollarrow"> -+ <position>25,539</position> -+ </statetype> -+ <helptext>Select the country where you reside.</helptext> -+ </buttonlist> -+ -+ <textarea name="languagelabel" from="countrylabel"> -+ <area>660,20,580,40</area> -+ <value>Language</value> -+ </textarea> -+ -+ <shape name="languagebackground" from="base_backdrop"> -+ <area>660,65,580,550</area> -+ </shape> -+ -+ <shape name="lang-top-backdrop-line" from="base_backdrop_line"> -+ <area>661,66,578,548</area> -+ </shape> -+ -+ <shape name="lang-top-line" from="base_highlight_line"> -+ <area>662,67,576,2</area> -+ </shape> -+ -+ <shape name="lang-bottom-line" from="base_highlight_line"> -+ <area>662,613,576,2</area> -+ </shape> -+ -+ <shape name="lang-left-line" from="base_highlight_vertical_line"> -+ <area>662,69,2,544</area> -+ </shape> -+ -+ <shape name="lang-right-line" from="base_highlight_vertical_line"> -+ <area>1236,69,2,544</area> -+ </shape> -+ -+ <shape name="lang-arrows-backdrop" from="base_arrows_backdrop"> -+ <area>668,615,50,12</area> -+ </shape> -+ -+ <buttonlist name="languages" from="countries"> -+ <area>670,78,560,530</area> -+ <statetype name="buttonitem"> -+ <state name="active"> -+ <area>0,0,100%,55</area> -+ <textarea name="buttontext" from="basetextarea"> -+ <area>10,0,90%,30</area> -+ <font>basemediumgrey</font> -+ <cutdown>yes</cutdown> -+ <align>left,vcenter</align> -+ </textarea> -+ <textarea name="language" from="nativecountry"> -+ <position>10,30</position> -+ </textarea> -+ </state> -+ <state name="inactive" from="active" /> -+ <state name="selectedactive" from="active"> -+ <shape name="buttonbackground" from="base_select_bar_selectedactive"> -+ <area>0,0,100%,100%</area> -+ </shape> -+ <textarea name="buttontext" from="basetextarea"> -+ <area>10,0,90%,30</area> -+ <font>basemediumyellow</font> -+ <cutdown>yes</cutdown> -+ <align>left,vcenter</align> -+ </textarea> -+ <textarea name="language" from="nativecountry"> -+ <area>10,30,90%,20</area> -+ <font>basesmall</font> -+ <cutdown>yes</cutdown> -+ <align>left,vcenter</align> -+ </textarea> -+ </state> -+ <state name="selectedinactive" from="inactive"> -+ <shape name="buttonbackground" from="base_select_bar_selectedinactive"> -+ <area>0,0,100%,100%</area> -+ </shape> -+ </state> -+ </statetype> -+ <helptext>Select your language.</helptext> -+ </buttonlist> -+ -+ <textarea name="helptext" from="basetextarea"> -+ <area>200,630,880,60</area> -+ <align>center</align> -+ </textarea> -+ -+ <button name="save" from="base_button"> -+ <position>1090,643</position> -+ <value>Save</value> -+ </button> -+ -+ <button name="cancel" from="base_button"> -+ <position>40,643</position> -+ <value>Cancel</value> -+ </button> -+ -+ </window> -+ - <window name="grabbersettings"> - <area>0,0,1280,720</area> - diff --git a/abs/core/linhes-theme/menu-ui-horizontal.xml.patch b/abs/core/linhes-theme/menu-ui-horizontal.xml.patch deleted file mode 100644 index c099db6..0000000 --- a/abs/core/linhes-theme/menu-ui-horizontal.xml.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- menu-ui.xml.orig 2013-11-21 19:05:04.920817617 +0000 -+++ menu-ui.xml 2013-11-21 20:03:45.474172898 +0000 -@@ -9,16 +9,16 @@ - </textarea> - - <shape name="menuscroll-background" from="base_backdrop"> -- <area>0,525,1280,70</area> -+ <area>0,94,1280,70</area> - <type>box</type> - </shape> - - <shape name="menuscroll-top-line" from="base_line"> -- <area>0,526,1280,2</area> -+ <area>0,95,1280,2</area> - </shape> - - <shape name="menuscroll-bottom-line" from="base_line"> -- <area>0,592,1280,2</area> -+ <area>0,161,1280,2</area> - </shape> - - <statetype name="titles"> -@@ -135,7 +135,7 @@ - </statetype> - - <buttonlist name="menu"> -- <area>20,528,1240,64</area> -+ <area>20,98,1240,64</area> - <layout>horizontal</layout> - <spacing>20</spacing> - <scrollstyle>center</scrollstyle> -@@ -157,6 +157,14 @@ - <state name="selectedactive"> - <area>0,0,232,64</area> - <imagetype name="background" /> -+ -+ <shape name="menu-left-line" from="base_highlight_vertical_line"> -+ <area>-10,-2,2,66</area> -+ </shape> -+ <shape name="menu-right-line" from="base_highlight_vertical_line"> -+ <area>240,-2,2,66</area> -+ </shape> -+ - <textarea name="buttontext"> - <area>0,0,232,64</area> - <font>basemediumlargerdarkyellow</font> -@@ -168,6 +176,20 @@ - <cutdown>yes</cutdown> - <case>upper</case> - </textarea> -+ -+ <imagetype name="description_background"> -+ <area>-100,100,410,180</area> -+ <filename>images/tux_thoughts.png</filename> -+ </imagetype> -+ -+ <textarea name="description"> -+ <area>12,87,210,130</area> -+ <align>allcenter</align> -+ <font>basesmallyellow</font> -+ <alpha>225</alpha> -+ <multiline>yes</multiline> -+ </textarea> -+ - </state> - </statetype> - </buttonlist> diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch index fdff21e..4cfd697 100644 --- a/abs/core/linhes-theme/menu-ui-vert.xml.patch +++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch @@ -1,134 +1,91 @@ ---- menu-ui.xml.orig 2013-12-14 21:10:55.569721394 +0000 -+++ menu-ui.xml 2013-12-18 01:03:39.690460829 +0000 -@@ -3,24 +3,43 @@ - <mythuitheme> - - <window name="mainmenu"> -+ <area>0,0,1280,720</area> - - <textarea name="heading" from="base_heading"> - <value>Main Menu</value> - </textarea> - - <shape name="menuscroll-background" from="base_backdrop"> -- <area>0,525,1280,70</area> -+ <area>35,0,310,720</area> - <type>box</type> - </shape> - -- <shape name="menuscroll-top-line" from="base_line"> -- <area>0,526,1280,2</area> -+ <shape name="menuscroll-left-line" from="base_line"> -+ <area>36,0,2,1280</area> - </shape> - -- <shape name="menuscroll-bottom-line" from="base_line"> -- <area>0,592,1280,2</area> -+ <shape name="menuscroll-right-line" from="base_line"> -+ <area>342,0,2,1280</area> +--- menu-ui-vert.xml.orig 2014-01-02 20:22:20.736627009 +0000 ++++ menu-ui-vert.xml 2014-01-03 20:45:31.091048579 +0000 +@@ -18,6 +18,24 @@ + <area>394,0,2,720</area> </shape> ++ <imagetype name="description_background"> ++ <area>594,165,487,210</area> ++ <filename>images/tux_thoughts.png</filename> ++ </imagetype> ++ + <textarea name="description"> -+ <area>705,158,250,130</area> ++ <area>730,159,250,130</area> + <align>allcenter</align> + <font>basesmallyellow</font> + <multiline>yes</multiline> + <value>I have no idea</value> + </textarea> + -+ <imagetype name="description_background"> -+ <area>567,165,487,210</area> -+ <filename>images/tux_thoughts.png</filename> -+ </imagetype> -+ + <imagetype name="LHlogo"> -+ <area>492,348,638,207</area> ++ <area>519,348,638,207</area> + <filename>images/LHLogoAndText.png</filename> <!--851x277 3.072--> + </imagetype> + <statetype name="titles"> - <loadondemand>true</loadondemand> - <state name="TV"> -@@ -110,7 +129,7 @@ - <value>Manage Recordings</value> + <state name="MAIN"> + <textarea name="heading"> +@@ -123,6 +141,41 @@ + <value>Archive Utilities</value> </textarea> </state> -- <state name="LIBRARY"> -+ <state name="MENU_MEDIA_LIBRARY"> - <textarea name="heading" from="base_heading"> - <value>Media Library</value> - </textarea> -@@ -135,18 +154,20 @@ ++ <state name="LH_SERVICE_MENU" from="MAIN"> ++ <textarea name="heading"> ++ <value>Service Menu</value> ++ </textarea> ++ </state> ++ <state name="LH_UPDATE" from="MAIN"> ++ <textarea name="heading"> ++ <value>Update LinHES</value> ++ </textarea> ++ </state> ++ <state name="LH_BACKUP" from="MAIN"> ++ <textarea name="heading"> ++ <value>Backup LinHES</value> ++ </textarea> ++ </state> ++ <state name="LH_RESTORE" from="MAIN"> ++ <textarea name="heading"> ++ <value>Restore LinHES</value> ++ </textarea> ++ </state> ++ <state name="HOST_SETTINGS" from="MAIN"> ++ <textarea name="heading"> ++ <value>LinHES Settings</value> ++ </textarea> ++ </state> ++ <state name="TRAILERS" from="MAIN"> ++ <textarea name="heading"> ++ <value>Apple Trailers</value> ++ </textarea> ++ </state> ++ <state name="INTERNET_STREAMS" from="MAIN"> ++ <textarea name="heading"> ++ <value>Online Content</value> ++ </textarea> ++ </state> </statetype> <buttonlist name="menu"> -- <area>20,528,1240,64</area> -- <layout>horizontal</layout> -- <spacing>20</spacing> -- <scrollstyle>center</scrollstyle> -- <wrapstyle>items</wrapstyle> -- <buttonarea>0,0,1240,64</buttonarea> -+ <area>35,62,310,596</area> -+ <layout>vertical</layout> -+ <spacing>4</spacing> -+ <scrollstyle>free</scrollstyle> -+ <wrapstyle>selection</wrapstyle> -+ <arrange>Stack</arrange> -+ <align>vcenter</align> -+ <buttonarea>0,0,100%,100%</buttonarea> - <statetype name="buttonitem"> - <state name="active"> -- <area>0,0,232,64</area> -+ <area>0,0,310,64</area> - <imagetype name="background" /> - <textarea name="buttontext"> -- <area>0,0,232,64</area> -+ <area>12,0,286,64</area> - <font>basemediumlightgrey</font> - <multiline>yes</multiline> - <align>allcenter</align> -@@ -155,10 +176,13 @@ - </textarea> - </state> - <state name="selectedactive"> -- <area>0,0,232,64</area> -- <imagetype name="background" /> -+ <area>-10,0,330,64</area> -+ <shape name="background" from="base_select_bar_selectedactive"> -+ <area>0,0,100%,100%</area> -+ </shape> -+ - <textarea name="buttontext"> -- <area>0,0,232,64</area> -+ <area>5,0,320,64</area> - <font>basemediumlargerdarkyellow</font> - <multiline>yes</multiline> - <!-- cpu usage is very high -@@ -170,6 +194,27 @@ +@@ -162,21 +215,6 @@ + <cutdown>yes</cutdown> + <case>upper</case> </textarea> +- <group name="variable-size-text-backdrop-group"> +- <area>330,12,843,40</area> +- <minsize vanish="true">252,40</minsize> +- <shape name="text-backdrop" from="base_backdrop"> +- <area>0,0,-1,-1</area> +- <minsize vanish="true">252,40</minsize> +- </shape> +- <textarea name="description" from="basetextarea"> +- <area>20,1,-20,-1</area> +- <minsize shrink="short" vanish="true">5,5</minsize> +- <font>basesmalldarkyellow</font> +- <align>left,vcenter</align> +- <multiline>no</multiline> +- </textarea> +- </group> </state> </statetype> -+ <statetype name="upscrollarrow"> -+ <position>147,0</position> -+ <showempty>yes</showempty> -+ <state type="full"> -+ <imagetype name="upon"> -+ <filename>images/lists_up_arrow.png</filename> -+ <alpha>200</alpha> -+ </imagetype> -+ </state> -+ </statetype> -+ <statetype name="downscrollarrow"> -+ <position>147,588</position> -+ <showempty>yes</showempty> -+ <state type="full"> -+ <imagetype name="dnon"> -+ <filename>images/lists_down_arrow.png</filename> -+ <alpha>200</alpha> -+ </imagetype> -+ </state> -+ </statetype> -+ - </buttonlist> - - </window> + <statetype name="upscrollarrow"> diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch index 916e629..67748f7 100644 --- a/abs/core/linhes-theme/osd.xml.patch +++ b/abs/core/linhes-theme/osd.xml.patch @@ -1,29 +1,6 @@ ---- osd.xml.orig 2013-11-29 21:53:21.351030883 +0000 -+++ osd.xml 2013-11-30 22:28:42.477439824 +0000 -@@ -440,7 +440,8 @@ - <area>90,658,1100,24</area> - <font>small</font> - <align>allcenter</align> -- <template>%DESCRIPTION% %VALUE%%UNITS%</template> -+ <template>%DESCRIPTION% -+ %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template> - </textarea> - - <clock name="clock"> -@@ -980,6 +981,12 @@ - <align>allcenter</align> - </textarea> - -+ <textarea name="callsign"> -+ <font>large</font> -+ <area>68,634,162,46</area> -+ <align>allcenter</align> -+ </textarea> -+ - <imagetype name="iconpath"> - <area>84,536,130,98</area> - <preserveaspect>true</preserveaspect> -@@ -989,17 +996,11 @@ +--- osd.xml.orig 2014-01-02 19:56:57.605092545 +0000 ++++ osd.xml 2014-01-02 20:02:34.958563960 +0000 +@@ -996,12 +996,12 @@ <!-- Commit 6216029d2 makes this show up in both recordings and video. --> <!-- Since I only want it in video and there is no way to control it. I have no choice but to disable it. --> @@ -31,36 +8,10 @@ + <imagetype name="coverart"> <area>70,492,158,186</area> -- <alpha>225</alpha> -+ <alpha>255</alpha> + <alpha>255</alpha> </imagetype> ---> -- <textarea name="callsign"> -- <font>large</font> -- <area>68,634,162,46</area> -- <align>allcenter</align> -- </textarea> - ++ <textarea name="category"> <font>supersmallblue</font> -@@ -1604,6 +1605,11 @@ - <color>#808080</color> - </fontdef> - -+ <fontdef name="smallyellow" face="DejaVu Sans"> -+ <color>#d9d900</color> -+ <pixelsize>21</pixelsize> -+ </fontdef> -+ - <shape name="mythpopupbox-backdrop"> - <area>339,116,602,488</area> - <type>roundbox</type> -@@ -1665,7 +1671,7 @@ - - <textarea name="messagearea"> - <area>349,126,582,196</area> -- <font>small</font> -+ <font>smallyellow</font> - <multiline>yes</multiline> - <align>allcenter</align> - </textarea> + <area>257,490,937,28</area> diff --git a/abs/core/linhes-theme/qtlook.txt.patch b/abs/core/linhes-theme/qtlook.txt.patch new file mode 100644 index 0000000..7435db4 --- /dev/null +++ b/abs/core/linhes-theme/qtlook.txt.patch @@ -0,0 +1,11 @@ +--- qtlook.txt.orig 2014-01-02 21:32:43.941375600 +0000 ++++ qtlook.txt 2014-01-02 21:32:57.946243387 +0000 +@@ -3,7 +3,7 @@ + # Color of lines, text, etc + str ForegroundColor=1a1a1a + # Pixmap to use for the background +-str BackgroundPixmap=images/backgrounds/qt-background.png ++str BackgroundPixmap=images/backgrounds/background.png + str Font=DejaVu Sans + + # Forground for dialogs diff --git a/abs/core/linhes-theme/readme.txt.patch b/abs/core/linhes-theme/readme.txt.patch index e1894d0..15ac146 100644 --- a/abs/core/linhes-theme/readme.txt.patch +++ b/abs/core/linhes-theme/readme.txt.patch @@ -1,6 +1,6 @@ ---- readme.txt.orig 2013-11-18 21:20:01.034553575 +0000 -+++ readme.txt 2013-11-18 21:20:30.387462546 +0000 -@@ -1,15 +1,3 @@ +--- readme.txt.orig 2014-01-02 21:51:10.099789520 +0000 ++++ readme.txt 2014-01-02 21:52:11.045337937 +0000 +@@ -1,26 +1,9 @@ -Backgrounds. - -If the default background is too light for you there is a darker version located @@ -16,3 +16,14 @@ Alternate osd. There is an alternate osd available for anybody that doesn't like the default. ( osd.xml.alt ) I use the alternate osd myself. + To use just move the default osd to osd.xml.orig and copy the osd.xml.alt to osd.xml. + Example mv osd.xml osd.xml.orig and cp osd.xml.alt osd.xml. + +-Alternate vertical main menu. +-There is an alternate main menu using a vertical layout rather than the default horizontal layout. +-To use just backup main-ui.xml. Example cp menu-ui.xml menu-ui.xml.bak. +-Then cp menu-ui-vert.xml to menu-ui.xml. +- + Color text in lists. + + There are two types of lists in the theme. diff --git a/abs/core/linhes-theme/recordings-ui.xml.patch b/abs/core/linhes-theme/recordings-ui.xml.patch index 7855e5a..0f97dbc 100644 --- a/abs/core/linhes-theme/recordings-ui.xml.patch +++ b/abs/core/linhes-theme/recordings-ui.xml.patch @@ -1,228 +1,18 @@ ---- recordings-ui.xml.orig 2013-11-30 22:40:35.742466059 +0000 -+++ recordings-ui.xml 2013-11-30 22:29:06.554349302 +0000 -@@ -700,7 +700,7 @@ - </window> - - <window name="changeview"> -- <area>-1,-1,380,463</area> -+ <area>-1,-1,602,488</area> - - <animation trigger="AboutToShow"> - <section> -@@ -717,100 +717,100 @@ - </animation> - - <shape name="change-view-backdrop" from="base_popup_backdrop"> -- <area>0,0,380,463</area> -+ <area>0,0,602,488</area> - </shape> - - <shape name="change-view-backdrop-line" from="base_backdrop_line"> -- <area>1,1,378,461</area> -+ <area>1,1,600,486</area> - </shape> - - <shape name="change-view-top-line" from="base_highlight_line"> -- <area>2,2,376,2</area> -+ <area>2,2,596,2</area> - </shape> - - <shape name="change-view-bottom-line" from="base_highlight_line"> -- <area>2,459,376,2</area> -+ <area>2,484,596,2</area> - </shape> - - <shape name="change-view-left-line" from="base_highlight_vertical_line"> -- <area>2,4,2,455</area> -+ <area>2,4,2,480</area> - </shape> - - <shape name="change-view-right-line" from="base_highlight_vertical_line"> -- <area>376,4,2,455</area> -+ <area>598,4,2,480</area> - </shape> - - <shape name="change-view-seperator-top-line" from="base_line"> -- <area>23,74,334,2</area> -+ <area>23,50,552,2</area> - </shape> - - <shape name="change-view-seperator-bottom-line" from="base_line"> -- <area>23,407,334,2</area> -+ <area>23,435,552,2</area> - </shape> - - <textarea name="title" from="basetextarea"> -- <area>4,4,372,70</area> -+ <area>10,4,582,46</area> - <align>allcenter</align> - <font>basesmallyellow</font> - <value>Change View</value> - </textarea> - - <checkbox name="titles" from="base_checkbox"> -- <position>60,102</position> -+ <position>150,102</position> - </checkbox> - - <textarea name="titlelabel" from="basetextarea"> -- <area>110,105,300,30</area> -+ <area>200,105,300,30</area> - <value>Show Titles</value> - </textarea> - - <checkbox name="categories" from="base_checkbox"> -- <position>60,152</position> -+ <position>150,152</position> - </checkbox> - - <textarea name="catlabel" from="titlelabel"> -- <position>110,155</position> -+ <position>200,155</position> - <value>Show Categories</value> - </textarea> - - <checkbox name="recgroups" from="base_checkbox"> -- <position>60,202</position> -+ <position>150,202</position> - </checkbox> - - <textarea name="grouplabel" from="titlelabel"> -- <position>110,205</position> -+ <position>200,205</position> - <value>Show Recording Groups</value> - </textarea> - - <checkbox name="watchlist" from="base_checkbox"> -- <position>60,252</position> -+ <position>150,252</position> - </checkbox> - - <textarea name="watchlabel" from="titlelabel"> -- <position>110,255</position> -+ <position>200,255</position> - <value>Show Watch List</value> - </textarea> - - <checkbox name="searches" from="base_checkbox"> -- <position>60,302</position> -+ <position>150,302</position> - </checkbox> - - <textarea name="searchlabel" from="titlelabel"> -- <position>110,305</position> -+ <position>200,305</position> - <value>Show Searches</value> - </textarea> - - <checkbox name="livetv" from="base_checkbox"> -- <position>60,352</position> -+ <position>150,352</position> - </checkbox> - - <textarea name="livelabel" from="titlelabel"> -- <position>110,355</position> -+ <position>200,355</position> - <value>Show LiveTV</value> - </textarea> - -- <button name="save" from="base_medium_button"> -- <position>15,414</position> -+ <button name="save" from="base_wide_button"> -+ <position>60,440</position> - <value>Save</value> - </button> - -@@ -885,7 +885,7 @@ - </window> - - <window name="groupselector"> -- <area>-1,-1,380,463</area> -+ <area>-1,-1,602,488</area> - - <animation trigger="AboutToShow"> - <section> -@@ -902,67 +902,67 @@ - </animation> - - <shape name="group-selector-backdrop" from="base_popup_backdrop"> -- <area>0,0,380,463</area> -+ <area>0,0,602,488</area> - </shape> - - <shape name="group-selector-backdrop-line" from="base_backdrop_line"> -- <area>1,1,378,461</area> -+ <area>1,1,600,486</area> - </shape> - - <shape name="group-selector-top-line" from="base_highlight_line"> -- <area>2,2,376,2</area> -+ <area>2,2,596,2</area> - </shape> - - <shape name="group-selector-bottom-line" from="base_highlight_line"> -- <area>2,459,376,2</area> -+ <area>2,484,596,2</area> - </shape> - - <shape name="group-selector-left-line" from="base_highlight_vertical_line"> -- <area>2,4,2,455</area> -+ <area>2,4,2,480</area> - </shape> - - <shape name="group-selector-right-line" from="base_highlight_vertical_line"> -- <area>376,4,2,455</area> -+ <area>598,4,2,480</area> - </shape> - - <shape name="group-selector-seperator-first-line" from="base_line"> -- <area>23,173,334,2</area> -+ <area>23,50,552,2</area> - </shape> - - <textarea name="label" from="basetextarea"> -- <area>14,8,352,161</area> -+ <area>10,4,582,46</area> - <align>allcenter</align> - <font>basesmalldarkyellow</font> - </textarea> - - <buttonlist name="groups" from="base_button_list"> -- <area>16,189,349,264</area> -+ <area>15,76,570,398</area> - <drawfrombottom>yes</drawfrombottom> - <statetype name="buttonitem"> - <state name="active"> -- <area>0,0,349,40</area> -+ <area>0,0,100%,34</area> - <textarea name="buttontext"> -- <area>15,7,319,24</area> -+ <area>8,0,570,34</area> +--- recordings-ui.xml.orig 2014-01-02 22:23:26.659072294 +0000 ++++ recordings-ui.xml 2014-01-02 22:32:08.212500575 +0000 +@@ -579,13 +579,13 @@ + <align>allcenter</align> </textarea> - </state> - <state name="selectedactive"> -- <area>0,0,349,40</area> -+ <area>0,0,100%,34</area> - <textarea name="buttontext"> -- <area>15,7,319,24</area> -+ <area>8,0,570,34</area> + <textarea name="s00e00" from="base_text_font_state_extrasmall"> +- <area>510,42,60,20</area> ++ <area>500,42,70,20</area> + <font state="normal">baseextrasmall</font> + <cutdown>no</cutdown> + <align>allcenter</align> </textarea> - </state> - <state name="selectedinactive"> - <area>0,0,349,40</area> - <textarea name="buttontext"> -- <area>15,7,319,24</area> -+ <area>8,0,570,34</area> - </textarea> - </state> - </statetype> - <statetype name="upscrollarrow"> -- <position>0,256</position> -+ <position>0,397</position> - </statetype> - <statetype name="downscrollarrow"> -- <position>20,256</position> -+ <position>20,397</position> - </statetype> - </buttonlist> - + <textarea name="syndicatedepisode" from="base_text_font_state_extrasmall" depends="!s00e00"> +- <area>510,42,60,20</area> ++ <area>500,42,70,20</area> + <font state="normal">baseextrasmall</font> + <cutdown>no</cutdown> + <align>allcenter</align> diff --git a/abs/core/linhes-theme/schedule-ui.xml.patch b/abs/core/linhes-theme/schedule-ui.xml.patch deleted file mode 100644 index 7032a67..0000000 --- a/abs/core/linhes-theme/schedule-ui.xml.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- schedule-ui.xml.orig 2013-11-22 19:35:05.125862862 +0000 -+++ schedule-ui.xml 2013-11-25 22:17:02.323240208 +0000 -@@ -1471,7 +1471,7 @@ - - <textarea name="title_text" from="basetextarea"> - <area>10,4,480,46</area> -- <font>basemediumlargerdarkyellow</font> -+ <font>basemediumlarger</font> - <align>allcenter</align> - <value>Search Term</value> - </textarea> -@@ -1578,7 +1578,7 @@ - - <textarea name="title_text" from="basetextarea"> - <area>10,4,480,46</area> -- <font>basemediumlargerdarkyellow</font> -+ <font>basemediumlarger</font> - <align>allcenter</align> - <value>Select Search</value> - </textarea> -@@ -1681,7 +1681,7 @@ - - <textarea name="title_text" from="basetextarea"> - <area>10,4,480,46</area> -- <font>basemediumlargerdarkyellow</font> -+ <font>basemediumlarger</font> - <align>allcenter</align> - <value>Edit Power Search Fields</value> - </textarea> -@@ -3225,7 +3225,7 @@ - </window> - - <window name="schedulefiltereditor"> -- <area>-1,-1,500,500</area> -+ <area>-1,-1,602,488</area> - - <animation trigger="AboutToShow"> - <section> -@@ -3242,85 +3242,85 @@ - </animation> - - <shape name="schedule-filter-editor-backdrop" from="base_popup_backdrop"> -- <area>0,0,500,500</area> -+ <area>0,0,602,488</area> - </shape> - - <shape name="schedule-filter-editor-backdrop-line" from="base_backdrop_line"> -- <area>1,1,498,498</area> -+ <area>1,1,600,486</area> - </shape> - - <shape name="schedule-filter-editor-top-line" from="base_highlight_line"> -- <area>2,2,496,2</area> -+ <area>2,2,596,2</area> - </shape> - - <shape name="schedule-filter-editor-bottom-line" from="base_highlight_line"> -- <area>2,496,496,2</area> -+ <area>2,484,596,2</area> - </shape> - - <shape name="schedule-filter-editor-left-line" from="base_highlight_vertical_line"> -- <area>2,4,2,492</area> -+ <area>2,4,2,480</area> - </shape> - - <shape name="schedule-filter-editor-right-line" from="base_highlight_vertical_line"> -- <area>496,4,2,492</area> -+ <area>598,4,2,480</area> - </shape> - - <shape name="schedule-filter-editor-seperator-first-line" from="base_line"> -- <area>23,50,454,2</area> -+ <area>23,50,552,2</area> - </shape> - - <shape name="schedule-filter-editor-seperator-second-line" from="base_line"> -- <area>23,435,454,2</area> -+ <area>23,435,552,2</area> - </shape> - - <textarea name="title_text" from="basetextarea"> -- <area>10,4,480,46</area> -- <font>basemediumlargerdarkyellow</font> -+ <area>10,4,582,46</area> -+ <font>basemediumlarger</font> - <align>allcenter</align> - <value>Schedule Filter Editor</value> - </textarea> - - <buttonlist name="filters" from="base_button_list"> -- <area>20,75,460,360</area> -+ <area>15,60,570,360</area> - <statetype name="buttonitem"> - <state name="active"> -- <area>0,0,460,40</area> -+ <area>0,0,100%,34</area> - <textarea name="buttontext"> -- <area>40,0,380,40</area> -+ <area>40,0,490,34</area> - </textarea> - <statetype name="buttoncheck"> -- <position>15,10</position> -+ <position>15,7</position> - </statetype> - </state> - <state name="selectedactive"> -- <area>0,0,460,40</area> -+ <area>0,0,100%,34</area> - <textarea name="buttontext"> -- <area>40,0,380,40</area> -+ <area>40,0,490,34</area> - </textarea> - <statetype name="buttoncheck"> -- <position>15,10</position> -+ <position>15,7</position> - </statetype> - </state> - <state name="selectedinactive"> -- <area>0,0,460,40</area> -+ <area>0,0,100%,34</area> - <textarea name="buttontext"> -- <area>40,0,380,40</area> -+ <area>40,0,490,34</area> - </textarea> - <statetype name="buttoncheck"> -- <position>15,10</position> -+ <position>15,7</position> - </statetype> - </state> - </statetype> - <statetype name="upscrollarrow"> -- <position>0,343</position> -+ <position>0,359</position> - </statetype> - <statetype name="downscrollarrow"> -- <position>20,343</position> -+ <position>20,359</position> - </statetype> - </buttonlist> - -- <button name="back" from="base_medium_button"> -- <position>75,447</position> -+ <button name="back" from="base_wide_button"> -+ <position>60,440</position> - <value>Back</value> - </button> - diff --git a/abs/core/linhes-theme/video-ui.xml.patch b/abs/core/linhes-theme/video-ui.xml.patch deleted file mode 100644 index 55fb750..0000000 --- a/abs/core/linhes-theme/video-ui.xml.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- video-ui.xml.orig 2013-12-10 21:58:00.909431846 +0000 -+++ video-ui.xml 2013-12-10 21:57:48.940952773 +0000 -@@ -3116,15 +3116,15 @@ - <preserveaspect>false</preserveaspect> - </imagetype> - -- <button name="done_button" from="base_wide_button"> -- <area>25,443,390,40</area> -+ <button name="done_button" from="base_medium_button"> -+ <area>50,443,350,40</area> - <statetype name="buttonstate"> - <state name="active"> - <shape name="background" from="base_button_background_active"> -- <area>0,0,390,40</area> -+ <area>0,0,350,40</area> - </shape> - <textarea name="buttontext"> -- <area>10,5,370,30</area> -+ <area>10,5,330,30</area> - <align>allcenter</align> - <font>basesmall</font> - <value>Done</value> -@@ -3132,21 +3132,21 @@ - </state> - <state name="selected" from="active"> - <shape name="background" from="base_button_background_selected"> -- <area>0,0,390,40</area> -+ <area>0,0,350,40</area> - </shape> - </state> - </statetype> - </button> - -- <button name="play_button" from="base_wide_button"> -- <area>435,443,390,40</area> -+ <button name="play_button" from="base_medium_button"> -+ <area>450,443,350,40</area> - <statetype name="buttonstate"> - <state name="active"> - <shape name="background" from="base_button_background_active"> -- <area>0,0,390,40</area> -+ <area>0,0,350,40</area> - </shape> - <textarea name="buttontext"> -- <area>10,5,370,30</area> -+ <area>10,5,330,30</area> - <align>allcenter</align> - <font>basesmall</font> - <value>Play</value> -@@ -3154,7 +3154,7 @@ - </state> - <state name="selected" from="active"> - <shape name="background" from="base_button_background_selected"> -- <area>0,0,390,40</area> -+ <area>0,0,350,40</area> - </shape> - </state> - </statetype> diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index 9e18549..5a64034 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall pkgver=8.1 -pkgrel=6 +pkgrel=7 pkgdesc="LinHES installer/systemconfig GUI." arch=('i686' 'x86_64') depends=('mythtv>=0.27') diff --git a/abs/core/mythtv/stable-0.27/git_src/checkout_mythtv.sh b/abs/core/mythtv/stable-0.27/git_src/checkout_mythtv.sh index f0fc6bd..bddd133 100755 --- a/abs/core/mythtv/stable-0.27/git_src/checkout_mythtv.sh +++ b/abs/core/mythtv/stable-0.27/git_src/checkout_mythtv.sh @@ -20,6 +20,7 @@ then git checkout $_gitbranch git pull echo "The local files are updated." + cd $startdir else git clone -b $_gitbranch $_gitroot fi @@ -33,8 +34,7 @@ then else git checkout $_checkoutHASH fi - pwd - ls + cd mythtv sh ./version.sh `pwd` fi echo "GIT checkout done or server timeout" diff --git a/abs/core/mythtv/stable-0.27/git_src/checkout_mythweb.sh b/abs/core/mythtv/stable-0.27/git_src/checkout_mythweb.sh index bec4829..0027f6d 100755 --- a/abs/core/mythtv/stable-0.27/git_src/checkout_mythweb.sh +++ b/abs/core/mythtv/stable-0.27/git_src/checkout_mythweb.sh @@ -20,6 +20,7 @@ then git checkout $_gitbranch git pull echo "The local files are updated." + cd $startdir else git clone -b $_gitbranch $_gitroot fi @@ -33,7 +34,5 @@ then else git checkout $_checkoutHASH fi - pwd - ls fi echo "GIT checkout done or server timeout" diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index fd8badd..76debbd 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -39171be37ab8d63f0f44e5dbd5a78ca6893ceafa +7f548de029ed84870538c87193b8b9f650cf0c5a diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 8fe13bb..8a651cd 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,11 +9,11 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27 -pkgrel=7 +pkgrel=9 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') -makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif' +makedepends=('cdrkit' 'dcraw' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif' 'libvorbis' 'mesa' 'libgl' 'mplayer' "mythtv>=${pkgver}" 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' 'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' @@ -61,7 +61,7 @@ package_mythbrowser() { package_mythgallery() { pkgdesc="Image gallery plugin for MythTV" - depends=('libexif' "mythtv>=${pkgver}") + depends=('libexif' "mythtv>=${pkgver}" 'dcraw') cd "${srcdir}/${_gitname}/${pkgbase}/mythgallery" make INSTALL_ROOT="${pkgdir}" install || return 1 } diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 9a7e954..973fed4 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27 -pkgrel=7 +pkgrel=9 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -54,6 +54,7 @@ build() { msg "Configuring mythtv" ARCH=${CARCH/_/-} + #disable mythlogserver due to http://code.mythtv.org/trac/ticket/11230 ./configure --prefix=/usr \ --cpu=${ARCH} \ --disable-altivec \ @@ -61,6 +62,7 @@ build() { --disable-audio-pulse \ --disable-ccache \ --disable-distcc \ + --disable-mythlogserver \ --dvb-path=/usr/include \ --enable-libfftw3 \ --enable-libmp3lame \ diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/is.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/is.xml index 88b7e6b..19efc34 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/is.xml +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/is.xml @@ -1,3 +1,3 @@ -<mythmenu name="Internet Steams"> +<mythmenu name="INTERNET_STREAMS"> </mythmenu> diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml index b661b23..8f8cc9f 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml @@ -1,4 +1,4 @@ -<mythmenu name="LinHES"> +<mythmenu name="LH_SERVICE_MENU"> <button> <type>SETUP_GENERAL</type> diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythbackup.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythbackup.xml index 61dc4d3..176591b 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythbackup.xml +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythbackup.xml @@ -1,4 +1,4 @@ -<mythmenu name="LinHES"> +<mythmenu name="LH_BACKUP"> <button> <type>BACKUP</type> <text>Backup Now?</text> diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml index c4025c5..af38ba7 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml @@ -1,9 +1,9 @@ -<mythmenu name="LinHES"> +<mythmenu name="LH_RESTORE"> <button> <type>RESTORE</type> <text>Restore Now?</text> - <description>This will restore from the most recent backup.</description> + <description>Restore the database from the most recent backup.</description> <action>NONE</action> </button> diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml index 802774b..2d47e7d 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml @@ -1,4 +1,4 @@ -<mythmenu name="LinHES"> +<mythmenu name="LH_UPDATE"> <button> <type>JUMP Reload Theme</type> diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml index ed527fd..4eee8cc 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml @@ -1,10 +1,11 @@ -<mythmenu name="LinHES"> +<mythmenu name="LH_UPDATE"> <button> <type>UPGRADE</type> <text>Install Updates</text> <description>Install updates for the LinHES system</description> <action>EXEC sudo /usr/LH/bin/linhes_update2.sh install</action> + <action>JUMP Reload Theme</action> </button> <button> diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 9857b4a..68ccd2f 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=8.1 -pkgrel=5 +pkgrel=7 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/remotes/run b/abs/core/runit-scripts/runitscripts/services/remotes/run index 4040d7e..19c6375 100755 --- a/abs/core/runit-scripts/runitscripts/services/remotes/run +++ b/abs/core/runit-scripts/runitscripts/services/remotes/run @@ -14,6 +14,10 @@ fi echo "`date` --- run started" >> $LOG +echo "====== lirc modules already loaded ==========" >> $LOG +lsmod |grep lirc >> $LOG +echo "====== lirc modules end =========" >> $LOG +echo >> $LOG #What is done in this file may not be enough to start your specific remote. #If that is true of your remote place your remote startup commands in: # /etc/runit/lirc.sh @@ -47,29 +51,58 @@ else if [ -n "$serial_port" ] then + echo "Serial device setup: $serial_port" >>$LOG #/dev/ttyS0 (COM1), port 0x3f8, irq 4 #/dev/ttyS1 (COM2), port 0x2f8, irq 3 #/dev/ttyS2 (COM3), port 0x3e8, irq 4 #/dev/ttyS3 (COM4), port 0x2e8, irq 3 - + printhl " Using serial device, loading module lirc_serial" case $serial_port in ttyS0) - FLAGS="io=0x3f8 irq=4" + FLAGS="io=0x3f8 irq=4 debug=1 " ;; ttyS1) - FLAGS="io=0x2f8 irq=3" + FLAGS="io=0x2f8 irq=3 debug=1" ;; ttyS2) - FLAGS="io=0x3e8 irq=4" + FLAGS="io=0x3e8 irq=4 debug=1" ;; ttyS3) - FLAGS="io=0x2e8 irq=3" + FLAGS="io=0x2e8 irq=3 debug=1" ;; esac - /usr/bin/setserial /dev/$serial_port uart none - sleep 0.5 - /sbin/modprobe lirc_serial $FLAGS - sleep 0.5 + + #set_serial debugging + /usr/bin/setserial -va /dev/$serial_port 2>&1 >> $LOG + echo '' 2>&1 >> $LOG + + #run set_serial command + /usr/bin/setserial -v /dev/$serial_port uart none 2>&1 >> $LOG + echo '' 2>&1 >> $LOG + + #set_serial debugging + /usr/bin/setserial -va /dev/$serial_port 2>&1 >> $LOG + sleep 1 + + #remove lirc_serial + echo "*Removing lirc_serial" 2>&1 >> $LOG + /usr/bin/rmmod -v lirc_serial 2>> $LOG + /usr/bin/rmmod -v lirc_dev 2>> $LOG + + echo "*Loading lirc_serial" 2>&1 >> $LOG + echo "/sbin/modprobe lirc_serial $FLAGS" 2>&1 >> $LOG + /sbin/modprobe -v lirc_serial $FLAGS 2>&1 >> $LOG + + echo "====== lirc modules after load ==========" >> $LOG + lsmod |grep lirc >> $LOG + echo "====== lirc modules end =========" >> $LOG + + sleep 1 + + echo "====== dmesg output ============" >>$LOG + dmesg | tail -20 >> $LOG + echo "======= dmesg end ===========" >>$LOG + fi if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ] @@ -201,6 +234,10 @@ else echo $LASTCMD >>$LOG echo "Disable in kernel remote driver" >>$LOG in_kernel_support "disable" + + + + echo "Starting remotes from $LCMD" >>$LOG exec $LCMD >>$LOG 2>>$LOG diff --git a/abs/extra/dcraw/PKGBUILD b/abs/extra/dcraw/PKGBUILD index 9c2571b..c9228bd 100644 --- a/abs/extra/dcraw/PKGBUILD +++ b/abs/extra/dcraw/PKGBUILD @@ -1,48 +1,42 @@ -# $Id: PKGBUILD 162767 2012-06-29 22:10:56Z eric $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id$ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=dcraw -pkgver=9.15 +pkgver=9.19 pkgrel=1 -pkgdesc="A command line based converter for digicams raw output" +pkgdesc='Decodes any raw image from any digital camera' +url='http://www.cybercom.net/~dcoffin/dcraw/' arch=('i686' 'x86_64') -url="http://www.cybercom.net/~dcoffin/dcraw/" license=('custom') depends=('lcms' 'jasper') -source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz - license.txt) -sha1sums=('0b06047603640fe19b5d3b2461319d6ba22eee6a' - '502c8f0ac7434d48f5dcb2eefe7599627cb69454') +source=("http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz") +sha1sums=('83a85200b0f105a40d23e885f5108bc3b53bdbe4') build() { - cd "${srcdir}/${pkgname}" - gcc ${CFLAGS} -O3 -o dcraw dcraw.c \ - -Wall -Wno-unused-result -Wno-array-bounds \ - -lm -ljasper -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\" + cd "${srcdir}/${pkgname}" + gcc ${CFLAGS} ${LDFLAGS} \ + -o dcraw dcraw.c \ + -lm -ljasper -ljpeg -llcms \ + -DLOCALEDIR=\"/usr/share/locale/\" } package() { - cd "${srcdir}/${pkgname}" - install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw - install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1 - - for langchar in \ - fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 nl.latin1 sv.latin1 \ - ca.latin1 da.latin1 cs.latin2 hu.latin2 pl.latin2 eo.latin3 ru.koi8-r \ - zh_TW.big5 zh_CN.gb2312 - do - lang=$(echo $langchar | cut -d. -f1) - char=$(echo $langchar | cut -d. -f2-) - if [ -f dcraw_${lang}.1 ]; then - mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang/man1 - iconv -f utf-8 -t $char dcraw_$lang.1 > "${pkgdir}"/usr/share/man/$lang/man1/dcraw.1 - mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1 - cp dcraw_$lang.1 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1/dcraw.1 - fi - mkdir -p -m 755 "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES - msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po - done + cd "${srcdir}/${pkgname}" - install -Dm644 "${srcdir}/license.txt" "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt + install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw + install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1 + + for i in dcraw_*.1; do j=${i#dcraw_}; k=${j%.1} + install -Dm644 $i "${pkgdir}"/usr/share/man/$k/man1/dcraw.1 + done + + for i in dcraw_*.po; do j=${i#dcraw_}; k=${j%.po} + install -d "${pkgdir}"/usr/share/locale/$k/LC_MESSAGES + msgfmt -o "${pkgdir}"/usr/share/locale/$k/LC_MESSAGES/dcraw.mo $i + done + + install -d "${pkgdir}"/usr/share/licenses/${pkgname} + head -25 dcraw.c > "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt } diff --git a/abs/extra/dcraw/license.txt b/abs/extra/dcraw/license.txt deleted file mode 100644 index 5803cf6..0000000 --- a/abs/extra/dcraw/license.txt +++ /dev/null @@ -1,16 +0,0 @@ -This is a command-line ANSI C program to convert raw photos from -any digital camera on any computer running any operating system. - -No license is required to download and use dcraw.c. However, -to lawfully redistribute this code, you must either (a) include -full source code* for all executable files containing RESTRICTED -functions, (b) remove all RESTRICTED functions, re-implement them, -or copy them from an earlier, unrestricted Revision of dcraw.c, -or (c) purchase a license from the author. - -The functions that process Foveon images have been RESTRICTED -since Revision 1.237. All other code remains free for all uses. - -*If you have not modified dcraw.c in any way, a link to my -homepage qualifies as "full source code". - |
