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

[Jan de Groot]

    Date: Saturday, July 18, 2009 @ 14:56:28
  Author: jgc
Revision: 46536

upgpkg: xf86-video-r128 6.8.0-6

Modified:
  xf86-video-r128/trunk/PKGBUILD
  xf86-video-r128/trunk/mesa-7.1-link-shared.patch

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-18 18:53:19 UTC (rev 46535)
+++ PKGBUILD	2009-07-18 18:56:28 UTC (rev 46536)
@@ -2,23 +2,25 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-r128
 pkgver=6.8.0
-pkgrel=5
-_mesaver="7.4"
+pkgrel=6
+_mesaver="7.5"
 pkgdesc="X.org ati Rage128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libdrm>=2.4.5' "libgl>=${_mesaver}" 'expat')
-makedepends=('pkgconfig' 'xorg-server>=1.6.0' "mesa>=${_mesaver}"
-	     'glproto>=1.4.9' 'xf86driproto' 'diffutils' 'dri2proto' 'xineramaproto')
-conflicts=('xorg-server<1.6.0')
+depends=('libdrm>=2.4.12' "libgl>=${_mesaver}" 'expat')
+makedepends=('pkgconfig' 'xorg-server>=1.6.2' "mesa>=${_mesaver}" 'glproto>=1.4.9' 'xf86driproto' 'diffutils' 'dri2proto' 'xineramaproto')
+conflicts=('xorg-server<1.6.2')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
        http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${_mesaver}.tar.bz2
-       mesa-7.1-link-shared.patch LICENSE)
-md5sums=('007bec0c6b07d9d3aeca4da18e561efb' '7ecddb341a2691e0dfdb02f697109834'\
-         'f0baa948d9810f268413111ee439d24b' '97ad034bea2a153f4418a6bb0c77acf4')
+       mesa-7.1-link-shared.patch
+       LICENSE)
+md5sums=('007bec0c6b07d9d3aeca4da18e561efb'
+         '459f332551f6ebb86f384d21dd15e1f0'
+         '9eddc02e23ec08295822911e726ae89a'
+         '97ad034bea2a153f4418a6bb0c77acf4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -44,5 +46,5 @@
   rm -f "${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so"
   rm -rf "${pkgdir}/usr/include"
   rm -rf "${pkgdir}/usr/lib/pkgconfig"
-  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:53:19 UTC (rev 46535)
+++ mesa-7.1-link-shared.patch	2009-07-18 18:56:28 UTC (rev 46536)
@@ -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)