From eb1b08fe37ff143fd212e844e1dee22c24c1df8b Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Tue, 1 May 2012 23:40:44 +0000 Subject: boost: upgrade to 1.49. Dep of mkvtoolnix. --- abs/extra/boost/PKGBUILD | 12 +++++++++--- abs/extra/boost/exceptions.patch | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 abs/extra/boost/exceptions.patch diff --git a/abs/extra/boost/PKGBUILD b/abs/extra/boost/PKGBUILD index 37bb2de..f9502a9 100644 --- a/abs/extra/boost/PKGBUILD +++ b/abs/extra/boost/PKGBUILD @@ -6,13 +6,14 @@ pkgbase=boost pkgname=('boost-libs' 'boost') -pkgver=1.47.0 +pkgver=1.49.0 _boostver=${pkgver//./_} pkgrel=1 arch=('i686' 'x86_64') url="http://www.boost.org/" makedepends=('icu' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz + exceptions.patch) license=('custom') _stagedir="${srcdir}/stagedir" @@ -24,6 +25,10 @@ build() { #echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam echo "using mpi ;" >> build/v2/user-config.jam + cd "${srcdir}"/${pkgbase}_${_boostver} + # https://svn.boost.org/trac/boost/ticket/5731 + patch -p0 -i "${srcdir}/exceptions.patch" + # build bjam cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" ./build.sh cc @@ -106,4 +111,5 @@ package_boost-libs() { install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt } -md5sums=('ff180a5276bec773a7625cac7e2288e8') +md5sums=('e0defc8c818e4f1c5bbb29d0292b76ca' + 'bedd276510b6ad1ff2b4d143de21373e') diff --git a/abs/extra/boost/exceptions.patch b/abs/extra/boost/exceptions.patch new file mode 100644 index 0000000..0322db6 --- /dev/null +++ b/abs/extra/boost/exceptions.patch @@ -0,0 +1,25 @@ +diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp +--- boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200 ++++ boost/numeric/conversion/converter_policies.hpp 2011-07-22 11:46:40.961876274 +0200 +@@ -20,6 +20,7 @@ + + #include "boost/mpl/if.hpp" + #include "boost/mpl/integral_c.hpp" ++#include "boost/throw_exception.hpp" + + namespace boost { namespace numeric + { +@@ -159,9 +160,9 @@ struct def_overflow_handler + void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow) + { + if ( r == cNegOverflow ) +- throw negative_overflow() ; ++ boost::throw_exception( negative_overflow() ) ; + else if ( r == cPosOverflow ) +- throw positive_overflow() ; ++ boost::throw_exception( positive_overflow() ) ; + } + } ; + + +Diff finished. Fri Jul 22 11:46:49 2011 -- cgit v0.12 From d8d48ec69ab59d7d8f0e17fd978b058e845ba71a Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Tue, 1 May 2012 23:54:07 +0000 Subject: mkvtoolnix: Add note to PKGBUILD re: gcc v4.6.0 --- abs/extra/mkvtoolnix/PKGBUILD | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/abs/extra/mkvtoolnix/PKGBUILD b/abs/extra/mkvtoolnix/PKGBUILD index f77ecd6..fb275a2 100644 --- a/abs/extra/mkvtoolnix/PKGBUILD +++ b/abs/extra/mkvtoolnix/PKGBUILD @@ -2,6 +2,11 @@ # Maintainer: Giovanni Scafora # Contributor: 03/08/04 +## +## NOTE!!! Newer versions of mkvtoolnix requires gcc v4.6.0+ !!! +## + + pkgname=mkvtoolnix pkgver=5.0.1 pkgrel=1 @@ -24,4 +29,4 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} ./drake DESTDIR=${pkgdir} install } -md5sums=('93fbbe946de6013eca699c0c2a93a4e9') +md5sums=('2cd84ff24e1d9217dd3caf170f34e758') -- cgit v0.12 From d910c2a8c16736475693f0c109ccfe298385009e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 1 May 2012 20:39:30 -0500 Subject: linux-firmware: update to 20120227 and replace v4l-cx23885-enc.fw with correct file. --- abs/core/linux-firmware/PKGBUILD | 44 ++++++++--------------------- abs/core/linux-firmware/__changelog | 1 + abs/core/linux-firmware/v4l-cx23885-enc.fw | Bin 0 -> 376836 bytes 3 files changed, 13 insertions(+), 32 deletions(-) create mode 100644 abs/core/linux-firmware/__changelog create mode 100644 abs/core/linux-firmware/v4l-cx23885-enc.fw diff --git a/abs/core/linux-firmware/PKGBUILD b/abs/core/linux-firmware/PKGBUILD index 0366c65..44bd424 100644 --- a/abs/core/linux-firmware/PKGBUILD +++ b/abs/core/linux-firmware/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 123819 2011-05-13 15:23:26Z tpowa $ +# $Id$ # Maintainer: Thomas Bächler # # Create a new tarball from the linux-firmware git tree with the following command: -# git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git +# git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git # git archive --format=tar --prefix linux-firmware-$(date +%Y%m%d)/ master | xz -9 > linux-firmware-$(date +%Y%m%d).tar.xz # pkgname=linux-firmware -pkgver=20110512 -pkgrel=2 +pkgver=20120227 +pkgrel=1 pkgdesc="Firmware files for Linux" arch=('any') url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary" @@ -39,23 +39,14 @@ replaces=('kernel26-firmware' 'rt2x00-rt61-fw' 'rt2x00-rt71w-fw') options=(!strip) -source=(ftp://ftp.archlinux.org/other/linux-firmware/$pkgname-$pkgver.tar.xz - http://www.kernel.org/pub/linux/kernel/people/mcgrof/firmware/ar9170/ar9170.fw - http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5000-ucode-8.83.5.1-1.tgz - http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1000-ucode-39.31.5.1.tgz - http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000-ucode-9.221.4.1.tgz - http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2a-ucode-17.168.5.2.tgz - http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2b-ucode-17.168.5.2.tgz -) -md5sums=('af5fef154866a2e2d33d8b86b271babf' - '34feec4ec0eae3bb92c7c1ea2dfb4530' - 'cec71b615f3ca6d7823c032da0be1b61' - '8098503cb2abcdeffffb3ddd2d8d6f60' - 'c132a4c1946a9dbc0c36b41696e5c793' - '0b9579f4b8faf51c955295607a8e79a8' - 'd87411296b4eeda0c91322228e9f8437') +source=(v4l-cx23885-enc.fw + ftp://ftp.archlinux.org/other/linux-firmware/$pkgname-$pkgver.tar.xz) +#sha256sums=('bc1cbee23ab8be8478be66e5486008d81b91fbf6de50347fd1be58b5e56bc6b7') package() { + #copy in correct firmware + install -D -m755 "${srcdir}/v4l-cx23885-enc.fw" "${srcdir}/${pkgname}-${pkgver}/" + cd "${srcdir}/${pkgname}-${pkgver}" install -d -m755 "${pkgdir}/lib/firmware" @@ -63,18 +54,7 @@ package() { install -d -m755 "${pkgdir}/usr/share/licenses/linux-firmware/" rm -f "${pkgdir}/lib/firmware/GPL*" mv "${pkgdir}/lib/firmware"/{LICEN*,WHENCE} "${pkgdir}/usr/share/licenses/linux-firmware/" - - # Symlinks for Broadcom firmware - #ln -s bcm43xx-0-610-809-0.fw "${pkgdir}/lib/firmware/brcm/bcm43xx-0.fw" - #ln -s bcm43xx_hdr-0-610-809-0.fw "${pkgdir}/lib/firmware/brcm/bcm43xx_hdr-0.fw" - - # https://bugs.archlinux.org/task/20064 - install -m644 "${srcdir}/ar9170.fw" "${pkgdir}/lib/firmware/" - # fix intel firmware files - install -m 644 ${srcdir}/iwlwifi-1000-ucode-39.31.5.1/iwlwifi-1000-5.ucode "${pkgdir}/lib/firmware/" - install -m 644 ${srcdir}/iwlwifi-5000-ucode-8.83.5.1/iwlwifi-5000-5.ucode "${pkgdir}/lib/firmware/" - install -m 644 ${srcdir}/iwlwifi-6000-ucode-9.221.4.1/iwlwifi-6000-4.ucode "${pkgdir}/lib/firmware/" - install -m 644 ${srcdir}/iwlwifi-6000g2a-ucode-17.168.5.2/iwlwifi-6000g2a-5.ucode "${pkgdir}/lib/firmware/" - install -m 644 ${srcdir}/iwlwifi-6000g2b-ucode-17.168.5.2/iwlwifi-6000g2b-5.ucode "${pkgdir}/lib/firmware/" } +md5sums=('1cb3c48a6684126f5e503a434f2d636b' + '80084f057b8942421dd132a7ac78c3e8') # vim:set ts=2 sw=2 et: diff --git a/abs/core/linux-firmware/__changelog b/abs/core/linux-firmware/__changelog new file mode 100644 index 0000000..0ac04b7 --- /dev/null +++ b/abs/core/linux-firmware/__changelog @@ -0,0 +1 @@ +- replace v4l-cx23885-enc.fw in linux firmware because it is the wrong file. diff --git a/abs/core/linux-firmware/v4l-cx23885-enc.fw b/abs/core/linux-firmware/v4l-cx23885-enc.fw new file mode 100644 index 0000000..25a2915 Binary files /dev/null and b/abs/core/linux-firmware/v4l-cx23885-enc.fw differ -- cgit v0.12 From 2b9073eff507a14b7d3983a3819bf2af5fbed98a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 2 May 2012 11:54:34 -0500 Subject: dvb-firmware: add modprobe option for xc5000 --- abs/core/dvb-firmware/PKGBUILD | 9 ++++++--- abs/core/dvb-firmware/dvb-firmware.tar.bz2 | Bin 0 -> 13819768 bytes abs/core/dvb-firmware/xc5000.conf | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 abs/core/dvb-firmware/dvb-firmware.tar.bz2 create mode 100644 abs/core/dvb-firmware/xc5000.conf diff --git a/abs/core/dvb-firmware/PKGBUILD b/abs/core/dvb-firmware/PKGBUILD index bbd7356..73a4d15 100644 --- a/abs/core/dvb-firmware/PKGBUILD +++ b/abs/core/dvb-firmware/PKGBUILD @@ -3,16 +3,19 @@ pkgname=dvb-firmware pkgver=1 -pkgrel=14 +pkgrel=15 pkgdesc="Firmware for DVB cards" replaces=('hd3000firmware') arch=('i586' 'i686' 'x86_64') url="http://linuxtv.org/" -source=(ftp://ftp.knoppmyth.net/R6/sources/dvb-firmware.tar.bz2) +source=(dvb-firmware.tar.bz2 xc5000.conf) build() { cd $startdir/src/ mkdir -p $startdir/pkg/lib/firmware cp -a dvb-fw/* $startdir/pkg/lib/firmware + mkdir -p ${pkgdir}/etc/modprobe.d/ + install -D -m644 "${srcdir}/xc5000.conf" "${pkgdir}/etc/modprobe.d/" } -md5sums=('32e19e3f9f849e667c6f7db1186180b9') +md5sums=('32e19e3f9f849e667c6f7db1186180b9' + '34dcdb3465572ca8e77325260763daa5') diff --git a/abs/core/dvb-firmware/dvb-firmware.tar.bz2 b/abs/core/dvb-firmware/dvb-firmware.tar.bz2 new file mode 100644 index 0000000..e5b0d18 Binary files /dev/null and b/abs/core/dvb-firmware/dvb-firmware.tar.bz2 differ diff --git a/abs/core/dvb-firmware/xc5000.conf b/abs/core/dvb-firmware/xc5000.conf new file mode 100644 index 0000000..5b5dfa9 --- /dev/null +++ b/abs/core/dvb-firmware/xc5000.conf @@ -0,0 +1,4 @@ +* xc5000 +* Disable power cycling and firmware reloads +* +options xc5000 no_poweroff=1 -- cgit v0.12 From 933edb8a4eba82c240c016a9d4429c9fae2faf8c Mon Sep 17 00:00:00 2001 From: Cecil Date: Wed, 2 May 2012 18:08:20 -0700 Subject: mythtv:Bumped to -4 to get latest fixes. --- abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD index 9768370..aaa1a12 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD @@ -6,7 +6,7 @@ pkgname=mythtv pkgver=0.25 -pkgrel=3 +pkgrel=4 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From 34e77b742c61508b8e5ee0c7275fc59f7453c425 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 4 May 2012 00:28:59 -0500 Subject: runit-scripts: remotes run: add support for /etc/runit/lirc.sh. refs #821 --- abs/core/runit-scripts/PKGBUILD | 2 +- .../runitscripts/services/remotes/run | 186 +++++++++++---------- 2 files changed, 101 insertions(+), 87 deletions(-) diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 9357169..48e469d 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=2.1.1 -pkgrel=62 +pkgrel=63 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 9d46b0e..0943a8e 100755 --- a/abs/core/runit-scripts/runitscripts/services/remotes/run +++ b/abs/core/runit-scripts/runitscripts/services/remotes/run @@ -17,99 +17,113 @@ fi echo "`date` --- run started" >> $LOG -. /etc/systemconfig -stat_runit "Starting remotes" -[ -e /etc/sv/remotes/.runtime ] || mkdir -p /etc/sv/remotes/.runtime -[ -e /var/run/lirc ] || mkdir -p /var/run/lirc +#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 +#Anything in that file will be used and the rest of this file is ignored. -num_lirc=`ls -la /dev/lirc[0-9] 2>/dev/null |wc -l ` -num_lirc=$((num_lirc-1)) - -serial_port="" - -if [ x$ReceiverType = xSerial ] -then - serial_port=$ReceiverSerialport -elif [ x$HostBlasterType = xSerial ] -then - serial_port=$HostSerialPort_blasterlirc -fi - -if [ -n "$serial_port" ] -then - #/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 - - case $serial_port in - ttyS0) - FLAGS="io=0x3f8 irq=4" - ;; - ttyS1) - FLAGS="io=0x2f8 irq=3" - ;; - ttyS2) - FLAGS="io=0x3e8 irq=4" - ;; - ttyS3) - FLAGS="io=0x2e8 irq=3" - ;; - esac - /usr/bin/setserial /dev/$serial_port uart none - sleep 0.5 - /sbin/modprobe lirc_serial $FLAGS - sleep 0.5 -fi - -if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ] -then - CMD="/usr/sbin/lircd -r -n --driver=commandir" - printhl " Using commandir" - echo $CMD >>$LOG - $CMD >>$LOG 2>>$LOG -elif [ x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ] +if [ -f /etc/runit/lirc.sh ] then - sv start igdaemon - CMD="/usr/sbin/lircd -r -n --driver=iguanaIR" - printhl " Using iguanaIR usb" - echo $CMD >>$LOG - $CMD >>$LOG 2>>$LOG -elif [ x$ReceiverType = "xSiliconDust_HDHR" ] -then - # if using the SiliconDust_HDHR as an I/R Receiver - CMD="/usr/sbin/lircd -H udp -d 5000 -n" - printhl " Using SiliconDust on port 5000" - echo $CMD >>$LOG - $CMD >>$LOG 2>>$LOG + #program must not terminate. + stat_runit "Starting remotes from /etc/runit/lirc.sh" + echo "Starting remotes from /etc/runit/lirc.sh" >>$LOG + /etc/runit/lirc.sh else - LASTCMD="" - - for i in `seq 1 $num_lirc` - do - CMD="/usr/sbin/lircd -r -d /dev/lirc$i --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" - printhl " Device $i" + . /etc/systemconfig + stat_runit "Starting remotes" + + [ -e /etc/sv/remotes/.runtime ] || mkdir -p /etc/sv/remotes/.runtime + [ -e /var/run/lirc ] || mkdir -p /var/run/lirc + + num_lirc=`ls -la /dev/lirc[0-9] 2>/dev/null |wc -l ` + num_lirc=$((num_lirc-1)) + + serial_port="" + + if [ x$ReceiverType = xSerial ] + then + serial_port=$ReceiverSerialport + elif [ x$HostBlasterType = xSerial ] + then + serial_port=$HostSerialPort_blasterlirc + fi + + if [ -n "$serial_port" ] + then + #/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 + + case $serial_port in + ttyS0) + FLAGS="io=0x3f8 irq=4" + ;; + ttyS1) + FLAGS="io=0x2f8 irq=3" + ;; + ttyS2) + FLAGS="io=0x3e8 irq=4" + ;; + ttyS3) + FLAGS="io=0x2e8 irq=3" + ;; + esac + /usr/bin/setserial /dev/$serial_port uart none + sleep 0.5 + /sbin/modprobe lirc_serial $FLAGS + sleep 0.5 + fi + + if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ] + then + CMD="/usr/sbin/lircd -r -n --driver=commandir" + printhl " Using commandir" echo $CMD >>$LOG $CMD >>$LOG 2>>$LOG - LASTCMD="--connect=localhost:876$i $LASTCMD " - done - - echo $LASTCMD >>$LOG - - if [ -f /etc/remote.run ] + elif [ x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ] then - #program must not terminate. - - stat_runit "Starting remotes from /etc/remote.run" - LCMD="/etc/remote.run $LASTCMD" - echo "Starting remotes from $LCMD" >>$LOG - exec $LCMD >>$LOG 2>>$LOG + sv start igdaemon + CMD="/usr/sbin/lircd -r -n --driver=iguanaIR" + printhl " Using iguanaIR usb" + echo $CMD >>$LOG + $CMD >>$LOG 2>>$LOG + elif [ x$ReceiverType = "xSiliconDust_HDHR" ] + then + # if using the SiliconDust_HDHR as an I/R Receiver + CMD="/usr/sbin/lircd -H udp -d 5000 -n" + printhl " Using SiliconDust on port 5000" + echo $CMD >>$LOG + $CMD >>$LOG 2>>$LOG else - echo "Disable in kernel remote driver" >>$LOG - in_kernel_support "disable" - LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /var/run/lirc/lircd $LASTCMD" - echo "Starting remotes from $LCMD" >>$LOG - exec $LCMD >>$LOG 2>>$LOG + LASTCMD="" + + for i in `seq 1 $num_lirc` + do + CMD="/usr/sbin/lircd -r -d /dev/lirc$i --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" + printhl " Device $i" + echo $CMD >>$LOG + $CMD >>$LOG 2>>$LOG + LASTCMD="--connect=localhost:876$i $LASTCMD " + done + + echo $LASTCMD >>$LOG + + if [ -f /etc/remote.run ] + then + #program must not terminate. + + stat_runit "Starting remotes from /etc/remote.run" + LCMD="/etc/remote.run $LASTCMD" + echo "Starting remotes from $LCMD" >>$LOG + exec $LCMD >>$LOG 2>>$LOG + else + echo "Disable in kernel remote driver" >>$LOG + in_kernel_support "disable" + LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /var/run/lirc/lircd $LASTCMD" + echo "Starting remotes from $LCMD" >>$LOG + exec $LCMD >>$LOG 2>>$LOG + fi fi fi -- cgit v0.12 From 78fbe2921fa781c79a676505826de66c3a595011 Mon Sep 17 00:00:00 2001 From: Cecil Date: Fri, 4 May 2012 18:33:25 -0700 Subject: git_src:git hash --- abs/core/mythtv/stable-0.25/git_src/git_hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash index 53027bd..8df731d 100644 --- a/abs/core/mythtv/stable-0.25/git_src/git_hash +++ b/abs/core/mythtv/stable-0.25/git_src/git_hash @@ -1 +1 @@ -9ac4b79b1048568afc6a8f6e302de1e248eab2a1 +2a2af9f7f7b66c13b7cb4e65149acbf6088f4cbf -- cgit v0.12 From 59175d4cd3c31f77f42f02fe3e3a1d5ce6648fe9 Mon Sep 17 00:00:00 2001 From: Cecil Date: Fri, 4 May 2012 18:37:42 -0700 Subject: linhes-scripts:Bumped to fix bug in stop_xss.sh. --- abs/core/linhes-scripts/PKGBUILD | 4 ++-- abs/core/linhes-scripts/stop_xss.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index 68a02ef..9d3b507 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=33 +pkgrel=34 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -101,4 +101,4 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' '4b8671376fad6d76874508434d42fbfd' 'd8838461af9d446a1fd7e7883fdc75d1' 'cc9cdabcdfc969c2829b58c0e513488c' - 'acb72dfeda6f957bfdf4113a04fb91c0') + '54a478660d0f8150fe10112a9ecf2740') diff --git a/abs/core/linhes-scripts/stop_xss.sh b/abs/core/linhes-scripts/stop_xss.sh index 9d3772e..4bb9d1a 100644 --- a/abs/core/linhes-scripts/stop_xss.sh +++ b/abs/core/linhes-scripts/stop_xss.sh @@ -3,7 +3,7 @@ while [ 1=1 ]; do - if [ "$(pidof chromium)" -o "$(pidof huludesktop)" -o "$(pidof xbmc.bin)"] + if [ "$(pidof chromium)" -o "$(pidof huludesktop)" -o "$(pidof xbmc.bin)" ] then xscreensaver-command -deactivate fi -- cgit v0.12 From d781d43a49cd027b7fb124990efcf9107f0dbe79 Mon Sep 17 00:00:00 2001 From: Cecil Date: Fri, 4 May 2012 19:23:42 -0700 Subject: xbmc:Bumped to -6 to modified xbmc.sh so screensaver doesn't kick in. --- abs/extra/xbmc/PKGBUILD | 4 ++-- abs/extra/xbmc/xbmc.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD index 0a36e53..fc8cc5b 100644 --- a/abs/extra/xbmc/PKGBUILD +++ b/abs/extra/xbmc/PKGBUILD @@ -9,7 +9,7 @@ _prefix=/usr pkgname=xbmc pkgver=11.0 -pkgrel=5 +pkgrel=6 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -105,4 +105,4 @@ package() { # vim:set ts=2 sw=2 et: md5sums=('9e8a26ee25173c7268abea7f1d82d428' '5aa2e21a1f9fea60a2e5bb345e5aefd0' - 'fcbf28e440ea3e6f78ae2cebdeb8be76') + '316fb34ed4496972ddf59f278d9adb25') diff --git a/abs/extra/xbmc/xbmc.sh b/abs/extra/xbmc/xbmc.sh index 81584e4..333c857 100644 --- a/abs/extra/xbmc/xbmc.sh +++ b/abs/extra/xbmc/xbmc.sh @@ -1,7 +1,7 @@ #!/bin/bash #Stop XScreensaver -xscreensaver-command -exit +stop_xss.sh #Launch XBMC /usr/bin/xbmc --lircdev /var/run/lirc/lircd #Once XBMC exits, start XSceensager again -xscreensaver -no-splash & +killall stop_xss.sh -- cgit v0.12 From 98f6c1ef5803e150d52fbbc59cbd0dd0d4c566bb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 7 May 2012 09:45:19 -0500 Subject: linux-firmware: v4l-cx23885-enc.fw change permissions --- abs/core/linux-firmware/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/linux-firmware/PKGBUILD b/abs/core/linux-firmware/PKGBUILD index 44bd424..0772c4e 100644 --- a/abs/core/linux-firmware/PKGBUILD +++ b/abs/core/linux-firmware/PKGBUILD @@ -9,7 +9,7 @@ pkgname=linux-firmware pkgver=20120227 -pkgrel=1 +pkgrel=2 pkgdesc="Firmware files for Linux" arch=('any') url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary" @@ -45,7 +45,7 @@ source=(v4l-cx23885-enc.fw package() { #copy in correct firmware - install -D -m755 "${srcdir}/v4l-cx23885-enc.fw" "${srcdir}/${pkgname}-${pkgver}/" + install -D -m664 "${srcdir}/v4l-cx23885-enc.fw" "${srcdir}/${pkgname}-${pkgver}/" cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v0.12 From 9384b265987ab1121b2065ffbf4fca11e4b3aa84 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 9 May 2012 09:14:29 -0500 Subject: huludesktop: backup /home/mythtv/.huludesktop so it isn't overwritten on update --- abs/extra/huludesktop/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/abs/extra/huludesktop/PKGBUILD b/abs/extra/huludesktop/PKGBUILD index c9ced62..6bb69da 100644 --- a/abs/extra/huludesktop/PKGBUILD +++ b/abs/extra/huludesktop/PKGBUILD @@ -1,12 +1,13 @@ pkgname=huludesktop pkgver=0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Hulu Desktop for Linux" arch=(i686) url="http://www.hulu.com/labs/hulu-desktop-linux" license=('unknown') makedepends=('deb2targz') depends=('glib2' 'gtk2' 'lirc' 'flashplugin' 'linhes-scripts>=7-29') +backup=('home/mythtv/.huludesktop') install=huludesktop.install options=('') source=('http://download.hulu.com/huludesktop_i386.deb' 'huludesktop' 'huludesktop.sh') -- cgit v0.12 From 3aec3365c1b8a5e4dabbb30f986a81528362eec2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 10 May 2012 08:47:57 -0500 Subject: runit-scripts: remotes run: check /etc/runit/lirc.sh exists and is executable --- abs/core/runit-scripts/PKGBUILD | 2 +- abs/core/runit-scripts/runitscripts/services/remotes/run | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 48e469d..f9b379e 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=2.1.1 -pkgrel=63 +pkgrel=64 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 0943a8e..2248322 100755 --- a/abs/core/runit-scripts/runitscripts/services/remotes/run +++ b/abs/core/runit-scripts/runitscripts/services/remotes/run @@ -23,7 +23,7 @@ echo "`date` --- run started" >> $LOG # /etc/runit/lirc.sh #Anything in that file will be used and the rest of this file is ignored. -if [ -f /etc/runit/lirc.sh ] +if [ -x /etc/runit/lirc.sh ] then #program must not terminate. stat_runit "Starting remotes from /etc/runit/lirc.sh" -- cgit v0.12 From 05224a8c82df924573978ba44c897900dcd2d0eb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 10 May 2012 09:00:05 -0500 Subject: LinHES-config: install_functions.sh: in_kernel_support: disable and restart lcdd If lcdd is running when pushing a protocol it will stop execution of the script. --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/install_functions.sh | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index ad8b9b6..7d23be3 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.3 -pkgrel=71 +pkgrel=72 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' @@ -110,7 +110,7 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27' 'e36da536dd651ef182e7642337889e77' '985891a43f7c4c983eb2a362162f1a0f' '2f0b85d37b15956b3d92419c886e040c' - '5b41574597ac5096fe3462afeb0376e4' + '5a31addfbdc1154b05997f972a32fa33' 'c20f73d4da5d7e15e1f3eb85c7dcb49a' '68199e861c2933ccbb84735b9b440157' '9ae8d79f620c6d19973c55c32a921874' diff --git a/abs/core/LinHES-config/install_functions.sh b/abs/core/LinHES-config/install_functions.sh index c807f15..08206fc 100755 --- a/abs/core/LinHES-config/install_functions.sh +++ b/abs/core/LinHES-config/install_functions.sh @@ -315,6 +315,11 @@ function in_kernel_support() { #For disabling other protocols, adjust to the new location in 2.6.37. 91 if [ -d /sys/class/rc ] && [ "$(ls -A /sys/class/rc)" ] then + LCDDSTOP=0 + if [ -d /service/lcdd ]; then + sv stop lcdd + LCDDSTOP=1 + fi for file in `find /sys/class/rc/*/ -name protocols` do if [ "$1" = "disable" ] @@ -327,6 +332,9 @@ function in_kernel_support() { done fi done + if [ $LCDDSTOP -eq 1 ]; then + sv start lcdd + fi fi } -- cgit v0.12