Merge branch 'master' of ssh://igo@knoppmyth.net/mount/repository/LinHES-PKGBUILD

7 files changed, 74 insertions, 15 deletions

diff --git a/abs/core-testing/mythtv/stable/linhes-theme/PKGBUILD b/abs/core-testing/mythtv/stable/linhes-theme/PKGBUILD
index 0eec33f..a81459f 100644
--- a/abs/core-testing/mythtv/stable/linhes-theme/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/linhes-theme/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-theme
 pkgver=1
-pkgrel=4
+pkgrel=5
 pkgdesc="Default LinHES theme."
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/abs/core-testing/mythtv/stable/mythsmolt/PKGBUILD b/abs/core-testing/mythtv/stable/mythsmolt/PKGBUILD
index dfdd01b..25c91cf 100644
--- a/abs/core-testing/mythtv/stable/mythsmolt/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythsmolt/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythsmolt
 pkgver=0.21
-pkgrel=6
+pkgrel=8
 pkgdesc="mythsmolt, a hardware profileing tool"
 arch=('i686' 'x86_64')
 url="http://www.mythvantage.com"
@@ -16,6 +16,7 @@ build() {
    
    # use QT3 qmake
    export PATH=$QTDIR/bin:$PATH
+   echo "INCLUDEPATH += /usr/include/mythtv" >> mythsmolt.pro.usr
 
    qmake mythsmolt.pro.usr
    make qmake || return 1
diff --git a/abs/core-testing/mythtv/stable/mythstream/PKGBUILD b/abs/core-testing/mythtv/stable/mythstream/PKGBUILD
index 646e61a..275afa8 100644
--- a/abs/core-testing/mythtv/stable/mythstream/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythstream/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=mythstream
 pkgver=0.18_1
-pkgrel=7
+pkgrel=8
 pkgdesc="Unofficial MythTV plugin for Internet audio and video streams."
 arch=('i686' 'x86_64')
 url="http://home.kabelfoon.nl/~moongies/streamtuned.html"
@@ -25,6 +25,7 @@ build() {
 
    # use QT3 qmake
    export PATH=$QTDIR/bin:$PATH
+   echo "INCLUDEPATH += /usr/include/mythtv" >> mythstream/mythstream.pro
 
    qmake mythstream.pro
    make qmake || return 1
diff --git a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
index 056a99e..4277f16 100755
--- a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
@@ -1,22 +1,24 @@
 pkgname=mythtv-svn
 pkgver=19974
-pkgrel=1
+pkgrel=3
 pkgdesc="A personal video recorder for Linux"
 url="http://www.mythtv.org"
 license="GPL"
-depends=('lame' 'libmysqlclient' 'alsa-lib'  'wget' 'qt' 'x-server' 'freetype2' 'libmpeg2' 'libxml2' 'libraw1394' 'lirc' 'perl-date-manip' 'libavc1394' 'libdc1394' 'libiec61883')
-makedepends=('subversion')
-conflicts=(mythtv)
+depends=('bash' 'mysql-clients>=5.0' 'qt' 'lame' 'lirc-utils' 'ffmpeg' \
+        'faad2' 'libxv' 'libxvmc' 'libavc1394' 'libdc1394' 'libiec61883')
+makedepends=('libgl' 'subversion')
+conflicts=('mythtv')
 replaces=()
+groups=('pvr')
 backup=()
-options=(!strip)
-MAKEFLAGS="-j6"
+#options=(!strip)
+#MAKEFLAGS="-j6"
 install='mythtv.install'
 
 patchs=('smolt_jump.patch' 'DeviceReadBuffer-polltimeout.2.patch' 'mpegrecorder-hdpvr-v2a.patch' 'hdpvr-livetv.patch')
 #patchs=('svn_main_menu_popup.patch' 'smolt_jump.patch' 'DeviceReadBuffer-polltimeout.2.patch' 'mpegrecorder-hdpvr-v2a.patch' 'hdpvr-livetv.patch')
 source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` )
-arch=('i686')
+arch=('i686' 'x86_64')
 md5sums=()
 
 _svntrunk=http://cvs.mythtv.org/svn/trunk/mythtv
@@ -46,7 +48,7 @@ build() {
 	# configure
 	./configure --prefix=/usr --cpu=${ARCH} \
 	--enable-vdpau --enable-xvmc --enable-xvmc-pro \
-	--enable-opengl-vsync --enable-libfaad --enable-dvb --enable-firewire \
+	--enable-opengl-vsync --enable-libfaad --enable-dvb --disable-firewire \
 	--compile-type=release --with-bindings=perl,python \
 	--enable-audio-alsa --disable-audio-jack --disable-audio-arts || return 1
 
diff --git a/abs/core-testing/runit/PKGBUILD b/abs/core-testing/runit/PKGBUILD
index c0863bb..1303167 100755
--- a/abs/core-testing/runit/PKGBUILD
+++ b/abs/core-testing/runit/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit
 pkgver=1.8.0
-pkgrel=57
+pkgrel=61
 pkgdesc="A replacement for sysvinit, and other init schemes, with service supervision"
 url="http://smarden.org/runit/"
 license="BSD"
@@ -10,7 +10,7 @@ conflicts=()
 replaces=()
 backup=()
 install=runit.install
-source=(http://smarden.org/runit/$pkgname-$pkgver.tar.gz add_service.sh remove_service.sh halt.script reboot.script poweroff.script)
+source=(http://smarden.org/runit/$pkgname-$pkgver.tar.gz add_service.sh remove_service.sh halt.script reboot.script poweroff.script shutdown.script)
 arch=('i686')
 
 build() {
@@ -35,6 +35,7 @@ build() {
   install -m0755 $startdir/src/reboot.script $startdir/pkg/sbin
   install -m0755 $startdir/src/halt.script  $startdir/pkg/sbin
   install -m0755 $startdir/src/poweroff.script  $startdir/pkg/sbin
+  install -m0755 $startdir/src/shutdown.script  $startdir/pkg/sbin
 
   for i in `cat ../package/commands`; do
     install -m0755 $i $startdir/pkg/sbin/
diff --git a/abs/core-testing/runit/runit.install b/abs/core-testing/runit/runit.install
index 977841b..b6fcb07 100755
--- a/abs/core-testing/runit/runit.install
+++ b/abs/core-testing/runit/runit.install
@@ -4,9 +4,10 @@ pre_install () {
 if [ ! -f /sbin/halt-init ]
 then
    mv /sbin/halt  /sbin/halt-init
+   mv /sbin/shutdown  /sbin/shutdown-init
+fi
    rm -f /sbin/reboot
    rm -f /sbin/poweroff
-fi
 
 }
 
@@ -14,9 +15,14 @@ pre_upgrade () {
 if [ ! -f /sbin/halt-init ]
 then
    mv /sbin/halt  /sbin/halt-init
+fi
+
+if [ ! -f /sbin/shutdown-init ]
+then
+   mv /sbin/shutdown  /sbin/shutdown-init
+fi
    rm -f /sbin/reboot
    rm -f /sbin/poweroff
-fi
 
 }
 
@@ -28,6 +34,7 @@ post_install () {
   ln -s /sbin/poweroff.script /sbin/poweroff
   ln -s /sbin/halt-init /sbin/reboot.init
   ln -s /sbin/halt-init /sbin/poweroff.init
+  ln -s /sbin/shutdown.script /sbin/shutdown
 
 
 }
@@ -41,6 +48,7 @@ post_upgrade(){
   ln -s /sbin/poweroff.script /sbin/poweroff
   ln -s /sbin/halt-init /sbin/reboot.init
   ln -s /sbin/halt-init /sbin/poweroff.init
+  ln -s /sbin/shutdown.script /sbin/shutdown
 
 }
 
diff --git a/abs/core-testing/runit/shutdown.script b/abs/core-testing/runit/shutdown.script
new file mode 100755
index 0000000..3bcc5d3
--- /dev/null
+++ b/abs/core-testing/runit/shutdown.script
@@ -0,0 +1,46 @@
+#!/bin/bash
+. /etc/profile
+INIT=`ps -p 1 -o comm=`
+if [ x$INIT = xrunit ]
+then
+	reboot=""
+	halt=""
+	delay=""
+ 	while getopts rht:  name
+	do
+        	case $name in
+                  r)    reboot=1 ;;
+                  h)    halt=1 ;;
+                  t) delay="$OPTARG"
+                        if [ x$delay = "xnow" ]
+                        then
+                                delay=0
+                        fi
+                        ;;
+                *)
+                      exit 2;;
+                        esac
+	done
+	if [ x$delay = x ]
+	then
+	        echo "-t is mandatory"
+        	exit 4
+	fi
+
+	if [ x$reboot = x1 ]
+	then
+         wall "System will reboot in $delay seconds"
+                sleep $delay
+               /sbin/runit-init 6
+	fi
+
+	if [ x$halt = x1 ]
+	then
+                wall "System will poweroff  in $delay seconds"
+                sleep $delay
+               /sbin/runit-init 0
+	fi
+
+else
+     	/sbin/shutdown-init $@
+fi