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

Conflicts:
	abs/core-testing/LinHES-config/PKGBUILD

1 files changed, 27 insertions, 36 deletions

diff --git a/abs/core-testing/libgl/PKGBUILD b/abs/core-testing/libgl/PKGBUILD
index 43e7c58..ce2faba 100644
--- a/abs/core-testing/libgl/PKGBUILD
+++ b/abs/core-testing/libgl/PKGBUILD
@@ -1,49 +1,40 @@
-# $Id: PKGBUILD 1895 2008-05-22 17:55:59Z jgc $
+# $Id: PKGBUILD 12994 2008-09-25 18:01:13Z jgc $
 # Maintainer: Alexander Baldeck <kth5@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=libgl
-pkgver=7.0.3
-pkgrel=2
+pkgver=7.2
+pkgrel=1
 pkgdesc="Mesa DRI OpenGL library and drivers"
 arch=(i686 x86_64)
 license=('LGPL')
 url="http://www.mesa3d.org"
-depends=('libxxf86vm' 'libdrm>=2.3' 'libxdamage')
-makedepends=('imake' 'glproto>=1.4.9' 'fixesproto' 'damageproto' 'pkgconfig')
+depends=('libdrm>=2.3.1' 'libxxf86vm' 'libxdamage' 'expat>=2.0.1')
+makedepends=('dri2proto>=1.1' 'glproto>=1.4.9' 'pkgconfig')
 provides=('libgl-dri')
 replaces=('libgl-dri' 'libgl-mesa')
-source=(http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${pkgver}.tar.bz2)
-md5sums=('e6e6379d7793af40a6bc3ce1bace572e')
+options=(!makeflags)
+source=(http://downloads.sourceforge.net/mesa3d/MesaLib-${pkgver}.tar.bz2
+	mesa-7.1-link-shared.patch)
+md5sums=('04d379292e023df0b0266825cb0dbde5'
+         'f0baa948d9810f268413111ee439d24b')
 
 build() {
   cd ${startdir}/src/Mesa-${pkgver}
-
-  CONFIG="linux-dri-x86"
-  if [ "${CARCH}" = "x86_64" ]; then
-    CONFIG="linux-dri-x86-64"
-    sed -i -e "s/lib64/lib/g" configs/${CONFIG}
-  fi
-
-  echo "EXTRA_LIB_PATH =" >> configs/${CONFIG}
-  echo "OPT_FLAGS = ${CFLAGS}" >> configs/${CONFIG}
-  echo "SRC_DIRS = glx/x11 mesa" >> configs/${CONFIG}
-  rm -f include/GL/glut*h
-  echo "USING_EGL = 0" >> configs/${CONFIG}
-  echo "PROGRAM_DIRS =" >> configs/${CONFIG}
-  echo "MKDEP = makedepend" >> configs/${CONFIG}
-  echo "DRI_DIRS =" >> configs/${CONFIG}
-  echo "DRI_DRIVER_SEARCH_DIR = /usr/lib/xorg/modules/dri" >> configs/${CONFIG}
-  echo "ARCH_FLAGS += -DGLX_USE_TLS" >> configs/${CONFIG}
-  echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> configs/${CONFIG}
-
-  make ${CONFIG} || return 1
-  install -m755 -d ${startdir}/pkg/usr
-  make INSTALL_DIR=${startdir}/pkg/usr install || return 1
-
-  rm -rf ${startdir}/pkg/usr/include
-
-  install -m755 -d ${startdir}/pkg/usr/lib/xorg/modules/extensions || return 1
-  cd ${startdir}/pkg/usr/lib/xorg/modules/extensions || return 1
-  ln -sf libGLcore.xorg libGLcore.so
-  ln -sf libglx.xorg libglx.so
+  patch -Np1 -i ${srcdir}/mesa-7.1-link-shared.patch || return 1
+  ./configure --prefix=/usr \
+    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+    --with-dri-drivers=swrast \
+    --enable-glx-tls \
+    --disable-ttm-api \
+    --with-driver=dri \
+    --enable-xcb \
+    --disable-glu \
+    --disable-glut \
+    --disable-glw || return 1
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
+  rm -rf ${pkgdir}/usr/include
+  rm -rf ${pkgdir}/usr/lib/pkgconfig
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/extensions
+  ln -sf libglx.xorg ${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so || return 1
 }