Sync

lib32-glu/PKGBUILD

@@ -0,0 +1,44 @@
+# Lib32 packages for Chakra
+
+pkgname=lib32-glu
+pkgver=9.0.0
+pkgrel=1
+pkgdesc="Mesa OpenGL utility library (32 bits)"
+arch=('x86_64')
+url="http://mesa.freedesktop.org/"
+license=('LGPL')
+depends=('lib32-libgl')
+makedepends=('gcc-multilib' 'lib32-mesa')
+options=('!libtool')
+source=(ftp://ftp.freedesktop.org/pub/mesa/glu/glu-$pkgver.tar.bz2)
+sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
+
+build() {
+  cd ${srcdir}/glu-$pkgver
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  ./configure --prefix=/usr --disable-static \
+    --libdir=/usr/lib32 
+  make
+}
+
+check() {
+  cd "$srcdir/glu-$pkgver"
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  make -k check
+}
+
+package() {
+  cd ${srcdir}/glu-$pkgver
+
+  make DESTDIR=${pkgdir} install
+  
+  rm -rf ${pkgdir}/usr/include
+}

lib32-mesa/PKGBUILD

@@ -5,18 +5,19 @@
 
 pkgbase=lib32-mesa
 pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi')
-pkgver=8.0.4
-pkgrel=5
+pkgver=9.0.1
+pkgrel=1
 arch=(x86_64)
 makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.37' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 
-             'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'lib32-gcc-libs>=4.5' 'lib32-llvm>=3.0' 
+             'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'lib32-gcc-libs>=4.7' 'lib32-llvm>=3.2' 
              'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'libvdpau')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
-	'mesa-8.0.3-llvm-3.1-fixes.patch')
-md5sums=('d546f988adfdf986cff45b1efa2d8a46'
-         '0082f4d17674155aa13bc611a5687788')
+	'llvm32.patch')
+
+md5sums=('97d6554c05ea7449398afe3a0ede7018'
+         '10752f954215ca73e632627e5c14fa65')
 
 build() {
   export CFLAGS="-m32"
@@ -28,7 +29,7 @@ build() {
 
   cd "${srcdir}/Mesa-${pkgver}" 
 
-  patch -p1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
+  patch -p1 -i "${srcdir}/llvm32.patch"
 
   autoreconf -vfi
    
@@ -43,11 +44,12 @@ build() {
     --enable-shared-glapi\
     --enable-glx-tls \
     --enable-dri \
+    --disable-gbm \
     --enable-glx \
     --enable-osmesa \
     --enable-gles1 \
     --enable-gles2 \
-    --enable-egl \
+    --disable-egl \
     --enable-texture-float \
     --enable-shared-dricore \
     --enable-xa \
@@ -59,6 +61,9 @@ build() {
       -e '42s,\$(CC),$(CC) -m32,' \
       -i src/gallium/state_trackers/xa/Makefile
 
+  # fix a build break with new llvm
+  sed -i "s:-Werror=implicit-function-declaration::" src/gallium/drivers/r600/Makefile
+
   make
 }
 
@@ -73,8 +78,8 @@ package_lib32-libgl() {
   install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions"
 
   bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/"
-  bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/"
   bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/"
+  bin/minstall lib32/libdricore9.0.1.so* "${pkgdir}/usr/lib/"
 
   cd src/mesa/drivers/dri
   make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
@@ -99,7 +104,7 @@ package_lib32-libglapi() {
 }
 
 package_lib32-mesa() {
-  depends=('lib32-libglapi' 'lib32-libgl' 'lib32-libx11>=1.4.5' 'lib32-libxt>=1.1.1' "mesa=${pkgver}")
+  depends=('lib32-libglapi' 'lib32-libgl' 'lib32-libx11>=1.4.5' 'lib32-libxt>=1.1.1' "mesa=${pkgver}" "glu")
   pkgdesc="Mesa 3-D graphics libraries and include files (ELF32)"
   provides=('lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-svga-dri')
   conflicts=('lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-svga-dri' 'lib32-udev')
@@ -112,6 +117,7 @@ package_lib32-mesa() {
 
   rm -f "${pkgdir}/usr/lib32/libglapi.so"*
   rm -f "${pkgdir}/usr/lib32/libGL.so"*
+  rm -f "${pkgdir}/usr/lib32/libdricore9.0.1.so"*
   rm -f "${pkgdir}/usr/lib32/xorg/modules/dri/swrast_dri.so"*
   rm -rf "${pkgdir}/usr/include"