update nvidia: 1.10 support

nvidia-lts/PKGBUILD

@@ -8,7 +8,7 @@
 _kernver="2.6.35-CHAKRA-LTS"
 
 pkgname=nvidia-lts
-pkgver=260.19.36
+pkgver=270.30
 pkgrel=1
 pkgdesc="NVIDIA drivers for kernel26."
 arch=('i686' 'x86_64')
@@ -23,12 +23,12 @@ if [ "$CARCH" = "i686" ]; then
         ARCH='x86'
         _pkg="NVIDIA-Linux-${ARCH}-${pkgver}"
         source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
-        md5sums=('2826484d87827351774449382e45c4a9')
+        md5sums=('ff319212b9ac52d645df31027c31ee45')
 elif [ "$CARCH" = "x86_64" ]; then
         ARCH='x86_64'
         _pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32"
         source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
-        md5sums=('6ebc5db9066e920b0b0e48377ce5eeb5')
+        md5sums=('780ba735bda572fc10a3515a15c49404')
 fi
 
 build() {

nvidia-utils/PKGBUILD

@@ -5,12 +5,12 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=nvidia-utils
-pkgver=260.19.36
+pkgver=270.30
 pkgrel=1
 pkgdesc="NVIDIA drivers utilities and libraries."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('xorg-server' 'libxvmc')
+depends=('xorg-server>=1.10.0' 'libxvmc')
 optdepends=('gtk2: nvidia-settings' 'pkg-config: nvidia-xconfig')
 conflicts=('libgl')
 provides=('libgl')
@@ -23,12 +23,12 @@ if [ "$CARCH" = "i686" ]; then
         ARCH='x86'
         _pkg="NVIDIA-Linux-${ARCH}-${pkgver}"
         source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
-        md5sums=('2826484d87827351774449382e45c4a9')
+        md5sums=('ff319212b9ac52d645df31027c31ee45')
 elif [ "$CARCH" = "x86_64" ]; then
         ARCH='x86_64'
         _pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32"
         source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
-        md5sums=('6ebc5db9066e920b0b0e48377ce5eeb5')
+        md5sums=('780ba735bda572fc10a3515a15c49404')
 fi
 
 source[1]='20-nvidia.conf'

nvidia/PKGBUILD

@@ -8,8 +8,8 @@
 _kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
 
 pkgname=nvidia
-pkgver=260.19.36
-pkgrel=2
+pkgver=270.30
+pkgrel=1
 pkgdesc="NVIDIA drivers for kernel26."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -23,12 +23,12 @@ if [ "$CARCH" = "i686" ]; then
         ARCH='x86'
         _pkg="NVIDIA-Linux-${ARCH}-${pkgver}"
         source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
-        md5sums=('2826484d87827351774449382e45c4a9')
+        md5sums=('ff319212b9ac52d645df31027c31ee45')
 elif [ "$CARCH" = "x86_64" ]; then
         ARCH='x86_64'
         _pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32"
         source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
-        md5sums=('6ebc5db9066e920b0b0e48377ce5eeb5')
+        md5sums=('780ba735bda572fc10a3515a15c49404')
 fi
 
 build() {

nvidia/nvidia.install

 post_install() {
-	KERNEL_VERSION='2.6.38-CHAKRA'
+	KERNEL_VERSION='2.6.37-CHAKRA'
 	depmod $KERNEL_VERSION
 }
 
@@ -9,6 +9,6 @@ post_upgrade() {
 }
 
 post_remove() {
-	KERNEL_VERSION='2.6.38-CHAKRA'
+	KERNEL_VERSION='2.6.37-CHAKRA'
 	depmod $KERNEL_VERSION
 }

xf86-video-siliconmotion/pixmapPrivate.patch

+Signed-off-by: Trevor Woerner <twoerner@...>
+---
+ src/smi_crtc.c   |    5 -----
+ src/smi_driver.c |    1 -
+ 2 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/src/smi_crtc.c b/src/smi_crtc.c
+index bccf9b2..36bd085 100644
+--- a/src/smi_crtc.c
++++ b/src/smi_crtc.c
+@@ -210,11 +210,6 @@ SMI_CrtcConfigResize(ScrnInfoPtr       pScrn,
+ 	pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
+ 					   -1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset);
+
+-	if(pScrn->pixmapPrivate.ptr)
+-	    /* The pixmap devPrivate just set may be overwritten by
+-	       xf86EnableDisableFBAccess */
+-	    pScrn->pixmapPrivate.ptr = pSmi->FBBase + pSmi->FBOffset;
+-
+ 	/* Modify the screen pitch */
+ 	pScrn->displayWidth = aligned_pitch / pSmi->Bpp;
+ 	pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
+diff --git a/src/smi_driver.c b/src/smi_driver.c
+index 391efbc..45d19a9 100644
+--- a/src/smi_driver.c
++++ b/src/smi_driver.c
+@@ -927,7 +927,6 @@ SMI_EnterVT(int scrnIndex, int flags)
+     /* FBBase may have changed after remapping the memory */
+     pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
+ 				       -1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset);
+-    pScrn->pixmapPrivate.ptr=pSmi->FBBase + pSmi->FBOffset;
+
+     if(pSmi->useEXA)
+        pSmi->EXADriverPtr->memoryBase=pSmi->FBBase;
+--
\ No newline at end of file