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

[Jan de Groot]

    Date: Saturday, July 18, 2009 @ 14:53:06
  Author: jgc
Revision: 46533

upgpkg: xf86-video-sis 0.10.1-5

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-18 18:48:58 UTC (rev 46532)
+++ PKGBUILD	2009-07-18 18:53:06 UTC (rev 46533)
@@ -3,22 +3,25 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-sis
 pkgver=0.10.1
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org SiS video driver"
-_mesaver="7.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' 'xf86driproto' 'mesa>=7.1' 'glproto>=1.4.9' 'dri2proto>=1.99.3' 'xf86dgaproto' 'xineramaproto')
-conflicts=('xorg-server<1.6.0')
+makedepends=('pkgconfig' 'xorg-server>=1.6.2' 'xf86driproto' 'mesa>=7.5' 'glproto>=1.4.9' 'dri2proto>=2.1' 'xf86dgaproto' 'xineramaproto')
+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/mesa3d/MesaLib-${_mesaver}.tar.bz2
-	mesa-7.1-link-shared.patch LICENSE)
-md5sums=('9f57c2f5ccbd8340db32da1c74083771' '7ecddb341a2691e0dfdb02f697109834'\
-         'f0baa948d9810f268413111ee439d24b' 'e33e023e3d811d28a8ed3bfbd2bf5672')
+        http://downloads.sourceforge.net/mesa3d/MesaLib-${_mesaver}.tar.bz2
+        mesa-7.1-link-shared.patch
+        LICENSE)
+md5sums=('9f57c2f5ccbd8340db32da1c74083771'
+         '459f332551f6ebb86f384d21dd15e1f0'
+         '9eddc02e23ec08295822911e726ae89a'
+         'e33e023e3d811d28a8ed3bfbd2bf5672')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -45,5 +48,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:48:58 UTC (rev 46532)
+++ mesa-7.1-link-shared.patch	2009-07-18 18:53:06 UTC (rev 46533)
@@ -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)