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

9 files changed, 56 insertions, 12 deletions

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 936b159..7407f8f 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,9 +1,9 @@
 pkgname=LinHES-config
 pkgver=2.0
-pkgrel=8
+pkgrel=9
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
 pkgdesc="Install and configure your system"
-depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted )
+depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted xresprobe)
 arch=('i686')
 
 source=(mv_install.py mv_config.py mythinstall.bin myth_user_call file_time_offset.py install-ui.xml install_proxy.sh install_functions.sh systemconfig.sh install_db_chroot.sh restore_default_settings.sh xconfig.sh timezip.py soundconfig.sh LinHES-release issue MythVantage.sh create_master.sh build_diskless.sh networkconfig.sh timezone.bin autocard.py restore_km_db_chroot.sh README  mv_advanced.py  mv_common.py   mv_ir.py  mv_misc.py  mv_network.py  mv_screensaver.py  mv_smolt.py  mv_software.py  mv_webuser.py mv_hostype.py systemconfig.py)
diff --git a/abs/core-testing/dvb-firmware/PKGBUILD b/abs/core-testing/dvb-firmware/PKGBUILD
index cffaa62..fe655cb 100644
--- a/abs/core-testing/dvb-firmware/PKGBUILD
+++ b/abs/core-testing/dvb-firmware/PKGBUILD
@@ -3,13 +3,13 @@
 
 pkgname=dvb-firmware
 pkgver=1
-pkgrel=3
+pkgrel=4
 pkgdesc="Firmware for DVB cards"
 arch=('i586' 'i686' 'x86_64')
 license=('GPL2')
 url="http://linuxtv.org/"
 source=(ftp://ftp.knoppmyth.net/R6/sources/dvb-firmware.tar.bz2)
-md5sums=('7cf73b069a1a64aec5273f28014086ce')
+md5sums=('3f01750f90e1219ebbba825c4f7069d0')
 
 build() {
   cd $startdir/src/
diff --git a/abs/core-testing/mplayer/PKGBUILD b/abs/core-testing/mplayer/PKGBUILD
index 09389a3..ad7915e 100644
--- a/abs/core-testing/mplayer/PKGBUILD
+++ b/abs/core-testing/mplayer/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mplayer
 pkgver=29134
-pkgrel=12
+pkgrel=13
 pkgdesc="Famous multimedia player, dev. version, without its GUI"
 arch=('i686' 'x86_64')
 url="http://www.mplayerhq.hu/"
@@ -55,6 +55,8 @@ build() {
   ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf
   rm -rf ${pkgdir}/usr/share/mplayer/font
   mv ${srcdir}/Blue ${pkgdir}/usr/share/mplayer/skins/default
+  mkdir -p ${pkgdir}/usr/share/doc/mplayer
+  cp ${srcdir}/$_svnmod-build/DOCS/tech/* ${pkgdir}/usr/share/doc/mplayer
   msg "Cleaning build files..."
   rm -rf $srcdir/$_svnmod-build
 
diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD
index 0644c3b..260586a 100755
--- a/abs/core-testing/runit-scripts/PKGBUILD
+++ b/abs/core-testing/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=1.8.0
-pkgrel=84
+pkgrel=85
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/run b/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/run
index 51bd046..48c68d3 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/run
@@ -27,5 +27,5 @@ mkfifo /tmp/mbefifo >/dev/null 2>/dev/null
 # 			sleep 10
 #
 # 		else
-			exec /usr/bin/mythbackend --logfile /var/log/mythtv/mythbackend.log
+			exec su mythtv -c "/usr/bin/mythbackend --logfile /var/log/mythtv/mythbackend.log"
 # 		fi
diff --git a/abs/core-testing/xresprobe/PKGBUILD b/abs/core-testing/xresprobe/PKGBUILD
new file mode 100644
index 0000000..783fc06
--- /dev/null
+++ b/abs/core-testing/xresprobe/PKGBUILD
@@ -0,0 +1,25 @@
+pkgname=xresprobe
+pkgver=0.4.23
+pkgrel=2
+pkgdesc="Tools for probing DDC info from monitors"
+arch=(i686)
+url="http://packages.qa.debian.org/x/xresprobe.html"
+license=('GPL')
+depends=()
+source=(http://ftp.debian.org/debian/pool/main/x/xresprobe/xresprobe_0.4.23debian1.orig.tar.gz 
+        http://ftp.debian.org/debian/pool/main/x/xresprobe/xresprobe_0.4.23debian1-0.1.diff.gz
+        xresprobe.patch)
+
+build() {
+	# patch
+	cd $startdir/src/xresprobe-0.4.23debian1 || return 1
+	patch -Np1 -i ../xresprobe_0.4.23debian1-0.1.diff || return 1
+	patch -Np1 -i ../xresprobe.patch || return 1
+
+	# build
+	make || return 1
+	make DESTDIR=$startdir/pkg install || return 1
+}
+md5sums=('53afc73b8b36676eeea4360c6481f9fb'
+         'd10eb3a74467fd84f974ce405bf030f7'
+         'd5b9af3c0c21cab98440bfc210a5ce53')
diff --git a/abs/core-testing/xresprobe/xresprobe.patch b/abs/core-testing/xresprobe/xresprobe.patch
new file mode 100644
index 0000000..a92f0b0
--- /dev/null
+++ b/abs/core-testing/xresprobe/xresprobe.patch
@@ -0,0 +1,16 @@
+diff -Naru xresprobe-0.4.23debian1.orig/ddcprobe/lrmi.c xresprobe-0.4.23debian1/ddcprobe/lrmi.c
+--- xresprobe-0.4.23debian1.orig/ddcprobe/lrmi.c	2006-03-22 13:29:05.000000000 +1030
++++ xresprobe-0.4.23debian1/ddcprobe/lrmi.c	2009-06-09 21:26:20.000000000 +0930
+@@ -55,6 +55,12 @@
+ #include "x86-common.h"
+ 
+ #if defined(__linux__)
++#if !defined (IF_MASK)
++#define IF_MASK X86_EFLAGS_IF
++#define VIF_MASK X86_EFLAGS_VIF
++#define IOPL_MASK X86_EFLAGS_IOPL
++#define TF_MASK X86_EFLAGS_IOPL
++#endif
+ #define DEFAULT_VM86_FLAGS 	(IF_MASK | IOPL_MASK)
+ #elif defined(__NetBSD__) || defined(__FreeBSD__)
+ #define DEFAULT_VM86_FLAGS  (PSL_I | PSL_IOPL)
diff --git a/abs/extra-testing/miro/PKGBUILD b/abs/extra-testing/miro/PKGBUILD
index 763d151..1411c43 100644
--- a/abs/extra-testing/miro/PKGBUILD
+++ b/abs/extra-testing/miro/PKGBUILD
@@ -3,13 +3,14 @@
 
 pkgname=miro
 pkgver=2.0.4
-pkgrel=8
+pkgrel=9
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com"
 license=('GPL2')
 depends=('xine-lib>=1.1.16.1' 'boost>=1.37.0' 'gnome-python-extras>=2.25.3'
-	 'dbus-python>=0.82.4' 'pyrex' 'xulrunner>=1.9.0.1' 'gtk2' 'nspr')
+	 'dbus-python>=0.82.4' 'pyrex' 'xulrunner>=1.9.0.1' 'gtk2' 'nspr'
+	 'desktop-file-utils')
 makedepends=('pkgconfig' 'pm-utils' 'qt3')
 optdepends=('gstreamer0.10-python: gstreamer backend (potentially unstable)' 'gstreamer0.10: gstreamer backend (potentially unstable')
 install=miro.install
diff --git a/abs/extra-testing/mkvtoolnix/PKGBUILD b/abs/extra-testing/mkvtoolnix/PKGBUILD
index 2e37e8e..2ce5343 100644
--- a/abs/extra-testing/mkvtoolnix/PKGBUILD
+++ b/abs/extra-testing/mkvtoolnix/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 39931 2009-05-23 08:10:22Z giovanni $
+# $Id: PKGBUILD 41916 2009-06-07 23:34:29Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=mkvtoolnix
-pkgver=2.9.0
+pkgver=2.9.5
 pkgrel=1
 pkgdesc="Set of tools to create, edit and inspect Matroska files"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL2')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 depends=('libmatroska>=0.8.1' 'flac>=1.1.4' 'libvorbis' 'wxgtk>=2.8.0.1' 'file' 'boost' 'lzo2')
 source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('4b3afa60ed96a9898e9f598b1694cbef')
+md5sums=('13f639048bd829214b2472703c495e4c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}/