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

[Jan de Groot]

    Date: Saturday, July 18, 2009 @ 14:30:33
  Author: jgc
Revision: 46521

upgpkg: ati-dri 7.5-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-18 18:19:53 UTC (rev 46520)
+++ PKGBUILD	2009-07-18 18:30:33 UTC (rev 46521)
@@ -2,21 +2,21 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 pkgname=ati-dri
-pkgver=7.4.4
+pkgver=7.5
 pkgrel=1
 pkgdesc="DRI drivers for ATI/AMD videochips"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('MIT')
-depends=('libdrm>=2.4.11' "libgl>=${pkgver}" 'expat>=2.0.1')
-makedepends=('glproto>=1.4.9' 'pkgconfig' 'libxfixes' 'libxdamage' 'libxxf86vm' 'libxext' 'dri2proto=2.0' "mesa>=${pkgver}")
+depends=('libdrm>=2.4.12' "libgl>=${pkgver}" 'expat>=2.0.1')
+makedepends=('glproto>=1.4.9' 'pkgconfig' 'libxfixes' 'libxdamage' 'libxxf86vm' 'libxext' 'dri2proto=2.1' "mesa>=${pkgver}")
 conflicts=('xf86-video-ati<6.9.0-6')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${pkgver}.tar.bz2
         mesa-7.1-link-shared.patch
         LICENSE)
-md5sums=('b66528d314c574dccbe0ed963cac5e93'
-         'f0baa948d9810f268413111ee439d24b'
+md5sums=('459f332551f6ebb86f384d21dd15e1f0'
+         '9eddc02e23ec08295822911e726ae89a'
          '7ba429de367a2b3d273d2230cc705771')
 
 build() {
@@ -34,7 +34,7 @@
   make || return 1
   cd src/mesa/drivers/dri || return 1
   make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 "${srcdir}/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -D -m644 "${srcdir}/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" || return 1
   rm -f "${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so"
   rm -rf "${pkgdir}/usr/include"
   rm -rf "${pkgdir}/usr/lib/pkgconfig"

Modified: mesa-7.1-link-shared.patch
===================================================================
--- mesa-7.1-link-shared.patch	2009-07-18 18:19:53 UTC (rev 46520)
+++ mesa-7.1-link-shared.patch	2009-07-18 18:30:33 UTC (rev 46521)
@@ -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)