Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2012-05-08 18:01:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2012-03-23 15:11:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2012-05-08 18:01:18.000000000 +0200 @@ -1,0 +2,25 @@ +Wed Apr 25 14:14:35 UTC 2012 - [email protected] + +- Added patches from upstream Master to enable building with + llvm 3.1 + +------------------------------------------------------------------- +Wed Apr 25 13:17:59 UTC 2012 - [email protected] + +- For full OpenGL 3.0 compliance, it is necessary to + have floating-point textures, so Mesa is now compiled with + "--enable-texture-float" parameter to have OpenGL 3.0 support. +- disabling glut/glw no longer required since it's no longer + shipped with Mesa + +------------------------------------------------------------------- +Mon Apr 23 15:09:29 UTC 2012 - [email protected] + +- Enable xa state tracker and svga gallium drivers (vmwgfx stack) + +------------------------------------------------------------------- +Sun Apr 15 18:10:39 CEST 2012 - [email protected] + +- use same dri drivers on ia64 as on ppc (no drm_intel) + +------------------------------------------------------------------- Old: ---- MesaLib-8.0.1.tar.bz2 U_gallium-rtasm-properly-detect-SSE-and-SSE2.patch New: ---- mesa-8.0.2.tar.gz upstream-llvm-patch.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.y3GgrS/_old 2012-05-08 18:01:22.000000000 +0200 +++ /var/tmp/diff_new_pack.y3GgrS/_new 2012-05-08 18:01:22.000000000 +0200 @@ -17,10 +17,11 @@ # -%define _version 8.0.1 +%define _version 8.0.2 +%define _name_archive mesa Name: Mesa -Version: 8.0.1 +Version: 8.0.2 Release: 0 BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -75,7 +76,7 @@ Summary: System for rendering interactive 3-D graphics License: MIT Group: System/Libraries -Source: MesaLib-%{_version}.tar.bz2 +Source: %{_name_archive}-%{_version}.tar.gz Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 @@ -85,8 +86,8 @@ Patch1: Mesa-nodate.diff # to be upstreamed Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch -# already upstream -Patch12: U_gallium-rtasm-properly-detect-SSE-and-SSE2.patch +# Patch from upstream master to resolve build issues with llvm 3.1 +Patch12: upstream-llvm-patch.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -349,6 +350,35 @@ This package provides the development environment for compiling programs against the GBM library. +%package -n libxatracker1 +Summary: XA state tracker +Group: System/Libraries +Version: 1.0.0 +Release: 0 + +%description -n libxatracker1 +This package contains the XA state tracker for gallium3D driver. +It superseeds the Xorg state tracker and provides an infrastructure +to accelerate Xorg 2D operations. It is currently used by vmwgfx +video driver. + +%package -n libxatracker-devel +Summary: Development files for the XA API +Group: Development/Libraries/C and C++ +Version: 1.0.0 +Release: 0 +Requires: libxatracker1 = %version + +%description -n libxatracker-devel +This package contains the XA state tracker for gallium3D driver. +It superseeds the Xorg state tracker and provides an infrastructure +to accelerate Xorg 2D operations. It is currently used by vmwgfx +video driver. + +This package provides the development environment for compiling +programs against the XA state tracker. + + %package -n Mesa-libglapi0 Summary: Free implementation of the GL API Group: System/Libraries @@ -358,13 +388,10 @@ functions. It is intended to be mainly used by the Mesa-libGLES* packages. + %prep -%setup -n %{name}-%{_version} -b4 -q +%setup -n %{_name_archive}-%{_version} -b4 -q %patch1 -p1 -# no need to build (GLUT-)Demos -rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl} -# we use freeglut -rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h} # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} #%patch11 -p1 @@ -377,20 +404,21 @@ export TALLOC_LIBS=-ltalloc export TALLOC_CFLAGS="-I/usr/include" autoreconf -fi -%configure --disable-glw \ - --enable-gles1 \ +%configure --enable-gles1 \ --enable-gles2 \ --with-driver=dri \ --with-egl-platforms=x11,drm \ --enable-shared-glapi \ --enable-shared-dricore \ + --enable-xa \ + --enable-texture-float \ --with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \ %ifarch %ix86 x86_64 --enable-gallium-llvm \ --with-dri-drivers=i915,i965,nouveau,r200,radeon \ - --with-gallium-drivers=r300,r600,nouveau,swrast \ + --with-gallium-drivers=r300,r600,nouveau,swrast,svga \ %endif -%ifarch ppc ppc64 %sparc hppa +%ifarch ia64 ppc ppc64 %sparc hppa --with-dri-drivers=nouveau,r200,radeon \ --with-gallium-drivers=r300,r600,nouveau,swrast \ %endif @@ -398,7 +426,6 @@ --with-dri-drivers=swrast \ --with-gallium-drivers="" \ %endif - --disable-glut \ CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT @@ -406,8 +433,6 @@ make realclean %configure --with-driver=xlib \ --disable-glu \ - --disable-glw \ - --disable-glut \ --with-gallium-drivers="" \ CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" sed -i 's/GL_LIB = .*/GL_LIB = IndirectGL/g' configs/autoconf @@ -466,6 +491,10 @@ %postun -n libgbm1 -p /sbin/ldconfig +%post -n libxatracker1 -p /sbin/ldconfig + +%postun -n libxatracker1 -p /sbin/ldconfig + %post -n Mesa-libglapi0 -p /sbin/ldconfig %postun -n Mesa-libglapi0 -p /sbin/ldconfig @@ -551,6 +580,16 @@ %_libdir/libgbm.so %_libdir/pkgconfig/gbm.pc +%files -n libxatracker1 +%defattr(-,root,root) +%_libdir/libxatracker.so.1* + +%files -n libxatracker-devel +%defattr(-,root,root) +%_includedir/xa_*.h +%_libdir/libxatracker.so +%_libdir/pkgconfig/xatracker.pc + %files -n Mesa-libglapi0 %defattr(-,root,root) %_libdir/libglapi.so.0* ++++++ Mesa-nodate.diff ++++++ --- /var/tmp/diff_new_pack.y3GgrS/_old 2012-05-08 18:01:22.000000000 +0200 +++ /var/tmp/diff_new_pack.y3GgrS/_new 2012-05-08 18:01:22.000000000 +0200 @@ -1,8 +1,18 @@ -Index: Mesa-7.11.1/src/mesa/main/es_generator.py -=================================================================== ---- Mesa-7.11.1.orig/src/mesa/main/es_generator.py 2011-11-17 20:45:06.000000000 +0100 -+++ Mesa-7.11.1/src/mesa/main/es_generator.py 2012-03-01 09:27:01.392009165 +0100 -@@ -182,9 +182,8 @@ print """/* DO NOT EDIT **************** +From da91936f74e4195fbb3ed4da0eaecb9f1ec66972 Mon Sep 17 00:00:00 2001 +From: Tobias Johannes Klausmann <[email protected]> +Date: Fri, 20 Apr 2012 14:09:50 +0200 +Subject: [PATCH] PATCH-FIX-OPENSUSE do not put dates in sources to fix + build-compare + +--- + src/mesa/main/es_generator.py | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py +index cad3dea..0dde6f7 100644 +--- a/src/mesa/main/es_generator.py ++++ b/src/mesa/main/es_generator.py +@@ -182,9 +182,8 @@ print """/* DO NOT EDIT ************************************************* * THIS FILE AUTOMATICALLY GENERATED BY THE %s SCRIPT * API specification file: %s * GLES version: %s @@ -13,3 +23,6 @@ # The headers we choose are version-specific. print """ +-- +1.7.7 + ++++++ u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch ++++++ --- /var/tmp/diff_new_pack.y3GgrS/_old 2012-05-08 18:01:22.000000000 +0200 +++ /var/tmp/diff_new_pack.y3GgrS/_new 2012-05-08 18:01:22.000000000 +0200 @@ -1,26 +1,27 @@ -From c588b0b65658821e6dbc6887ee07637a64d9c037 Mon Sep 17 00:00:00 2001 -From: Egbert Eich <[email protected]> -Date: Fri, 10 Jun 2011 07:59:21 +0200 -Subject: [PATCH] [SWrast, BindTexImage] Fix crash in swrast when setting a texture for a pixmap. -Patch-mainline: To be upstreamed - -When glXBindTexImageEXT is called and SWrast is used there will be a crash -when sPriv->swrast_loader->getImage() is called from swrastSetTexBuffer2(). -Reason: no memory has been allocated for the destination thus texImage->Data -is NULL. -Call ctx->Driver.TexImage2D() to initialize this. If memory has been allocated -in a previous call free it first. +From 26de08de6f27a5fe5fc6aaeee0ebedf40626ab04 Mon Sep 17 00:00:00 2001 +From: Tobias Johannes Klausmann <[email protected]> +Date: Fri, 20 Apr 2012 11:52:31 +0200 +Subject: [PATCH] When glXBindTexImageEXT is called and SWrast is used there + will be a crash when sPriv->swrast_loader->getImage() is + called from swrastSetTexBuffer2(). Reason: no memory has + been allocated for the destination thus texImage->Data is + NULL. Call ctx->Driver.TexImage2D() to initialize this. If + memory has been allocated in a previous call free it first. Signed-off-by: Egbert Eich <[email protected]> + +for 8.0.1 + +Ported to 8.0.2 --- src/mesa/drivers/dri/swrast/swrast.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c -index 719b406..02a668e 100644 +index d18dd09..dd7d0c0 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c -@@ -61,6 +61,7 @@ +@@ -63,6 +63,7 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format, __DRIdrawable *dPriv) { @@ -28,20 +29,20 @@ struct dri_context *dri_ctx; int x, y, w, h; __DRIscreen *sPriv = dPriv->driScreenPriv; -@@ -90,6 +91,13 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, - _mesa_init_teximage_fields(&dri_ctx->Base, target, texImage, - w, h, 1, 0, internalFormat, texFormat); +@@ -93,6 +94,13 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, + _mesa_init_teximage_fields(&dri_ctx->Base, texImage, + w, h, 1, 0, internalFormat, texFormat); ++ + if (texImage->Data) -+ ctx->Driver.FreeTexImageData(ctx, texImage); -+ ++ ctx->Driver.FreeTexImageData(ctx, texImage); ++ + ctx->Driver.TexImage2D(ctx, target, 0, internalFormat, + w, h, 0, texture_format, GL_UNSIGNED_INT_8_8_8_8, + NULL, &ctx->Unpack, texObj, texImage); -+ - sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data, - dPriv->loaderPrivate); + sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)swImage->Buffer, + dPriv->loaderPrivate); -- -1.7.3.4 +1.7.7 ++++++ upstream-llvm-patch.diff ++++++ >From fe34006908f1ff99ada34d52c06fd80197e452ec Mon Sep 17 00:00:00 2001 From: Vinson Lee <[email protected]> Date: Wed, 14 Mar 2012 05:40:52 +0000 Subject: gallivm: Fix createOProfileJITEventListener namespace with llvm-3.1. llvm-3.1svn r152620 refactored the OProfile profiling code. createOProfileJITEventListener was moved from the llvm namespace to the llvm::JITEventListener namespace. Signed-off-by: Vinson Lee <[email protected]> Reviewed-by: Brian Paul <[email protected]> --- diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index fe7616b..68f8808 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -62,7 +62,11 @@ extern "C" void lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) { +#if HAVE_LLVM >= 0x0301 + llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); +#else llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); +#endif } -- cgit v0.9.0.2-2-gbebe >From 1633dcd890d97bd5e4d125d57f2f529f04d14477 Mon Sep 17 00:00:00 2001 From: Vinson Lee <[email protected]> Date: Tue, 06 Mar 2012 06:00:40 +0000 Subject: gallivm: Pass in a MCRegisterInfo to MCInstPrinter on llvm-3.1. llvm-3.1svn r152043 changes createMCInstPrinter to take an additional MCRegisterInfo argument. Signed-off-by: Vinson Lee <[email protected]> Reviewed-by: Brian Paul <[email protected]> --- (limited to 'src/gallium/auxiliary/gallivm/lp_bld_debug.cpp') diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index 11209da..b6849cb 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp @@ -235,7 +235,18 @@ lp_disassemble(const void* func) int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); #endif -#if HAVE_LLVM >= 0x0300 +#if HAVE_LLVM >= 0x0301 + OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); + if (!MRI) { + debug_printf("error: no register info for target %s\n", Triple.c_str()); + return; + } +#endif + +#if HAVE_LLVM >= 0x0301 + OwningPtr<MCInstPrinter> Printer( + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MRI, *STI)); +#elif HAVE_LLVM == 0x0300 OwningPtr<MCInstPrinter> Printer( T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); #elif HAVE_LLVM >= 0x0208 -- cgit v0.9.0.2-2-gbebe >From 4f513002f65c629576252b34efedf3c8c4531dfd Mon Sep 17 00:00:00 2001 From: Vinson Lee <[email protected]> Date: Tue, 03 Apr 2012 05:14:15 +0000 Subject: gallivm: Pass in a MCInstrInfo to createMCInstPrinter on llvm-3.1. llvm-3.1svn r153860 makes MCInstrInfo available to the MCInstPrinter. Signed-off-by: Vinson Lee <[email protected]> Reviewed-by: Brian Paul <[email protected]> --- (limited to 'src/gallium/auxiliary/gallivm/lp_bld_debug.cpp') diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index c5afff0..9cf2094 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp @@ -241,11 +241,17 @@ lp_disassemble(const void* func) debug_printf("error: no register info for target %s\n", Triple.c_str()); return; } + + OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); + if (!MII) { + debug_printf("error: no instruction info for target %s\n", Triple.c_str()); + return; + } #endif #if HAVE_LLVM >= 0x0301 OwningPtr<MCInstPrinter> Printer( - T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MRI, *STI)); + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); #elif HAVE_LLVM == 0x0300 OwningPtr<MCInstPrinter> Printer( T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); -- cgit v0.9.0.2-2-gbebe -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
