[arch-commits] Commit in mesa/trunk (PKGBUILD mesa-7.1-link-shared.patch)
Jan de Groot
jgc at archlinux.org
Sat Dec 26 11:28:14 UTC 2009
Date: Saturday, December 26, 2009 @ 06:28:13
Author: jgc
Revision: 61814
upgpkg: mesa 7.7-1
Update to 7.7 - remove trident-dri, as it is no longer included
Modified:
mesa/trunk/PKGBUILD
mesa/trunk/mesa-7.1-link-shared.patch
----------------------------+
PKGBUILD | 21 ++++++---------------
mesa-7.1-link-shared.patch | 37 ++++++++++++++++++-------------------
2 files changed, 24 insertions(+), 34 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-12-26 08:43:16 UTC (rev 61813)
+++ PKGBUILD 2009-12-26 11:28:13 UTC (rev 61814)
@@ -2,8 +2,8 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgbase="mesa"
-pkgname=('mesa' 'libgl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'trident-dri') # 'nouveau-dri')
-pkgver=7.6.1
+pkgname=('mesa' 'libgl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') # 'nouveau-dri')
+pkgver=7.7
pkgrel=1
arch=(i686 x86_64)
makedepends=('glproto>=1.4.10' 'pkgconfig' 'libdrm>=2.4.17-2' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.2' 'expat>=2.0.1' 'libx11>=1.3.2' 'libxt>=1.0.7' 'gcc-libs>=4.4.2' 'dri2proto=2.1' 'python')
@@ -16,10 +16,10 @@
mesa-7.1-link-shared.patch
intel-revert-vbl.patch
LICENSE)
-md5sums=('7db4617e9e10ad3aca1b64339fd71b7d'
- 'a4226f06732a02556fcf6be290b86dff'
+md5sums=('e3fa64a1508bc23dd9de9dd2cea7cfb1'
+ '6fd616b27b9826d0faa23e08e05d9435'
'6ae05158e678f4594343f32c2ca50515'
- '9eddc02e23ec08295822911e726ae89a'
+ '8420bed348e7016ef03cac6545d68389'
'a111f4dc82e894f8801bc3fa129af7af'
'5c65a0fe315dd347e09b1f2826a1df5a')
@@ -29,7 +29,7 @@
patch -Np1 -i "${srcdir}/intel-revert-vbl.patch" || return 1
./configure --prefix=/usr \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
- --with-dri-drivers=swrast,radeon,r200,r300,r600,i810,i915,i965,unichrome,mach64,mga,r128,savage,sis,tdfx,trident \
+ --with-dri-drivers=swrast,radeon,r200,r300,r600,i810,i915,i965,unichrome,mach64,mga,r128,savage,sis,tdfx \
--disable-gallium-intel \
--enable-glx-tls \
--with-driver=dri \
@@ -187,15 +187,6 @@
make -C tdfx DESTDIR="${pkgdir}" install || return 1
}
-package_trident-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI drivers for Trident"
- conflicts=('xf86-video-trident<1.3.2-3')
-
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
- make -C trident DESTDIR="${pkgdir}" install || return 1
-}
-
#package_nouveau-dri() {
# depends=("libgl=${pkgver}")
# pkgdesc="Mesa Gallium3D DRI drivers for Nouveau"
Modified: mesa-7.1-link-shared.patch
===================================================================
--- mesa-7.1-link-shared.patch 2009-12-26 08:43:16 UTC (rev 61813)
+++ mesa-7.1-link-shared.patch 2009-12-26 11:28:13 UTC (rev 61814)
@@ -1,6 +1,6 @@
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile
---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000
+diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.da mesa-20091221/src/mesa/drivers/dri/Makefile
+--- mesa-20091221/src/mesa/drivers/dri/Makefile.da 2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/src/mesa/drivers/dri/Makefile 2009-12-21 08:43:03.000000000 +1000
@@ -6,12 +6,17 @@ include $(TOP)/configs/current
@@ -20,7 +20,7 @@
subdirs:
@for dir in $(DRI_DIRS) ; do \
-@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
+@@ -32,12 +37,14 @@ dri.pc: dri.pc.in
$(pcedit) $< > $@
@@ -36,38 +36,37 @@
$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
$(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-@@ -52,5 +59,6 @@ clean:
+@@ -51,5 +58,6 @@ clean:
(cd $$dir && $(MAKE) clean) ; \
fi \
done
+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
-rm -f common/*.o
-rm -f *.pc
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template
---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000
+diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.template.da mesa-20091221/src/mesa/drivers/dri/Makefile.template
+--- mesa-20091221/src/mesa/drivers/dri/Makefile.template.da 2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/src/mesa/drivers/dri/Makefile.template 2009-12-21 08:43:40.000000000 +1000
@@ -1,6 +1,6 @@
# -*-makefile-*-
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
- COMMON_SOURCES = \
+ COMMON_GALLIUM_SOURCES = \
../common/utils.c \
-@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO
-
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
+@@ -70,7 +70,8 @@ lib: symlinks subdirs depend
+ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
+ $(TOP)/src/mesa/drivers/dri/Makefile.template
$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-- $(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+ $(OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) \
+- $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
++ $(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+ $(DRI_LIB_DEPS)
+ $(DRI_LIB_DEPS)
- $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000
+diff -up mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da mesa-20091221/src/mesa/x86/read_rgba_span_x86.S
+--- mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da 2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/src/mesa/x86/read_rgba_span_x86.S 2009-12-21 08:43:03.000000000 +1000
@@ -77,7 +77,6 @@
*/
More information about the arch-commits
mailing list