[arch-commits] Commit in libgl/trunk (PKGBUILD mesa-7.1-link-shared.patch)

[Jan de Groot]

    Date: Saturday, July 18, 2009 @ 10:51:40
  Author: jgc
Revision: 46481

upgpkg: libgl 7.5-1
    Update to 7.5 - update link-shared patch, though we might want to patch EGL in the same way soon. Disable gallium-intel, as we want that driver in intel-dri

Modified:
  libgl/trunk/PKGBUILD
  libgl/trunk/mesa-7.1-link-shared.patch

----------------------------+
 PKGBUILD                   |   13 +++++++------
 mesa-7.1-link-shared.patch |    8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-18 14:32:06 UTC (rev 46480)
+++ PKGBUILD	2009-07-18 14:51:40 UTC (rev 46481)
@@ -2,21 +2,21 @@
 # Maintainer: Alexander Baldeck <kth5 at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=libgl
-pkgver=7.4.4
+pkgver=7.5
 pkgrel=1
 pkgdesc="Mesa DRI OpenGL library and drivers"
 arch=(i686 x86_64)
 license=('LGPL')
 url="http://www.mesa3d.org"
-depends=('libdrm>=2.4.11' 'libxxf86vm' 'libxdamage' 'expat>=2.0.1')
-makedepends=('dri2proto=2.0' 'glproto>=1.4.9' 'pkgconfig')
+depends=('libdrm>=2.4.12' 'libxxf86vm' 'libxdamage' 'expat>=2.0.1')
+makedepends=('dri2proto=2.1' 'glproto>=1.4.9' 'pkgconfig')
 provides=('libgl-dri')
 replaces=('libgl-dri' 'libgl-mesa')
 options=(!makeflags)
 source=(http://downloads.sourceforge.net/mesa3d/MesaLib-${pkgver}.tar.bz2
       	mesa-7.1-link-shared.patch)
-md5sums=('b66528d314c574dccbe0ed963cac5e93'
-         'f0baa948d9810f268413111ee439d24b')
+md5sums=('459f332551f6ebb86f384d21dd15e1f0'
+         '9eddc02e23ec08295822911e726ae89a')
 
 build() {
   cd "${startdir}/src/Mesa-${pkgver}"
@@ -29,7 +29,8 @@
     --enable-xcb \
     --disable-glu \
     --disable-glut \
-    --disable-glw || return 1
+    --disable-glw \
+    --disable-gallium-intel || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
   rm -rf "${pkgdir}/usr/include"

Modified: mesa-7.1-link-shared.patch
===================================================================
--- mesa-7.1-link-shared.patch	2009-07-18 14:32:06 UTC (rev 46480)
+++ mesa-7.1-link-shared.patch	2009-07-18 14:51:40 UTC (rev 46481)
@@ -5,8 +5,8 @@
  
  
  
--default: $(TOP)/$(LIB_DIR) subdirs
-+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs
+-default: $(TOP)/$(LIB_DIR) subdirs dri.pc
++default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs dri.pc
  
  
  $(TOP)/$(LIB_DIR):
@@ -58,8 +58,8 @@
  
  $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
  	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		$(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+		$(OBJECTS) $(WINOBJ) \
+-		$(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
++		$(OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) \
 +		-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
 +		$(DRI_LIB_DEPS)