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

[Jan de Groot]

    Date: Saturday, July 18, 2009 @ 12:09:21
  Author: jgc
Revision: 46495

upgpkg: intel-dri 7.5-1
    Include EGL driver for i915

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-18 15:56:41 UTC (rev 46494)
+++ PKGBUILD	2009-07-18 16:09:21 UTC (rev 46495)
@@ -2,21 +2,21 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=intel-dri
-pkgver=7.4.4
+pkgver=7.5
 pkgrel=1
 pkgdesc="Mesa DRI drivers for Intel chipsets"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('MIT')
-depends=('libdrm>=2.4.11' 'expat>=2.0.1' "libgl>=${pkgver}")
-makedepends=('glproto>=1.4.9' 'dri2proto=2.0' 'pkgconfig')
+depends=('libdrm>=2.4.12' 'expat>=2.0.1' "libgl>=${pkgver}")
+makedepends=('glproto>=1.4.9' 'dri2proto=2.1' 'pkgconfig')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/mesa3d/MesaLib-${pkgver}.tar.bz2
         mesa-7.1-link-shared.patch
         intel-revert-vbl.patch
         LICENSE)
-md5sums=('b66528d314c574dccbe0ed963cac5e93'
-         'f0baa948d9810f268413111ee439d24b'
+md5sums=('459f332551f6ebb86f384d21dd15e1f0'
+         '9eddc02e23ec08295822911e726ae89a'
          'a111f4dc82e894f8801bc3fa129af7af'
          'b58d7dffd436e79054e220ad1b4b4345')
 
@@ -36,6 +36,10 @@
   make || return 1
   cd src/mesa/drivers/dri || return 1
   make DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/Mesa-${pkgver}/src/gallium" || return 1
+  make || return 1
+  cd winsys/drm/intel/egl || return 1
+  make DESTDIR="${pkgdir}" install || return 1
   rm -rf "${pkgdir}/usr/lib/pkgconfig"
   rm -rf "${pkgdir}/usr/include"
   rm -f "${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so"

Modified: mesa-7.1-link-shared.patch
===================================================================
--- mesa-7.1-link-shared.patch	2009-07-18 15:56:41 UTC (rev 46494)
+++ mesa-7.1-link-shared.patch	2009-07-18 16:09:21 UTC (rev 46495)
@@ -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)