[arch-commits] Commit in mesa/trunk (4 files)
Jan de Groot
jgc at archlinux.org
Mon Aug 3 19:41:23 UTC 2009
Date: Monday, August 3, 2009 @ 15:41:23
Author: jgc
Revision: 48757
- build using makepkg 3.3 split package support.
- every driver is a package now. This will replace the included DRI drivers in each 2D driver.
- Add some fixes from git, mainly intel and amd fixes.
Added:
mesa/trunk/git-fixes.patch
mesa/trunk/intel-revert-vbl.patch
(from rev 48756, intel-dri/trunk/intel-revert-vbl.patch)
mesa/trunk/mesa-7.1-link-shared.patch
(from rev 48756, libgl/trunk/mesa-7.1-link-shared.patch)
Modified:
mesa/trunk/PKGBUILD
----------------------------+
PKGBUILD | 167 ++++++++++++++++++++++++++++++++++++----
git-fixes.patch | 179 +++++++++++++++++++++++++++++++++++++++++++
intel-revert-vbl.patch | 21 +++++
mesa-7.1-link-shared.patch | 102 ++++++++++++++++++++++++
4 files changed, 452 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-08-03 16:32:15 UTC (rev 48756)
+++ PKGBUILD 2009-08-03 19:41:23 UTC (rev 48757)
@@ -1,45 +1,178 @@
# $Id$
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
-pkgname=mesa
+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')
pkgver=7.5
-pkgrel=1
-pkgdesc="Mesa OpenGL library"
+pkgrel=2
arch=(i686 x86_64)
-license=('LGPL')
+makedepends=('glproto' 'pkgconfig' 'libdrm>=2.4.12' 'libxxf86vm' 'libxdamage' 'expat>=2.0.1' 'libx11>=1.2.2' 'libxt' 'gcc-libs' 'dri2proto=2.1')
url="http://mesa3d.sourceforge.net"
-depends=('libgl' 'libx11>=1.2.1' 'libxt' 'gcc-libs>=4.4.0' 'dri2proto=2.1' 'libdrm>=2.4.12')
-makedepends=('pkgconfig' 'glproto>=1.4.9')
-conflicts=('mesa-apps')
-replaces=('mesa-apps')
+license=('custom')
+options=(!makeflags)
source=(http://downloads.sourceforge.net/mesa3d/MesaLib-${pkgver}.tar.bz2
http://downloads.sourceforge.net/mesa3d/MesaDemos-${pkgver}.tar.bz2
- ftp://ftp.archlinux.org/other/mesa/gl-manpages-1.0.1.tar.bz2)
+ ftp://ftp.archlinux.org/other/mesa/gl-manpages-1.0.1.tar.bz2
+ mesa-7.1-link-shared.patch
+ intel-revert-vbl.patch
+ LICENSE
+ git-fixes.patch)
md5sums=('459f332551f6ebb86f384d21dd15e1f0'
'398ee8801814a00e47f6c2314e3dfddc'
- '6ae05158e678f4594343f32c2ca50515')
+ '6ae05158e678f4594343f32c2ca50515'
+ '9eddc02e23ec08295822911e726ae89a'
+ 'a111f4dc82e894f8801bc3fa129af7af'
+ '5c65a0fe315dd347e09b1f2826a1df5a'
+ 'dcfc0a49080ea6ad8b848b5ad92e1a2d')
build() {
cd "${srcdir}/Mesa-${pkgver}"
+ patch -Np1 -i "${srcdir}/mesa-7.1-link-shared.patch" || return 1
+ patch -Np1 -i "${srcdir}/git-fixes.patch" || return 1
+ 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 \
+ --with-dri-drivers=swrast,radeon,r200,r300,i810,i915,i965,unichrome,mach64,mga,r128,savage,sis,tdfx,trident \
--enable-glx-tls \
--with-driver=dri \
--enable-xcb \
--disable-glut || return 1
make || return 1
+
+ cd "${srcdir}/gl-manpages-1.0.1"
+ ./configure --prefix=/usr || return 1
+ make || return 1
+}
+
+package_libgl() {
+ depends=('libdrm>=2.4.12' 'libxxf86vm' 'libxdamage' 'expat>=2.0.1')
+ pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
+
+ cd "${srcdir}/Mesa-${pkgver}" || return 1
+ install -m755 -d "${pkgdir}/usr/lib" || return 1
+ install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
+
+ bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/" || return 1
+
+ cd src/mesa/drivers/dri
+ make -C swrast DESTDIR="${pkgdir}" install || return 1
+ install -m755 libdricore.so "${pkgdir}/usr/lib/xorg/modules/dri/" || return 1
+ ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" || return 1
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
+ install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" || return 1
+}
+
+package_mesa() {
+ depends=('libgl' 'libx11>=1.2.2' 'libxt' 'gcc-libs>=4.4.1' 'dri2proto=2.1' 'libdrm>=2.4.12')
+ pkgdesc="Mesa 3-D graphics libraries and include files"
+
+ cd "${srcdir}/Mesa-${pkgver}" || return 1
make DESTDIR="${pkgdir}" install || return 1
-
install -m755 -d "${pkgdir}/usr/bin"
install -m755 progs/xdemos/glx{gears,info} "${pkgdir}/usr/bin/" || return 1
rm -f "${pkgdir}/usr/lib/libGL.so"*
rm -rf "${pkgdir}/usr/lib/xorg"
- cd "${srcdir}/gl-manpages-1.0.1"
- ./configure --prefix=/usr || return 1
- make || return 1
+ cd "${srcdir}/gl-manpages-1.0.1" || return 1
make DESTDIR="${pkgdir}" install || return 1
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+ install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" || return 1
}
+
+package_ati-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for AMD/ATI Radeon"
+ conflicts=('xf86-video-ati<6.9.0-6')
+
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
+ make -C radeon DESTDIR="${pkgdir}" install || return 1
+ make -C r200 DESTDIR="${pkgdir}" install || return 1
+ make -C r300 DESTDIR="${pkgdir}" install || return 1
+}
+
+package_intel-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for Intel"
+
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
+ make -C i810 DESTDIR="${pkgdir}" install || return 1
+ make -C i915 DESTDIR="${pkgdir}" install || return 1
+ make -C i965 DESTDIR="${pkgdir}" install || return 1
+
+ cd "${srcdir}/Mesa-${pkgver}/src/gallium/winsys/drm/intel/egl"
+ make DESTDIR="${pkgdir}" install || return 1
+}
+
+package_unichrome-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
+
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
+ make -C unichrome DESTDIR="${pkgdir}" install || return 1
+}
+
+package_mach64-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for ATI Mach64"
+ conflicts=('xf86-video-mach64<6.8.2')
+
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
+ make -C mach64 DESTDIR="${pkgdir}" install || return 1
+}
+
+package_mga-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for Matrox"
+ conflicts=('xf86-video-mga<1.4.11')
+
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
+ make -C mga DESTDIR="${pkgdir}" install || return 1
+}
+
+package_r128-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for ATI Rage128"
+ conflicts=('xf86-video-r128<6.8.1')
+
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
+ make -C r128 DESTDIR="${pkgdir}" install || return 1
+}
+
+package_savage-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
+ conflicts=('xf86-video-savage<2.3.1')
+
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
+ make -C savage DESTDIR="${pkgdir}" install || return 1
+}
+
+package_sis-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for SiS"
+ conflicts=('xf86-video-sis<0.10.2')
+
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
+ make -C sis DESTDIR="${pkgdir}" install || return 1
+}
+
+package_tdfx-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for 3dfx"
+ conflicts=('xf86-video-tdfx<1.4.3')
+
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
+ 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
+}
Added: git-fixes.patch
===================================================================
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2009-08-03 19:41:23 UTC (rev 48757)
@@ -0,0 +1,179 @@
+From 5ed440400573631f540701f3efd479d8c1592007 Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <daenzer at vmware.com>
+Date: Mon, 20 Jul 2009 18:26:28 +0000
+Subject: radeon: With DRI1, if we have HW stencil, only expose fbconfigs with stencil.
+
+Otherwise simple apps like glxgears pick up a DirectColor visual since the X
+server mixes the depth 32 visual in with the other GLX visuals, and this seems
+to result in a (mostly) black screen due to a bad ColorMap for a lot of people.
+
+The bad ColorMap may be a bug in the apps, the X server or X driver, and
+regardless of that I think the X server should ideally make the depth 32 GLX
+visual separate from the rest again, but in the meantime this makes us cope.
+
+(depth_bits is either 16 or 24, never 0)
+---
+diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
+index 791f598..a977bed 100644
+--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
++++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
+@@ -283,12 +283,12 @@ radeonFillInModes( __DRIscreenPrivate *psp,
+ * with a stencil buffer. It will be a sw fallback, but some apps won't
+ * care about that.
+ */
+- stencil_bits_array[0] = 0;
++ stencil_bits_array[0] = stencil_bits;
+ stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits;
+
+ msaa_samples_array[0] = 0;
+
+- depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 2 : 1;
++ depth_buffer_factor = (stencil_bits == 0) ? 2 : 1;
+ back_buffer_factor = (have_back_buffer) ? 2 : 1;
+
+ if (pixel_bits == 16) {
+--
+cgit v0.8.2
+From 1b445f96737cf5a1a28e81ff94a2e07b2cac3a96 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric at anholt.net>
+Date: Tue, 21 Jul 2009 00:58:12 +0000
+Subject: i965: Don't clip everything if FRONT_AND_BACK culling while culling disabled.
+
+Fixes everything-black with meta_clear_tris on quake4-mpdemo and doom3-demo.
+
+Bug #18844, 22077.
+(cherry picked from commit 81d555068408d4343d7627c8bedda5675f09bd21)
+---
+diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c
+index 5cffceb..8fc9f89 100644
+--- a/src/mesa/drivers/dri/i965/brw_clip.c
++++ b/src/mesa/drivers/dri/i965/brw_clip.c
+@@ -152,7 +152,8 @@ static void upload_clip_prog(struct brw_context *brw)
+
+ /* _NEW_POLYGON */
+ if (key.primitive == GL_TRIANGLES) {
+- if (ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
++ if (ctx->Polygon.CullFlag &&
++ ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
+ key.clip_mode = BRW_CLIPMODE_REJECT_ALL;
+ else {
+ GLuint fill_front = CLIP_CULL;
+--
+cgit v0.8.2
+From a6b314150c141f4c73e408b114181e57237540d9 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric at anholt.net>
+Date: Fri, 03 Jul 2009 02:21:22 +0000
+Subject: intel: Fall back on glBitmap with fog enabled.
+
+We would have to build the program with the appropriate fog mode, and
+also supply the fog coordinate if appropriate.
+
+Bug #19413.
+(cherry picked from commit 8ae02a3919bf31bd33f86208472e100eedb58497)
+---
+diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
+index a2ccae1..d137aef 100644
+--- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
++++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
+@@ -409,6 +409,12 @@ intel_texture_bitmap(GLcontext * ctx,
+ return GL_FALSE;
+ }
+
++ if (ctx->Fog.Enabled) {
++ if (INTEL_DEBUG & DEBUG_FALLBACKS)
++ fprintf(stderr, "glBitmap() fallback: fog\n");
++ return GL_FALSE;
++ }
++
+ /* Check that we can load in a texture this big. */
+ if (width > (1 << (ctx->Const.MaxTextureLevels - 1)) ||
+ height > (1 << (ctx->Const.MaxTextureLevels - 1))) {
+--
+cgit v0.8.2
+From 722d136f7bd3390c72bca175831647d93393e92d Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp at vmware.com>
+Date: Mon, 27 Jul 2009 21:28:49 +0000
+Subject: intel: Clean up leak of driver context structure on context destroy.
+
+(cherry picked from commit ddef7dc87b2001fbe117ee5f24a0c645ee95a03c)
+---
+diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
+index cfd983d..9db5b54 100644
+--- a/src/mesa/drivers/dri/intel/intel_context.c
++++ b/src/mesa/drivers/dri/intel/intel_context.c
+@@ -804,6 +804,9 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
+
+ /* free the Mesa context */
+ _mesa_free_context_data(&intel->ctx);
++
++ FREE(intel);
++ driContextPriv->driverPrivate = NULL;
+ }
+ }
+
+--
+cgit v0.8.2
+From 3dbaf68bdc1f7427a60bdcc8da635ae7a27aa3cd Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp at vmware.com>
+Date: Mon, 27 Jul 2009 21:32:50 +0000
+Subject: intel: Fix leak of DRI option info due to using the wrong free routine.
+
+(cherry picked from commit 6d66f23c50ebe8f973757b6fd1b81c9b7920c447)
+---
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index 2c6e264..f810850 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -305,7 +305,7 @@ intelDestroyScreen(__DRIscreenPrivate * sPriv)
+
+ dri_bufmgr_destroy(intelScreen->bufmgr);
+ intelUnmapScreenRegions(intelScreen);
+- driDestroyOptionCache(&intelScreen->optionCache);
++ driDestroyOptionInfo(&intelScreen->optionCache);
+
+ FREE(intelScreen);
+ sPriv->private = NULL;
+--
+From 7d93f817c9c5222e2bdbaa9fa9f03fc502bfe878 Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp at vmware.com>
+Date: Thu, 30 Jul 2009 14:20:01 +0000
+Subject: mesa: add missing return after catching program error
+
+---
+diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
+index 0d4f13c..1089792 100644
+--- a/src/mesa/shader/arbprogparse.c
++++ b/src/mesa/shader/arbprogparse.c
+@@ -2008,6 +2008,7 @@ parse_param (GLcontext * ctx, const GLubyte ** inst, struct var_cache **vc_head,
+ program_error(ctx, Program->Position,
+ "Declared parameter array length does not match parameter list");
+ }
++ return 1;
+ }
+
+ (*inst)++;
+--
+cgit v0.8.2
+From 35e3449ad7a01c63219249b37886d59e93cbf7ac Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp at vmware.com>
+Date: Thu, 30 Jul 2009 15:02:27 +0000
+Subject: mesa: move misplaced return statement
+
+Fixes regression from commit 7d93f817c9c5222e2bdbaa9fa9f03fc502bfe878
+---
+diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
+index 1089792..8607940 100644
+--- a/src/mesa/shader/arbprogparse.c
++++ b/src/mesa/shader/arbprogparse.c
+@@ -2007,8 +2007,8 @@ parse_param (GLcontext * ctx, const GLubyte ** inst, struct var_cache **vc_head,
+ if (specified_length != (int)param_var->param_binding_length) {
+ program_error(ctx, Program->Position,
+ "Declared parameter array length does not match parameter list");
++ return 1;
+ }
+- return 1;
+ }
+
+ (*inst)++;
+--
+cgit v0.8.2
Copied: mesa/trunk/intel-revert-vbl.patch (from rev 48756, intel-dri/trunk/intel-revert-vbl.patch)
===================================================================
--- intel-revert-vbl.patch (rev 0)
+++ intel-revert-vbl.patch 2009-08-03 19:41:23 UTC (rev 48757)
@@ -0,0 +1,21 @@
+commit 532d2051245a1d8afe7ca236f1d966d555bb121a
+Author: Dave Airlie <airlied at linux.ie>
+Date: Fri Sep 12 17:21:25 2008 +1000
+
+ Revert "intel: sync to vblank by default"
+
+ This reverts commit e9bf3e4cc9a7e4bcd4c45bd707541d26ecdf0409.
+
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index c193830..f02192d 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -55,7 +55,7 @@ PUBLIC const char __driConfigOptions[] =
+ DRI_CONF_BEGIN
+ DRI_CONF_SECTION_PERFORMANCE
+ DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
+- DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC)
++ DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
+ /* Options correspond to DRI_CONF_BO_REUSE_DISABLED,
+ * DRI_CONF_BO_REUSE_ALL
+ */
Copied: mesa/trunk/mesa-7.1-link-shared.patch (from rev 48756, libgl/trunk/mesa-7.1-link-shared.patch)
===================================================================
--- mesa-7.1-link-shared.patch (rev 0)
+++ mesa-7.1-link-shared.patch 2009-08-03 19:41:23 UTC (rev 48757)
@@ -0,0 +1,102 @@
+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
+@@ -6,12 +6,17 @@ include $(TOP)/configs/current
+
+
+
+-default: $(TOP)/$(LIB_DIR) subdirs dri.pc
++default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs dri.pc
+
+
+ $(TOP)/$(LIB_DIR):
+ -mkdir $(TOP)/$(LIB_DIR)
+
++libdricore.so:
++ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
++
++$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
++ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
+
+ subdirs:
+ @for dir in $(DRI_DIRS) ; do \
+@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
+ $(pcedit) $< > $@
+
+
+-install: dri.pc
++install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
+ @for dir in $(DRI_DIRS) ; do \
+ if [ -d $$dir ] ; then \
+ (cd $$dir && $(MAKE) install) || exit 1 ; \
+ fi \
+ done
++ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
++ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+ $(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:
+ (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
+@@ -1,6 +1,6 @@
+ # -*-makefile-*-
+
+-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
++MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
+
+ COMMON_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
+ $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+- $(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)
+
+
+ $(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
+@@ -77,7 +77,6 @@
+ */
+
+ .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
+-.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
+ .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
+ _generic_read_RGBA_span_BGRA8888_REV_MMX:
+ pushl %ebx
+@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
+ */
+
+ .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
+-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
+ .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
+ _generic_read_RGBA_span_BGRA8888_REV_SSE:
+ pushl %esi
+@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
+
+ .text
+ .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
+-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
+ .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
+ _generic_read_RGBA_span_BGRA8888_REV_SSE2:
+ pushl %esi
+@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
+
+ .text
+ .globl _generic_read_RGBA_span_RGB565_MMX
+- .hidden _generic_read_RGBA_span_RGB565_MMX
+ .type _generic_read_RGBA_span_RGB565_MMX, @function
+
+ _generic_read_RGBA_span_RGB565_MMX:
More information about the arch-commits
mailing list