Merge branch 'testing' of ssh://jams@linhes.org/mount/repository/linhes_pkgbuild into testing

10 files changed, 17 insertions, 16 deletions

diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release
index 9d8b976..0becdac 100644
--- a/abs/core/LinHES-config/LinHES-release
+++ b/abs/core/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES R7.1 (Teamwork)
+LinHES R7.2 (SCALE 10x)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 769e992..1c302b2 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.3
-pkgrel=57
+pkgrel=58
 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'
@@ -113,7 +113,7 @@ md5sums=('64fad755c12f8eb12940e216e403354e'
          '960017a34d9cc78af6298f45aad6eb8e'
          'ecf9e5df20683a769c4a8a8f2d65de85'
          'eaf845dda830c531649d5840e0584f8e'
-         '4948c030aa7d42065a7960c3380b1e50'
+         '5a1cbcf58855bbd93a5a18e6673aa2e6'
          '6aff504ed5e860adc1b7317cd0780900'
          '55fccb1da0417a896b724f7cfc32dd5a'
          'ab2aa42c2947148c2b1cac0ade6d1d55'
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 4c3dd05..eda3653 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=7
-pkgrel=24
+pkgrel=25
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -99,6 +99,6 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          '35693f50939d5827aeabfce8c5dce589'
          'a94fe6d980f4b810f2e2ae5352084b39'
          '974c137d3fcb85942ba8945a1bc815fe'
-         'aad75575c9af70aa8bf3a06718985664'
+         '4b8671376fad6d76874508434d42fbfd'
          'd8838461af9d446a1fd7e7883fdc75d1'
          'cc9cdabcdfc969c2829b58c0e513488c')
diff --git a/abs/core/linhes-scripts/upgrade_linhes_script.sh b/abs/core/linhes-scripts/upgrade_linhes_script.sh
index 1c543fc..36fd8ee 100644
--- a/abs/core/linhes-scripts/upgrade_linhes_script.sh
+++ b/abs/core/linhes-scripts/upgrade_linhes_script.sh
@@ -34,6 +34,7 @@ pacman -R --noconfirm  aufs-utils aufs >> $LOGFILE
 pacman -R --noconfirm xf86-video-sis >> $LOGFILE
 pacman -R --noconfirm madwifi >> $LOGFILE
 pacman -R --noconfirm hauppauge-hvr-firmware >> $LOGFILE
+pacman -R --noconfirm v4l-dvb >> $LOGFILE
 
 
 echo "Resyncing with repository"
diff --git a/abs/core/local-website/PKGBUILD b/abs/core/local-website/PKGBUILD
index 2fd4e1a..63dc5ef 100644
--- a/abs/core/local-website/PKGBUILD
+++ b/abs/core/local-website/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=local-website
 pkgver=2
-pkgrel=26
+pkgrel=28
 pkgdesc="Contents of http://localhost"
 arch=(i686 x86_64)
 license=('GPL')
diff --git a/abs/core/local-website/htdocs/index.html b/abs/core/local-website/htdocs/index.html
index 2a69a64..d893c87 100755
--- a/abs/core/local-website/htdocs/index.html
+++ b/abs/core/local-website/htdocs/index.html
@@ -85,6 +85,7 @@
 <!-- not working right now                <li><a href="/fuppes.php" target="_blank">FUPPES</a> - UPnP Media Server. Install via the Service Menu.<br></li> -->
                 <li><a href="/mediaserv.php" target="_blank">Mediaserv</a> - On-demand transcoding server for videos. Mediaserv is designed to transcode video in a format playable on the Nokia Internet Tablets.  However it works well at transcoding and streaming to any device that will playback AVIs (think streaming to any browser!). By default, your TV recordings (pretty) and video directory are linked. If you want Mediaserv to stream contents from a network share: ln -s /path/to/share /myth/mediaserv/media/<br></li>
 <!-- not working right now                <li><a href="/mythweb/data/mp3player.html">Radio</a> - Music in MythMusic must be encoded as MP3s.<br></li> -->
+                <li><a href="/mythexport/setup.cgi">MythExport</a> - PERL daemon used to transcode records and provides an RSS feed.<br></li> 
             </ul>
         </div>
         <div id="info_status" class="hidden">
diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD
index b2b2170..edbc47c 100644
--- a/abs/core/nvidia-utils/PKGBUILD
+++ b/abs/core/nvidia-utils/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: James Rayner <iphitus@gmail.com>
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'opencl-nvidia')
-pkgver=290.10
+pkgver=280.13
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -14,7 +14,7 @@ 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=('50319a4b3818c12c9c7243525e0e6316')
 elif [ "$CARCH" = "x86_64" ]; then
     _arch='x86_64'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
@@ -104,4 +104,4 @@ package_nvidia-utils() {
 
     create_links
 }
-md5sums=('50319a4b3818c12c9c7243525e0e6316')
+md5sums=('c3992c8cef02b7773a398640d8830e77')
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD
index 4572095..42573aa 100644
--- a/abs/core/nvidia/PKGBUILD
+++ b/abs/core/nvidia/PKGBUILD
@@ -2,10 +2,10 @@
 # Maintainer : Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia
-pkgver=290.10
+pkgver=280.13
 #_extramodules=extramodules-2.6.39-LinHES
 _kernver='2.6.39-LinHES'
-pkgrel=2
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -44,4 +44,4 @@ package() {
     gzip "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko"
 }
 
-md5sums=('50319a4b3818c12c9c7243525e0e6316')
+md5sums=('c3992c8cef02b7773a398640d8830e77')
diff --git a/abs/core/v4l-dvb/PKGBUILD b/abs/core/v4l-dvb/PKGBUILD
index b853b24..4463335 100644
--- a/abs/core/v4l-dvb/PKGBUILD
+++ b/abs/core/v4l-dvb/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=v4l-dvb
 _kernver=`uname -r`
 pkgver=20120113
-pkgrel=1
+pkgrel=2
 pkgdesc="V4L-DVB device drivers (newer than those included in kernel)"
 arch=('i686' 'x86_64')
 url="http://linuxtv.org/"
@@ -15,7 +15,6 @@ install=v4l-dvb.install
 _gitroot="git://linuxtv.org/media_build.git"
 _gitname="media_build"
 
-
 build() {
   cd "${srcdir}"
   msg "Connecting to GIT server...."
diff --git a/abs/extra/tablet-encode/PKGBUILD b/abs/extra/tablet-encode/PKGBUILD
index cd4bc9b..02607d4 100644
--- a/abs/extra/tablet-encode/PKGBUILD
+++ b/abs/extra/tablet-encode/PKGBUILD
@@ -3,11 +3,11 @@
 
 pkgname=tablet-encode
 pkgver=2.30
-pkgrel=3
+pkgrel=4
 pkgdesc="Transcodes videos for playback on a Nokia Internet Tablet"
 arch=('i686' 'x86_64')
 license=('ARTISTIC')
-depends=(mplayer)
+depends=(mencoder)
 url="http://mediautils.garage.maemo.org/tablet-encode.html"
 source=(https://garage.maemo.org/frs/download.php/6892/tablet-encode-2.30.tar.gz linhes.diff)