Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing

11 files changed, 42 insertions, 20 deletions

diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index eda3653..a50faf8 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=7
-pkgrel=25
+pkgrel=27
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -84,8 +84,8 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          '25dd5b8ec0482d561b481bfce051d648'
          'b2c3dd48a4abb976eda2d5fbf22a173a'
          'b527b01d119d3bc33b8fa69bdf1082bb'
-         'f691c2bdf5da5455c9a5c2ab0ee1f820'
-         'a2786dd6fb70332c9f2f6d1737e7ac44'
+         '9d077c24d102fa02e4f417d639d8b00a'
+         '98979920c30bb48c02d00f6943e9e50e'
          '460861e6d0cf999629b734912eea0acf'
          'ccca6bdbbd86b203a3eecdbbe363e701'
          '65629302a4d2c3adf88cdf0ebc10d493'
diff --git a/abs/core/linhes-scripts/linhes_update.sh b/abs/core/linhes-scripts/linhes_update.sh
index a307146..e5dd2ad 100644
--- a/abs/core/linhes-scripts/linhes_update.sh
+++ b/abs/core/linhes-scripts/linhes_update.sh
@@ -47,7 +47,7 @@ chck ()  {
 		mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
 
 		echo "<mythmenu name=\"LinHES\">" > /tmp/update3.xml.tmp
-		if grep kernel26 /tmp/to_be_upgraded
+		if grep kernel26 /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
  			then
                         echo "" >> /tmp/update3.xml.tmp
                         echo "   <button>" >> /tmp/update3.xml.tmp
diff --git a/abs/core/linhes-scripts/linhes_update2.sh b/abs/core/linhes-scripts/linhes_update2.sh
index a48a996..d6984ed 100644
--- a/abs/core/linhes-scripts/linhes_update2.sh
+++ b/abs/core/linhes-scripts/linhes_update2.sh
@@ -20,6 +20,11 @@ then
 	killall -9 osd_cat
 	echo -e "\nUpdates complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
 	echo -e "\nUpdates complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+	if grep kernel26 /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
+	then
+		echo -e "\n\nUpdates require a reboot." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+		echo -e "\n\nUpdates require a reboot." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+	fi
 else
 	killall -9 osd_cat
 	echo -e "\nUpdates canceled." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
diff --git a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD
index e1e23a2..760948f 100644
--- a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('mytharchive'
          'mythweather'
          'mythzoneminder')
 pkgver=0.24
-pkgrel=19
+pkgrel=20
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
diff --git a/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD b/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD
index 6563bf9..c145741 100644
--- a/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD
+++ b/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythsmolt
 pkgver=0.24
-pkgrel=8
+pkgrel=9
 pkgdesc="mythsmolt, a hardware profileing tool"
 arch=('i686' 'x86_64')
 url="http://www.mythvantage.com"
diff --git a/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD b/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD
index 002d867..96fa147 100644
--- a/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD
+++ b/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=myththemes
 pkgver=0.24
-pkgrel=8
+pkgrel=9
 pkgdesc="Themes for MythTV"
 arch=('any')
 url="http://www.mythtv.org/"
diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
index 933936c..e9d9a12 100755
--- a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=mythtv
 pkgver=0.24
-pkgrel=28
+pkgrel=30
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org/"
diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythtv.install b/abs/core/mythtv/stable-0.24/mythtv/mythtv.install
index 0524f86..3f2e304 100755
--- a/abs/core/mythtv/stable-0.24/mythtv/mythtv.install
+++ b/abs/core/mythtv/stable-0.24/mythtv/mythtv.install
@@ -33,6 +33,22 @@ post_upgrade() {
 	else
 		mv /usr/share/mythtv/themes/defaultmenu/is.xml.pre /usr/share/mythtv/themes/defaultmenu/is.xml
 	fi
+	pacxmbc=`pacman -Q xbmc`
+    if [ -z "$pacxbmc" ]
+	then
+		mv /usr/share/mythtv/themes/defaultmenu/library.xml /tmp
+		grep -v -e /mythmenu /tmp/library.xml > /tmp/library.xml.tmp
+		echo "<!--#XBMC-->" >> /tmp/library.xml.tmp
+		echo "   <button>" >> /tmp/library.xml.tmp
+		echo "     <type>MENU_XBMC</type>" >> /tmp/library.xml.tmp
+		echo "     <text>Launch XBMC</text>" >> /tmp/library.xml.tmp
+		echo "     <action>EXEC /usr/bin/xbmc</action>" >> /tmp/library.xml.tmp 
+		echo "   </button>" >> /tmp/library.xml.tmp
+		echo "<!--#XBMC-->" >> /tmp/library.xml.tmp
+		echo "" >> /tmp/library.xml.tmp
+		echo "</mythmenu>" >> /tmp/library.xml.tmp
+		mv /tmp/library.xml.tmp /usr/share/mythtv/themes/defaultmenu/library.xml
+	fi
 }
 
 
diff --git a/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD
index f0fb2f8..cab8fbd 100644
--- a/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythweb
 pkgver=0.24
-pkgrel=15
+pkgrel=16
 pkgdesc="Web interface for MythTV's backend"
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD
index edbc47c..dbd6c6b 100644
--- a/abs/core/nvidia-utils/PKGBUILD
+++ b/abs/core/nvidia-utils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143066 2011-11-22 10:02:44Z ibiru $
+# $Id$
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'opencl-nvidia')
-pkgver=280.13
+pkgver=295.20
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -14,12 +14,12 @@ if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
     source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-#    md5sums=('50319a4b3818c12c9c7243525e0e6316')
+    md5sums=('a6f702271da49930a17e28b5928fe75a')
 elif [ "$CARCH" = "x86_64" ]; then
     _arch='x86_64'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
     source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('cebfba9a7e91716a06c66bb5b38d9661')
+    md5sums=('79b05cffa482234833ae1c4bb40664c3')
 fi
 
 create_links() {
@@ -104,4 +104,4 @@ package_nvidia-utils() {
 
     create_links
 }
-md5sums=('c3992c8cef02b7773a398640d8830e77')
+md5sums=('a6f702271da49930a17e28b5928fe75a')
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD
index 42573aa..108f5c2 100644
--- a/abs/core/nvidia/PKGBUILD
+++ b/abs/core/nvidia/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 143065 2011-11-22 10:00:31Z ibiru $
+# $Id$
 # Maintainer : Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia
-pkgver=280.13
+pkgver=295.20
 #_extramodules=extramodules-2.6.39-LinHES
 _kernver='2.6.39-LinHES'
 pkgrel=1
@@ -20,12 +20,12 @@ if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
     source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('50319a4b3818c12c9c7243525e0e6316')
+    md5sums=('a6f702271da49930a17e28b5928fe75a')
 elif [ "$CARCH" = "x86_64" ]; then
     _arch='x86_64'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
     source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('cebfba9a7e91716a06c66bb5b38d9661')
+    md5sums=('79b05cffa482234833ae1c4bb40664c3')
 fi
 
 build() {
@@ -39,9 +39,10 @@ package() {
     install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
         "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko"
     install -d -m755 "${pkgdir}/etc/modprobe.d"
-    echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist.conf"
+    echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nvidia.conf"
+    echo "blacklist nvidiafb" >> "${pkgdir}/etc/modprobe.d/nvidia.conf"
     sed -i -e "s/EXTRAMODULES='.*'/KERNEL_VERSION='${_kernver}'/" "${startdir}/nvidia.install"
     gzip "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko"
 }
 
-md5sums=('c3992c8cef02b7773a398640d8830e77')
+md5sums=('a6f702271da49930a17e28b5928fe75a')