From 6368e500e3d5e1a535e519f18c4afab702f3a1bb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 26 Dec 2013 16:55:37 -0600 Subject: dcraw: update to 9.19 --- abs/extra/dcraw/PKGBUILD | 62 ++++++++++++++++++++------------------------- abs/extra/dcraw/license.txt | 16 ------------ 2 files changed, 28 insertions(+), 50 deletions(-) delete mode 100644 abs/extra/dcraw/license.txt 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 +# $Id$ +# Maintainer: Gaetan Bisson +# Contributor: tobias # Contributor: Tobias Kieslich 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". - -- cgit v0.12 From 15d5058bbe99f3046f81206723b8a57a5e4305f9 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 26 Dec 2013 17:15:54 -0600 Subject: mythtv, mythplugins, mythinstall: update to latest.27 fixes disable mythlogserver and add dclaw as dep for mythgallery to support raw images. --- abs/core/mythinstall/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/git_src/checkout_mythtv.sh | 4 ++-- abs/core/mythtv/stable-0.27/git_src/checkout_mythweb.sh | 3 +-- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 6 +++--- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 4 +++- 6 files changed, 11 insertions(+), 10 deletions(-) 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..77961eb 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 +d96506156c2b200d3c6658e578d7b7fbd4014bad diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 8fe13bb..4f1c6ca 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=8 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..e4c1e0d 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=8 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 \ -- cgit v0.12 From 912e7ca6626505c47c3c582efb74ff26bc418a37 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 27 Dec 2013 10:58:21 -0600 Subject: runit-scrips , mv_ir: remove loading of lirc_serial by modules.mythvantage, the run script takes care of loading with the correct values. Add more debugging to remotes log refs #950 --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/mv_ir.py | 5 +++-- abs/core/runit-scripts/PKGBUILD | 2 +- .../runitscripts/services/remotes/run | 25 ++++++++++++++++------ 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 75b93a2..5ca210b 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=9 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' @@ -159,7 +159,7 @@ md5sums=('8ee14247b04ab4152d4919d4d4b8d869' 'c0549457750c4f8e8038d904a0f3012a' '075fe16ef92621ce31f41df5c5577daf' 'b845de3e05c1734cce4b9ac5e8f1baaf' - '31ad5416bf2ab1909338a16035941127' + '6356c271bf6639002d4c59406250a1f6' '8b7dce4a3a0a281fa6656aa8781a648e' 'f7f2dc11d1ba454cd25eeaa133104b62' '824e49d9b01fed295c704ab68908b464' 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/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 9857b4a..b1240ab 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=6 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..2363a3a 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,36 @@ 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 + + /usr/bin/setserial /dev/$serial_port uart none 2>&1 >> $LOG sleep 0.5 - /sbin/modprobe lirc_serial $FLAGS + echo "/sbin/modprobe lirc_serial $FLAGS" 2>&1 >> $LOG + /sbin/modprobe lirc_serial $FLAGS 2>&1 >> $LOG sleep 0.5 + echo "====== dmesg output ============" >>$LOG + dmesg | tail -10 >> $LOG + echo "======= dmesg end ===========" >>$LOG + fi if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ] -- cgit v0.12 From c0973e515e82c694822f44c252bd9308c48e8395 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 30 Dec 2013 12:27:08 -0600 Subject: runit-scripts: remotes, add more debugging and unload lirc_serial before load refs #950 --- abs/core/runit-scripts/PKGBUILD | 2 +- .../runitscripts/services/remotes/run | 38 ++++++++++++++++++---- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index b1240ab..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=6 +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 2363a3a..19c6375 100755 --- a/abs/core/runit-scripts/runitscripts/services/remotes/run +++ b/abs/core/runit-scripts/runitscripts/services/remotes/run @@ -72,13 +72,35 @@ else ;; esac - /usr/bin/setserial /dev/$serial_port uart none 2>&1 >> $LOG - sleep 0.5 - echo "/sbin/modprobe lirc_serial $FLAGS" 2>&1 >> $LOG - /sbin/modprobe lirc_serial $FLAGS 2>&1 >> $LOG - 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 -10 >> $LOG + dmesg | tail -20 >> $LOG echo "======= dmesg end ===========" >>$LOG fi @@ -212,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 -- cgit v0.12 From 79cb0661623c5f6ca9f9edf0a01f99de5640e99e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 2 Jan 2014 21:45:55 +0000 Subject: linhes-theme: pull in updates from upstream --- abs/core/linhes-theme/PKGBUILD | 34 ++- abs/core/linhes-theme/background-with-logo.png | Bin 0 -> 821488 bytes abs/core/linhes-theme/background.png | Bin 821488 -> 781602 bytes abs/core/linhes-theme/base.xml.patch | 275 +-------------------- abs/core/linhes-theme/menu-ui-vert.xml.patch | 177 +++++-------- abs/core/linhes-theme/osd.xml.patch | 61 +---- abs/core/linhes-theme/qt-background.png | Bin 781602 -> 0 bytes abs/core/linhes-theme/qtlook.txt.patch | 11 + .../mythtv/stable-0.27/mythtv/menu-xml/linhes.xml | 2 +- .../stable-0.27/mythtv/menu-xml/mythbackup.xml | 2 +- .../stable-0.27/mythtv/menu-xml/mythrestore.xml | 4 +- .../mythtv/stable-0.27/mythtv/menu-xml/update.xml | 2 +- .../mythtv/stable-0.27/mythtv/menu-xml/update2.xml | 3 +- 13 files changed, 110 insertions(+), 461 deletions(-) create mode 100644 abs/core/linhes-theme/background-with-logo.png delete mode 100644 abs/core/linhes-theme/qt-background.png create mode 100644 abs/core/linhes-theme/qtlook.txt.patch diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index fb894fb..5a11a8e 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=16 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' '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' + 'LHLogo.png') package() { THEMEROOT=usr/share/mythtv/themes @@ -37,12 +36,12 @@ 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/LHLogo.png $pkgdir/$THEMEROOT/LinHES/images/ msg "Modifying yellows and blue to LinHES yellow and blue" #yellow @@ -54,18 +53,13 @@ package() { } md5sums=('SKIP' '9c2fc68864cbedb6e449056972b457aa' - 'e061490fc869e0e14d4e144c17c3ec56' - 'e7af3675fc706a7cb4ea9d0c321219d5' - '9e4fcf840f14c6f17f30432e28edd885' - '33609e27406f00bdc0243a5ef840c6f9' - 'aff82cf901edc4baa058013d93610cfc' - 'e502da82e6d76b3f43dd7ddc20c1e2e7' - '78b64e567cd799df52045d9fc5a59cc0' + 'ed4f8baf431e20babc345e4e2602426f' + '9c2c8f2a8d881e01ea84457ae508f655' + '74a66e91f7d329d297c749a8827f5c0a' + '9fe3371a8b964a7028126405cfaa330b' '7d7bc458a8f4af408700609f3e1f412e' 'a0201e0aa1608eeab27ee754e4d2c1de' - 'cbe5f663ebb5d51abe811f81dafec303' - '4b1c27297bb5f8d9d7bbaf72b35130b5' '12d26a786fde397348653128a6d7676a' + '4b1c27297bb5f8d9d7bbaf72b35130b5' '2bd09b8049aaf5ba21db5baf3a0ce077' - 'b51ef0cbf8ed2d3a8c1a8257a89aceff' - '09ad14842f828b7a8d24070ec8214fe5') + 'b51ef0cbf8ed2d3a8c1a8257a89aceff') diff --git a/abs/core/linhes-theme/background-with-logo.png b/abs/core/linhes-theme/background-with-logo.png new file mode 100644 index 0000000..ffdf9ef Binary files /dev/null and b/abs/core/linhes-theme/background-with-logo.png differ diff --git a/abs/core/linhes-theme/background.png b/abs/core/linhes-theme/background.png index ffdf9ef..12544b2 100644 Binary files a/abs/core/linhes-theme/background.png and b/abs/core/linhes-theme/background.png differ 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 @@ -- -+ +- ++ - - 0,0,1280,720 - -- 500,-7,280,32 -+ 485,-7,310,32 - - -- 500,-7,280,32 -+ 485,-7,310,32 - - -- 501,0,2,22 -+ 486,0,2,22 - - -- 777,0,2,22 -+ 792,0,2,22 - - -- 501,22,278,2 -+ 486,22,308,2 - - - -@@ -452,7 +452,7 @@ - 0,0,1280,720 - - 0,0,1280,720 -- images/backgrounds/background.png -+ images/backgrounds/qt-background.png - - - 0,0,1280,720 -@@ -463,25 +463,25 @@ - - - -- 500,695,280,32 -+ 485,695,310,32 - - -- 500,695,280,32 -+ 485,695,310,32 - - -- 501,696,278,2 -+ 486,696,308,2 - - -- 501,698,2,22 -+ 486,698,2,22 - - -- 777,698,2,22 -+ 792,698,2,22 - - - - - -- 529,698,219,22 -+ 494,698,292,22 - baseextrasmall - - allcenter -@@ -533,19 +533,19 @@ - - - -- -+ - - - - - -- -- -+ -+ - - - - -- -+ - - - -@@ -563,7 +563,7 @@ - - - -- -+ - - - -@@ -571,6 +571,7 @@ - - vertical - 2 -+ selection - yes - 0,0,100%,100% - -@@ -579,7 +580,7 @@ - 0,0,100%,100% - - -@@ -997,7 +998,7 @@ - - 0,0,100%,100% - roundbox -- -+ - - 90 - -@@ -1064,7 +1065,7 @@ - - 0,0,100%,100% - roundbox -- -+ - - 90 - -@@ -1117,7 +1118,7 @@ - - 0,0,100%,100% - roundbox -- -+ - - 90 - -@@ -1228,22 +1229,20 @@ - - - 0,0,1280,720 -- images/backgrounds/background.png -+ images/backgrounds/qt-background.png - - - - - - -- -- 529,698,219,22 -- -+ - - - - - -- -1,-1,400,463 -+ -1,-1,602,488 - - -
-@@ -1260,76 +1259,76 @@ - - - -- 0,0,400,463 -+ 0,0,602,488 - - - -- 1,1,398,461 -+ 1,1,600,486 - - - -- 2,2,396,2 -+ 2,2,596,2 - - - -- 23,174,354,2 -+ 23,212,552,2 - - - -- 2,459,396,2 -+ 2,484,596,2 - - - -- 2,4,2,455 -+ 2,4,2,480 - - - -- 396,4,2,455 -+ 598,4,2,480 - - - - - -- 15,191,370,264 -+ 15,222,570,252 - - -- 0,0,370,40 -+ 0,0,100%,34 - - -- 347,11 -+ 544,8 - - - -- 0,0,370,40 -+ 0,0,100%,34 - - -- 347,11 -+ 544,8 - - - -- 0,0,370,40 -+ 0,0,100%,34 - - -- 347,11 -+ 544,8 - - - - -- 0,255 -+ 0,251 - - -- 20,255 -+ 20,251 - - - diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch index fdff21e..411dd6a 100644 --- a/abs/core/linhes-theme/menu-ui-vert.xml.patch +++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch @@ -1,33 +1,14 @@ ---- 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 @@ - - - -+ 0,0,1280,720 - - - - -- 0,525,1280,70 -+ 35,0,310,720 - box - - -- -- 0,526,1280,2 -+ -+ 36,0,2,1280 - - -- -- 0,592,1280,2 -+ -+ 342,0,2,1280 +--- menu-ui-vert.xml.orig 2014-01-02 20:22:20.736627009 +0000 ++++ menu-ui-vert.xml 2014-01-02 21:08:40.596758246 +0000 +@@ -18,6 +18,24 @@ + 394,0,2,720 ++ ++ 567,165,487,210 ++ images/tux_thoughts.png ++ ++ + + -+ -+ 567,165,487,210 -+ images/tux_thoughts.png -+ -+ + + 492,348,638,207 + images/LHLogoAndText.png + + - true - -@@ -110,7 +129,7 @@ - Manage Recordings + + -- -+ - -@@ -135,18 +154,20 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ -- 20,528,1240,64 -- horizontal -- 20 -- center -- items -- 0,0,1240,64 -+ 35,62,310,596 -+ vertical -+ 4 -+ free -+ selection -+ Stack -+ vcenter -+ 0,0,100%,100% - - -- 0,0,232,64 -+ 0,0,310,64 - - - - -- 0,0,232,64 -- -+ -10,0,330,64 -+ -+ 0,0,100%,100% -+ -+ - +- +- 330,12,843,40 +- 252,40 +- +- 0,0,-1,-1 +- 252,40 +- +- +- -+ -+ 147,0 -+ yes -+ -+ -+ images/lists_up_arrow.png -+ 200 -+ -+ -+ -+ -+ 147,588 -+ yes -+ -+ -+ images/lists_down_arrow.png -+ 200 -+ -+ -+ -+ - - - + 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 @@ - 90,658,1100,24 - small - allcenter -- -+ - - - -@@ -980,6 +981,12 @@ - allcenter - - -+ -+ - - 84,536,130,98 - true -@@ -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 @@ @@ -31,36 +8,10 @@ + 70,492,158,186 -- 225 -+ 255 + 255 ---> -- - ++ + 257,490,937,28 diff --git a/abs/core/linhes-theme/qt-background.png b/abs/core/linhes-theme/qt-background.png deleted file mode 100644 index 12544b2..0000000 Binary files a/abs/core/linhes-theme/qt-background.png and /dev/null differ 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/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 @@ - + 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 @@ - + - -@@ -885,7 +885,7 @@ - - - -- -1,-1,380,463 -+ -1,-1,602,488 - - -
-@@ -902,67 +902,67 @@ - - - -- 0,0,380,463 -+ 0,0,602,488 - - - -- 1,1,378,461 -+ 1,1,600,486 - - - -- 2,2,376,2 -+ 2,2,596,2 - - - -- 2,459,376,2 -+ 2,484,596,2 - - - -- 2,4,2,455 -+ 2,4,2,480 - - - -- 376,4,2,455 -+ 598,4,2,480 - - - -- 23,173,334,2 -+ 23,50,552,2 - - - - - -- 16,189,349,264 -+ 15,76,570,398 - yes - - -- 0,0,349,40 -+ 0,0,100%,34 - - - -- 0,0,349,40 -+ 0,0,100%,34 - - - - 0,0,349,40 - - - - -- 0,256 -+ 0,397 - - -- 20,256 -+ 20,397 - - - + -+ -+ -+ -+ -+ 40,65,580,550 -+ -+ -+ -+ 41,66,578,548 -+ -+ -+ -+ 42,67,576,2 -+ -+ -+ -+ 42,613,576,2 -+ -+ -+ -+ 42,69,2,544 -+ -+ -+ -+ 616,69,2,544 -+ -+ -+ -+ 48,615,50,12 -+ -+ -+ -+ 50,78,560,530 -+ center -+ -+ -+ 0,0,100%,55 -+ -+ 0,0,100%,100% -+ -+ -+ 5,7,60,40 -+ -+ -+ -+ -+ -+ -+ -+ 0,0,100%,100% -+ -+ -+ -+ -+ -+ -+ 0,0,100%,100% -+ -+ -+ -+ -+ 5,539 -+ -+ -+ 25,539 -+ -+ Select the country where you reside. -+ -+ -+ -+ -+ -+ 660,65,580,550 -+ -+ -+ -+ 661,66,578,548 -+ -+ -+ -+ 662,67,576,2 -+ -+ -+ -+ 662,613,576,2 -+ -+ -+ -+ 662,69,2,544 -+ -+ -+ -+ 1236,69,2,544 -+ -+ -+ -+ 668,615,50,12 -+ -+ -+ -+ 670,78,560,530 -+ -+ -+ 0,0,100%,55 -+ -+ -+ -+ -+ -+ -+ 0,0,100%,100% -+ -+ -+ -+ -+ -+ -+ 0,0,100%,100% -+ -+ -+ -+ Select your language. -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - 0,0,1280,720 - 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 @@ - - - -- 0,525,1280,70 -+ 0,94,1280,70 - box - - - -- 0,526,1280,2 -+ 0,95,1280,2 - - - -- 0,592,1280,2 -+ 0,161,1280,2 - - - -@@ -135,7 +135,7 @@ - - - -- 20,528,1240,64 -+ 20,98,1240,64 - horizontal - 20 - center -@@ -157,6 +157,14 @@ - - 0,0,232,64 - -+ -+ -+ -10,-2,2,66 -+ -+ -+ 240,-2,2,66 -+ -+ - -+ -+ -+ -100,100,410,180 -+ images/tux_thoughts.png -+ -+ -+ -+ - - - diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch index 411dd6a..4cfd697 100644 --- a/abs/core/linhes-theme/menu-ui-vert.xml.patch +++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch @@ -1,16 +1,16 @@ --- menu-ui-vert.xml.orig 2014-01-02 20:22:20.736627009 +0000 -+++ menu-ui-vert.xml 2014-01-02 21:08:40.596758246 +0000 ++++ menu-ui-vert.xml 2014-01-03 20:45:31.091048579 +0000 @@ -18,6 +18,24 @@ 394,0,2,720 + -+ 567,165,487,210 ++ 594,165,487,210 + images/tux_thoughts.png + + + + + -+ 492,348,638,207 ++ 519,348,638,207 + images/LHLogoAndText.png + + 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 @@ - - -@@ -1578,7 +1578,7 @@ - - -@@ -1681,7 +1681,7 @@ - - -@@ -3225,7 +3225,7 @@ - - - -- -1,-1,500,500 -+ -1,-1,602,488 - - -
-@@ -3242,85 +3242,85 @@ - - - -- 0,0,500,500 -+ 0,0,602,488 - - - -- 1,1,498,498 -+ 1,1,600,486 - - - -- 2,2,496,2 -+ 2,2,596,2 - - - -- 2,496,496,2 -+ 2,484,596,2 - - - -- 2,4,2,492 -+ 2,4,2,480 - - - -- 496,4,2,492 -+ 598,4,2,480 - - - -- 23,50,454,2 -+ 23,50,552,2 - - - -- 23,435,454,2 -+ 23,435,552,2 - - - - - -- 20,75,460,360 -+ 15,60,570,360 - - -- 0,0,460,40 -+ 0,0,100%,34 - - -- 15,10 -+ 15,7 - - - -- 0,0,460,40 -+ 0,0,100%,34 - - -- 15,10 -+ 15,7 - - - -- 0,0,460,40 -+ 0,0,100%,34 - - -- 15,10 -+ 15,7 - - - - -- 0,343 -+ 0,359 - - -- 20,343 -+ 20,359 - - - -- - 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 @@ - false - - --