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

3 files changed, 9 insertions, 10 deletions

diff --git a/abs/extra-testing/community/mythtv-vdpau/PKGBUILD b/abs/extra-testing/community/mythtv-vdpau/PKGBUILD
index 3a1b2f1..c447d10 100644
--- a/abs/extra-testing/community/mythtv-vdpau/PKGBUILD
+++ b/abs/extra-testing/community/mythtv-vdpau/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv-vdpau
 pkgver=0.21
-pkgrel=1
+pkgrel=2
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
@@ -9,13 +9,12 @@ backup=(etc/mythtv/mythbackend.conf etc/mythtv/mysql.txt usr/share/mythtv/is.xml
 source=(ftp://ftp.knoppmyth.net/R6/sources/mythtv-${pkgver}-fixes.tar.bz2 \
 	mythbackend myththemedmenu.cpp.patch myththemedmenu.h.patch  \
 	smolt_jump.patch pretty \
-	http://www.avenard.org/files/mythtv-vdpau/mythtv-fixes-glvdpau19990.patch.gz)
+	http://www.avenard.org/files/media/vdpau/mythtv-fixes-glvdpau20018.patch.gz)
 
 #md5sums=('e316ed18d7ac837cf8c4af54b1478793' '7ef6de58240e7aad389a0b13d91b1cf6'\
 #         'a0ecb7f476cb71c0c1ac90d349fc7695')
 conflicts=('mythtv')
-provides=('mythtv'${pkgver})
-replaces=('mythtv')
+provides=('mythtv'=${pkgver})
 license=('GPL2')
 makedepends=(libgl subversion nvidia-utils-beta)
 groups=('pvr')
@@ -24,7 +23,7 @@ install=mythtv.install
 
 build() {
 	cd $startdir/src/mythtv-${pkgver} || return 1
-	svn update -r 19990
+	svn update
 
 #apply patches 
 	 patch -p0 < ../myththemedmenu.cpp.patch
@@ -33,7 +32,7 @@ build() {
 #	 patch -p0 < ../pop_be_restart.cpp.patch
 	 patch -p0 < ../smolt_jump.patch
 #	 patch -p0 < ../2.6.28_dvb_api_version.diff
-       	patch -p1 < ../mythtv-fixes-glvdpau19990.patch
+       	patch -p1 < ../mythtv-fixes-glvdpau20018.patch
 
    . /etc/profile.d/qt3.sh
 
diff --git a/abs/extra-testing/v4l-dvb-hdpvr/PKGBUILD b/abs/extra-testing/v4l-dvb-hdpvr/PKGBUILD
index d5437e2..06f17bf 100644
--- a/abs/extra-testing/v4l-dvb-hdpvr/PKGBUILD
+++ b/abs/extra-testing/v4l-dvb-hdpvr/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=v4l-dvb-hdpvr
 _kernver=2.6.28-LinHES
 pkgver=1
-pkgrel=4
+pkgrel=5
 pkgdesc="V4L-DVB drivers for HD-PVR from mercurial"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/abs/extra-testing/v4l-dvb-hdpvr/v4l-dvb-hdpvr.install b/abs/extra-testing/v4l-dvb-hdpvr/v4l-dvb-hdpvr.install
index c87bb82..7ae7ed0 100644
--- a/abs/extra-testing/v4l-dvb-hdpvr/v4l-dvb-hdpvr.install
+++ b/abs/extra-testing/v4l-dvb-hdpvr/v4l-dvb-hdpvr.install
@@ -1,20 +1,20 @@
 # arg 1:  the new package version
 post_install() {
-  KERNEL_VERSION='2.6.26-ARCH'
+  KERNEL_VERSION='2.6.28-LinHES'
   depmod -ae -v $KERNEL_VERSION  > /dev/null 2>&1                
 }
 
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-  KERNEL_VERSION='2.6.26-ARCH'
+  KERNEL_VERSION='2.6.28-LinHES'
   depmod -ae -v $KERNEL_VERSION  > /dev/null 2>&1        
 
 }
 
 # arg 1:  the old package version
 post_remove() {
-  KERNEL_VERSION='2.6.26-ARCH'
+  KERNEL_VERSION='2.6.28-LinHES'
   depmod -ae -v $KERNEL_VERSION  > /dev/null 2>&1        
 }