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

[Jan de Groot]

    Date: Saturday, July 18, 2009 @ 14:35:38
  Author: jgc
Revision: 46524

upgpkg: xf86-video-tdfx 1.4.2-2

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-18 18:30:46 UTC (rev 46523)
+++ PKGBUILD	2009-07-18 18:35:38 UTC (rev 46524)
@@ -3,23 +3,25 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-tdfx
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org tdfx video driver"
-_mesaver="7.4.4"
+_mesaver="7.5"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=("libgl>=${_mesaver}" 'expat')
-makedepends=('pkgconfig' 'xorg-server>=1.6.0' "mesa>=${_mesaver}" 'xf86driproto' 'glproto')
-conflicts=('xorg-server<1.6.0')
+makedepends=('pkgconfig' 'xorg-server>=1.6.2' "mesa>=${_mesaver}" 'xf86driproto' 'glproto')
+conflicts=('xorg-server<1.6.2')
 options=(!libtool)
 groups=('xorg-video-drivers')
 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=('abc1e272ab184edf3cd51daa1b91ddcf' 'b66528d314c574dccbe0ed963cac5e93'\
-         'f0baa948d9810f268413111ee439d24b' '978e9486ffd4e4164c12dc68c84186e1')
+md5sums=('abc1e272ab184edf3cd51daa1b91ddcf'
+         '459f332551f6ebb86f384d21dd15e1f0'
+         '9eddc02e23ec08295822911e726ae89a'
+         '978e9486ffd4e4164c12dc68c84186e1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: mesa-7.1-link-shared.patch
===================================================================
--- mesa-7.1-link-shared.patch	2009-07-18 18:30:46 UTC (rev 46523)
+++ mesa-7.1-link-shared.patch	2009-07-18 18:35:38 UTC (rev 46524)
@@ -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)