mesa moving back to using upstream minstall script, fix libgl linking, xf86 ati/nouveau updated

mesa/PKGBUILD

@@ -55,19 +55,20 @@ package_libgl() {
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
   replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
 
-  # linking because of split package
+  cd ${srcdir}/?esa-*
+  install -m755 -d "${pkgdir}/usr/lib"
+  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
+
+  bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
+  bin/minstall lib/libdricore9.0.1.so* "${pkgdir}/usr/lib/"
+
+  cd src/mesa/drivers/dri
+  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
+  
+  # fix linking
   make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  # libGL & libdricore
-  make -C ${srcdir}/?esa-*/src/glx DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # remove conflicting files
   make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
 
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
   ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
@@ -78,7 +79,9 @@ package_libglapi() {
   depends=('glibc')
   pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
 
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+  cd ${srcdir}/?esa-*   
+  install -m755 -d "${pkgdir}/usr/lib"
+  bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
@@ -96,11 +99,9 @@ package_mesa() {
   make DESTDIR="${pkgdir}" install
 
   rm -f "${pkgdir}/usr/lib/libGL.so"*
-  rm -f "${pkgdir}/usr/lib/libGL.la"
   rm -f "${pkgdir}/usr/lib/libglapi.so"*
+  rm -f "${pkgdir}/usr/lib/libdricore9.0.1.so"*
   rm -f "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so"*
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"

xf86-video-ati/PKGBUILD

@@ -4,21 +4,21 @@
 # maintainer abveritas@chakra-project.org
 
 pkgname=xf86-video-ati
-pkgver=6.14.6
-pkgrel=3
+pkgver=7.0.0
+pkgrel=1
 pkgdesc="X.org ati video driver"
-arch=(i686 x86_64)
+arch=('x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libpciaccess' 'libdrm' 'systemd' 'pixman' 'ati-dri')
-makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa')
+depends=('libpciaccess' 'libdrm' 'systemd' 'pixman' 'mesa')
+makedepends=('xorg-server' 'libdrm' 'xf86driproto')
 conflicts=('xorg-server<1.12.3' 'xf86-video-radeonhd')
 provides=('xf86-video-radeonhd')
 replaces=('xf86-video-radeonhd')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=("${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('b30383c7e5487c1df403a3af19fce8626d617a8d')
+sha1sums=('4e62a574b66a5071cbbfa1c67442938b42d11b43')
 
 build() { 
     cd ${srcdir}/${pkgname}-${pkgver}
@@ -26,9 +26,7 @@ build() {
     ./configure \
             --prefix=/usr \
             --enable-maintainer-mode \
-            --enable-dependency-tracking \
-            --enable-exa \
-            --enable-dri
+            --enable-dependency-tracking 
     make
 }
 

xf86-video-nouveau/PKGBUILD

@@ -4,20 +4,19 @@
 # maintainer abveritas@chakra-project.org
 
 pkgname=xf86-video-nouveau
-pkgver=1.0.1
-pkgrel=2
-pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
-arch=('i686' 'x86_64')
+pkgver=1.0.6
+pkgrel=1
+pkgdesc="Open Source 3D acceleration driver for nVidia cards"
+arch=('x86_64')
 url="http://nouveau.freedesktop.org/"
 license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
-depends=('libdrm' 'systemd' 'libgl')
-optdepends=('nouveau-dri:	experimental gallium3d features')
+depends=('libdrm' 'systemd' 'mesa')
 makedepends=('xorg-server' 'xf86driproto')
 conflicts=('xorg-server<1.12.3')
 options=('!libtool') # 'force')
 install=${pkgname}.install
-source=("$url/release/$pkgname-$pkgver.tar.bz2")
-md5sums=('d120bdd4ee9fc3581f3b93e3b31c4574')
+source=("http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2")
+md5sums=('140e819c983fc01ed7a52d915dcffd74')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver