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

[Jan de Groot]

    Date: Saturday, July 18, 2009 @ 14:19:40
  Author: jgc
Revision: 46518

upgpkg: unichrome-dri 7.5-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-18 18:13:10 UTC (rev 46517)
+++ PKGBUILD	2009-07-18 18:19:40 UTC (rev 46518)
@@ -2,18 +2,20 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=unichrome-dri
-pkgver=7.4
-pkgrel=2
+pkgver=7.5
+pkgrel=1
 pkgdesc="DRI drivers for Unichrome-based videochipsets"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libdrm>=2.4.5' 'expat>=2.0.1' "libgl>=${pkgver}")
-makedepends=('dri2proto>=1.99.3' 'glproto>=1.4.9' 'pkgconfig' 'libxfixes' 'libxdamage' 'libxxf86vm' 'libxext')
+depends=('libdrm>=2.4.12' 'expat>=2.0.1' "libgl>=${pkgver}")
+makedepends=('dri2proto>=2.1' 'glproto>=1.4.9' 'pkgconfig' 'libxfixes' 'libxdamage' 'libxxf86vm' 'libxext')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/mesa3d/MesaLib-${pkgver}.tar.bz2
-	mesa-7.1-link-shared.patch LICENSE)
-md5sums=('7ecddb341a2691e0dfdb02f697109834' 'f0baa948d9810f268413111ee439d24b'\
+        mesa-7.1-link-shared.patch
+        LICENSE)
+md5sums=('459f332551f6ebb86f384d21dd15e1f0'
+         '9eddc02e23ec08295822911e726ae89a'
          'af58249a42f58bdbf39d20ad54f3b5f9')
 
 build() {
@@ -35,5 +37,5 @@
   rm -rf "${pkgdir}/usr/lib/pkgconfig"
   rm -rf "${pkgdir}/usr/include"
   rm -f "${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so"
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }

Modified: mesa-7.1-link-shared.patch
===================================================================
--- mesa-7.1-link-shared.patch	2009-07-18 18:13:10 UTC (rev 46517)
+++ mesa-7.1-link-shared.patch	2009-07-18 18:19:40 UTC (rev 46518)
@@ -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)