June 2009 - openSUSE Commits - openSUSE Mailing Lists

commit Mesa for openSUSE:Factory
by root＠Hilbert.suse.de 24 Jun '09

24 Jun '09

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at Wed Jun 24 10:19:35 CEST 2009. -------- --- Mesa/Mesa.changes 2009-06-20 03:45:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2009-06-24 05:05:46.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Jun 24 04:43:35 CEST 2009 - sndirsch(a)suse.de + +- Mesa 7.4.4 + * Fixed i965/i915 segfault in screen destruction (bfo #22408) +- adjusted intel_release_static_region.patch +- obsoletes Mesa-intel_unref_fb.patch + +------------------------------------------------------------------- +Tue Jun 23 13:53:06 CEST 2009 - sndirsch(a)suse.de + +- Mesa-intel_unref_fb.patch + * intel: call _mesa_unreference_framebuffer() in + intelDestroyBuffer(). This was a call to + _mesa_reference_framebuffer(ptr, NULL) but the NULL pointer is + incorrect in Mesa 7.4.x. Fixes a failed assertion during screen + tear-down. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- MesaDemos-7.4.3.tar.bz2 MesaLib-7.4.3.tar.bz2 New: ---- MesaDemos-7.4.4.tar.bz2 MesaLib-7.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.D19701/_old 2009-06-24 10:16:50.000000000 +0200 +++ /var/tmp/diff_new_pack.D19701/_new 2009-06-24 10:16:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package Mesa (Version 7.4.3) +# spec file for package Mesa (Version 7.4.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -32,7 +32,7 @@ Obsoletes: Mesa-64bit %endif # -Version: 7.4.3 +Version: 7.4.4 Release: 1 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL Source: MesaLib-%{version}.tar.bz2 ++++++ intel_release_static_region.patch ++++++ --- /var/tmp/diff_new_pack.D19701/_old 2009-06-24 10:16:51.000000000 +0200 +++ /var/tmp/diff_new_pack.D19701/_new 2009-06-24 10:16:51.000000000 +0200 @@ -34,20 +34,6 @@ intel_region_release(&intel->front_region); intel_region_release(&intel->back_region); intel_region_release(&intel->third_region); -diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c -index 98a6e18..fe7589a 100644 ---- a/src/mesa/drivers/dri/intel/intel_fbo.c -+++ b/src/mesa/drivers/dri/intel/intel_fbo.c -@@ -374,7 +374,8 @@ intel_renderbuffer_set_region(struct intel_renderbuffer *rb, - intel_region_reference(&rb->region, region); - intel_region_release(&old); - -- rb->pfPitch = region->pitch; -+ if (region) -+ rb->pfPitch = region->pitch; - } - - /** diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c index bbbaf3e..2eb393a 100644 --- a/src/mesa/drivers/dri/intel/intel_regions.c ++++++ MesaDemos-7.4.3.tar.bz2 -> MesaDemos-7.4.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.3/progs/xdemos/Makefile~ new/Mesa-7.4.4/progs/xdemos/Makefile~ --- old/Mesa-7.4.3/progs/xdemos/Makefile~ 2009-03-24 23:08:25.000000000 +0100 +++ new/Mesa-7.4.4/progs/xdemos/Makefile~ 1970-01-01 01:00:00.000000000 +0100 @@ -1,115 +0,0 @@ -# progs/xdemos/Makefile - -TOP = ../.. -include $(TOP)/configs/current - - -INCDIR = $(TOP)/include - -LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) - -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) - -PROGS = \ - corender \ - glsync \ - glthreads \ - glxdemo \ - glxgears \ - glxgears_fbconfig \ - glxgears_pixmap \ - glxcontexts \ - glxheads \ - glxinfo \ - glxpixmap \ - glxpbdemo \ - glxsnoop \ - glxswapcontrol \ - manywin \ - offset \ - overlay \ - pbinfo \ - pbdemo \ - sharedtex \ - texture_from_pixmap \ - wincopy \ - xfont \ - xrotfontdemo - -# Don't build these by default because of extra library dependencies -EXTRA_PROGS = \ - shape \ - yuvrect_client \ - xdemo - - - -##### RULES ##### - -.SUFFIXES: -.SUFFIXES: .c - -.c: $(LIB_DEP) - $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ - - -##### TARGETS ##### - -default: $(PROGS) - - -extra: $(EXTRA_PROGS) - - -clean: - -rm -f $(PROGS) $(EXTRA_PROGS) - -rm -f *.o *~ - - -# special cases -pbinfo: pbinfo.o pbutil.o - $(CC) $(CFLAGS) $(LDFLAGS) pbinfo.o pbutil.o $(LIBS) -o $@ - -pbdemo: pbdemo.o pbutil.o - $(CC) $(CFLAGS) $(LDFLAGS) pbdemo.o pbutil.o $(LIBS) -o $@ - -pbinfo.o: pbinfo.c pbutil.h - $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbinfo.c - -pbdemo.o: pbdemo.c pbutil.h - $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbdemo.c - -pbutil.o: pbutil.c pbutil.h - $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbutil.c - -glxgears_fbconfig: glxgears_fbconfig.o pbutil.o - $(CC) $(CFLAGS) $(LDFLAGS) glxgears_fbconfig.o pbutil.o $(LIBS) -o $@ - -glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h - $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) -c -I. $(CFLAGS) glxgears_fbconfig.c - -xrotfontdemo: xrotfontdemo.o xuserotfont.o - $(CC) $(CFLAGS) $(LDFLAGS) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@ - -xuserotfont.o: xuserotfont.c xuserotfont.h - $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xuserotfont.c - -xrotfontdemo.o: xrotfontdemo.c xuserotfont.h - $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xrotfontdemo.c - -corender: corender.o ipc.o -<<<<<<< HEAD:progs/xdemos/Makefile - $(CC) $(CFLAGS) corender.o ipc.o $(LIBS) -o $@ -======= - $(APP_CC) $(CFLAGS) $(LDFLAGS) corender.o ipc.o $(LIBS) -o $@ ->>>>>>> c4c4358... demos: add LDFLAGS for corender target, bug 20844:progs/xdemos/Makefile - -corender.o: corender.c ipc.h - $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) corender.c - -ipc.o: ipc.c ipc.h - $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) ipc.c - -yuvrect_client: yuvrect_client.c - $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $< $(LDFLAGS) $(LIBS) -l$(GLU_LIB) -o $@ - ++++++ MesaLib-7.4.3.tar.bz2 -> MesaLib-7.4.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.3/configs/default new/Mesa-7.4.4/configs/default --- old/Mesa-7.4.3/configs/default 2009-06-17 19:31:54.000000000 +0200 +++ new/Mesa-7.4.4/configs/default 2009-06-22 23:22:25.000000000 +0200 @@ -10,7 +10,7 @@ # Version info MESA_MAJOR=7 MESA_MINOR=4 -MESA_TINY=2 +MESA_TINY=4 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY) # external projects. This should be useless now that we use libdrm. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.3/configs/default~ new/Mesa-7.4.4/configs/default~ --- old/Mesa-7.4.3/configs/default~ 2009-04-18 18:47:53.000000000 +0200 +++ new/Mesa-7.4.4/configs/default~ 2009-06-17 19:31:54.000000000 +0200 @@ -10,7 +10,7 @@ # Version info MESA_MAJOR=7 MESA_MINOR=4 -MESA_TINY=1 +MESA_TINY=2 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY) # external projects. This should be useless now that we use libdrm. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.3/docs/news.html new/Mesa-7.4.4/docs/news.html --- old/Mesa-7.4.3/docs/news.html 2009-06-19 23:13:38.000000000 +0200 +++ new/Mesa-7.4.4/docs/news.html 2009-06-24 02:52:48.000000000 +0200 @@ -11,6 +11,14 @@ <H1>News</H1> +<h2>June 23, 2009</h2> +<p> +<a href="relnotes-7.4.4.html">Mesa 7.4.4</a> is released. +This is a stable release that fixes a regression in the i915/i965 drivers +that slipped into the 7.4.3 release. +</p> + + <h2>June 19, 2009</h2> <p> <a href="relnotes-7.4.3.html">Mesa 7.4.3</a> is released. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.3/docs/relnotes-7.4.3.html new/Mesa-7.4.4/docs/relnotes-7.4.3.html --- old/Mesa-7.4.3/docs/relnotes-7.4.3.html 2009-06-19 23:15:44.000000000 +0200 +++ new/Mesa-7.4.4/docs/relnotes-7.4.3.html 2009-06-22 19:28:06.000000000 +0200 @@ -26,6 +26,15 @@ <h2>MD5 checksums</h2> <pre> +34c5a6c47ed51f31c4fa36e269831352 MesaLib-7.4.3.tar.gz +70a983ba3deaa8bd63b18bbab283f698 MesaLib-7.4.3.tar.bz2 +34f21b3205b271d575030aa98a2dda51 MesaLib-7.4.3.zip +56752b7adede212e6097afb10d0c0d59 MesaDemos-7.4.3.tar.gz +8ffa51c4833b1e298300a005e2d7ca2a MesaDemos-7.4.3.tar.bz2 +0037d24d41400d6fb9800ae55b8c863f MesaDemos-7.4.3.zip +20e24f6692c0c90e7e3b220f79c4108d MesaGLUT-7.4.3.tar.gz +03a4beeef74fc5ef0b1d6d04710e5a8a MesaGLUT-7.4.3.tar.bz2 +273788230adbdb9d57371309adedcf5f MesaGLUT-7.4.3.zip </pre> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.3/docs/relnotes-7.4.4.html new/Mesa-7.4.4/docs/relnotes-7.4.4.html --- old/Mesa-7.4.3/docs/relnotes-7.4.4.html 1970-01-01 01:00:00.000000000 +0100 +++ new/Mesa-7.4.4/docs/relnotes-7.4.4.html 2009-06-24 02:53:01.000000000 +0200 @@ -0,0 +1,59 @@ +<HTML> + +<TITLE>Mesa Release Notes</TITLE> + +<head><link rel="stylesheet" type="text/css" href="mesa.css"></head> + +<BODY> + +<body bgcolor="#eeeeee"> + +<H1>Mesa 7.4.4 Release Notes / 23 June 2009</H1> + +<p> +Mesa 7.4.4 is a stable development release fixing bugs since the 7.4.3 release. +</p> +<p> +Mesa 7.4.4 implements the OpenGL 2.1 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 2.1. +</p> +<p> +See the <a href="install.html">Compiling/Installing page</a> for prerequisites +for DRI hardware acceleration. +</p> + + +<h2>MD5 checksums</h2> +<pre> +</pre> + + +<h2>Bug fixes</h2> +<ul> +<li>Fixed i965/i915 segfault in screen destruction (bug 22408) +</ul> + + + +<h2>Driver Status</h2> + +<pre> +Driver Status +---------------------- ---------------------- +DRI drivers varies with the driver +XMesa/GLX (on Xlib) implements OpenGL 2.1 +OSMesa (off-screen) implements OpenGL 2.1 +Windows/Win32 implements OpenGL 2.1 +Glide (3dfx Voodoo1/2) implements OpenGL 1.3 +SVGA unsupported +Wind River UGL unsupported +DJGPP unsupported +GGI unsupported +BeOS unsupported +Allegro unsupported +D3D unsupported +</pre> + +</body> +</html> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.3/docs/relnotes.html new/Mesa-7.4.4/docs/relnotes.html --- old/Mesa-7.4.3/docs/relnotes.html 2009-06-17 19:30:02.000000000 +0200 +++ new/Mesa-7.4.4/docs/relnotes.html 2009-06-22 23:21:57.000000000 +0200 @@ -9,17 +9,11 @@ <H1>Release Notes</H1> <p> -Mesa uses an even/odd version number scheme like the Linux kernel. -Odd numbered versions (such as 6.5) designate new developmental releases. -Even numbered versions (such as 6.4) designate stable releases. -</p> - - -<p> The release notes summarize what's new or changed in each Mesa release. </p> <UL> +<LI><A HREF="relnotes-7.4.4.html">7.4.4 release notes</A> <LI><A HREF="relnotes-7.4.3.html">7.4.3 release notes</A> <LI><A HREF="relnotes-7.4.2.html">7.4.2 release notes</A> <LI><A HREF="relnotes-7.4.1.html">7.4.1 release notes</A> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.3/Makefile new/Mesa-7.4.4/Makefile --- old/Mesa-7.4.3/Makefile 2009-06-17 19:31:54.000000000 +0200 +++ new/Mesa-7.4.4/Makefile 2009-06-22 23:26:36.000000000 +0200 @@ -178,7 +178,7 @@ # Rules for making release tarballs -VERSION=7.4.3 +VERSION=7.4.4 DIRECTORY = Mesa-$(VERSION) LIB_NAME = MesaLib-$(VERSION) DEMO_NAME = MesaDemos-$(VERSION) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.3/Makefile~ new/Mesa-7.4.4/Makefile~ --- old/Mesa-7.4.3/Makefile~ 1970-01-01 01:00:00.000000000 +0100 +++ new/Mesa-7.4.4/Makefile~ 2009-06-17 19:31:54.000000000 +0200 @@ -0,0 +1,537 @@ +# Top-level Mesa makefile + +TOP = . + +SUBDIRS = src progs + + +default: $(TOP)/configs/current + @for dir in $(SUBDIRS) ; do \ + if [ -d $$dir ] ; then \ + (cd $$dir && $(MAKE)) || exit 1 ; \ + fi \ + done + + +doxygen: + cd doxygen && $(MAKE) + +clean: + -@touch $(TOP)/configs/current + -@for dir in $(SUBDIRS) ; do \ + if [ -d $$dir ] ; then \ + (cd $$dir && $(MAKE) clean) ; \ + fi \ + done + -@test -s $(TOP)/configs/current || rm -f $(TOP)/configs/current + + +realclean: clean + -rm -rf lib* + -rm -f $(TOP)/configs/current + -rm -f $(TOP)/configs/autoconf + -rm -rf autom4te.cache + -find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \ + -name depend -o -name depend.bak ')' -exec rm -f '{}' ';' + + +distclean: realclean + + +install: + @for dir in $(SUBDIRS) ; do \ + if [ -d $$dir ] ; then \ + (cd $$dir && $(MAKE) install) || exit 1 ; \ + fi \ + done + + +# DirectFBGL module installation +linux-directfb-install: + cd src/mesa/drivers/directfb && $(MAKE) install + + +.PHONY: default doxygen clean realclean distclean install linux-directfb-install + + +# If there's no current configuration file +$(TOP)/configs/current: + @echo + @echo + @echo "Please choose a configuration from the following list:" + @ls -1 $(TOP)/configs | grep -v "current\|default\|CVS\|autoconf.*" + @echo + @echo "Then type 'make <config>' (ex: 'make linux-x86')" + @echo + @echo "Or, run './configure' then 'make'" + @echo "See './configure --help' for details" + @echo + @echo "(ignore the following error message)" + @exit 1 + + +# Rules to set/install a specific build configuration +aix \ +aix-64 \ +aix-64-static \ +aix-gcc \ +aix-static \ +autoconf \ +bluegene-osmesa \ +bluegene-xlc-osmesa \ +beos \ +catamount-osmesa-pgi \ +darwin \ +darwin-fat-32bit \ +darwin-fat-all \ +darwin-static \ +darwin-static-x86ppc \ +freebsd \ +freebsd-dri \ +freebsd-dri-amd64 \ +freebsd-dri-x86 \ +hpux10 \ +hpux10-gcc \ +hpux10-static \ +hpux11-32 \ +hpux11-32-static \ +hpux11-32-static-nothreads \ +hpux11-64 \ +hpux11-64-static \ +hpux11-ia64 \ +hpux11-ia64-static \ +hpux9 \ +hpux9-gcc \ +irix6-64 \ +irix6-64-static \ +irix6-n32 \ +irix6-n32-static \ +irix6-o32 \ +irix6-o32-static \ +linux \ +linux-alpha \ +linux-alpha-static \ +linux-debug \ +linux-directfb \ +linux-dri \ +linux-dri-debug \ +linux-dri-x86 \ +linux-dri-x86-64 \ +linux-dri-ppc \ +linux-dri-xcb \ +linux-indirect \ +linux-fbdev \ +linux-glide \ +linux-ia64-icc \ +linux-ia64-icc-static \ +linux-icc \ +linux-icc-static \ +linux-osmesa \ +linux-osmesa16 \ +linux-osmesa16-static \ +linux-osmesa32 \ +linux-ppc \ +linux-ppc-static \ +linux-solo \ +linux-solo-x86 \ +linux-solo-ia64 \ +linux-sparc \ +linux-sparc5 \ +linux-static \ +linux-ultrasparc \ +linux-tcc \ +linux-x86 \ +linux-x86-debug \ +linux-x86-32 \ +linux-x86-64 \ +linux-x86-64-debug \ +linux-x86-64-static \ +linux-x86-glide \ +linux-x86-static \ +netbsd \ +openbsd \ +osf1 \ +osf1-static \ +solaris-x86 \ +solaris-x86-gcc \ +solaris-x86-gcc-static \ +sunos4 \ +sunos4-gcc \ +sunos4-static \ +sunos5 \ +sunos5-gcc \ +sunos5-64-gcc \ +sunos5-smp \ +sunos5-v8 \ +sunos5-v8-static \ +sunos5-v9 \ +sunos5-v9-static \ +sunos5-v9-cc-g++ \ +ultrix-gcc: + @ if test -f configs/current || test -L configs/current ; then \ + echo "Please run 'make realclean' before changing configs" ; \ + exit 1 ; \ + fi + (cd configs && rm -f current && ln -s $@ current) + $(MAKE) default + + +# Rules for making release tarballs + +VERSION=7.4.3 +DIRECTORY = Mesa-$(VERSION) +LIB_NAME = MesaLib-$(VERSION) +DEMO_NAME = MesaDemos-$(VERSION) +GLUT_NAME = MesaGLUT-$(VERSION) + +MAIN_FILES = \ + $(DIRECTORY)/Makefile* \ + $(DIRECTORY)/configure \ + $(DIRECTORY)/configure.ac \ + $(DIRECTORY)/acinclude.m4 \ + $(DIRECTORY)/aclocal.m4 \ + $(DIRECTORY)/descrip.mms \ + $(DIRECTORY)/mms-config. \ + $(DIRECTORY)/bin/config.guess \ + $(DIRECTORY)/bin/config.sub \ + $(DIRECTORY)/bin/install-sh \ + $(DIRECTORY)/bin/mklib \ + $(DIRECTORY)/bin/minstall \ + $(DIRECTORY)/bin/version.mk \ + $(DIRECTORY)/configs/[a-z]* \ + $(DIRECTORY)/docs/*.html \ + $(DIRECTORY)/docs/COPYING \ + $(DIRECTORY)/docs/README.* \ + $(DIRECTORY)/docs/RELNOTES* \ + $(DIRECTORY)/docs/*.spec \ + $(DIRECTORY)/include/GL/internal/glcore.h \ + $(DIRECTORY)/include/GL/dmesa.h \ + $(DIRECTORY)/include/GL/ggimesa.h \ + $(DIRECTORY)/include/GL/gl.h \ + $(DIRECTORY)/include/GL/glext.h \ + $(DIRECTORY)/include/GL/gl_mangle.h \ + $(DIRECTORY)/include/GL/glu.h \ + $(DIRECTORY)/include/GL/glu_mangle.h \ + $(DIRECTORY)/include/GL/glx.h \ + $(DIRECTORY)/include/GL/glxext.h \ + $(DIRECTORY)/include/GL/glx_mangle.h \ + $(DIRECTORY)/include/GL/glfbdev.h \ + $(DIRECTORY)/include/GL/mesa_wgl.h \ + $(DIRECTORY)/include/GL/mglmesa.h \ + $(DIRECTORY)/include/GL/osmesa.h \ + $(DIRECTORY)/include/GL/svgamesa.h \ + $(DIRECTORY)/include/GL/vms_x_fix.h \ + $(DIRECTORY)/include/GL/wmesa.h \ + $(DIRECTORY)/src/Makefile \ + $(DIRECTORY)/src/descrip.mms \ + $(DIRECTORY)/src/mesa/Makefile* \ + $(DIRECTORY)/src/mesa/sources \ + $(DIRECTORY)/src/mesa/descrip.mms \ + $(DIRECTORY)/src/mesa/gl.pc.in \ + $(DIRECTORY)/src/mesa/osmesa.pc.in \ + $(DIRECTORY)/src/mesa/depend \ + $(DIRECTORY)/src/mesa/main/*.[chS] \ + $(DIRECTORY)/src/mesa/main/descrip.mms \ + $(DIRECTORY)/src/mesa/glapi/*.[chS] \ + $(DIRECTORY)/src/mesa/glapi/descrip.mms \ + $(DIRECTORY)/src/mesa/math/*.[ch] \ + $(DIRECTORY)/src/mesa/math/descrip.mms \ + $(DIRECTORY)/src/mesa/shader/*.[ch] \ + $(DIRECTORY)/src/mesa/shader/descrip.mms \ + $(DIRECTORY)/src/mesa/shader/grammar/*.[ch] \ + $(DIRECTORY)/src/mesa/shader/grammar/descrip.mms \ + $(DIRECTORY)/src/mesa/shader/slang/*.[ch] \ + $(DIRECTORY)/src/mesa/shader/slang/descrip.mms \ + $(DIRECTORY)/src/mesa/shader/slang/library/*.[ch] \ + $(DIRECTORY)/src/mesa/shader/slang/library/*.gc \ + $(DIRECTORY)/src/mesa/shader/slang/library/*.syn \ + $(DIRECTORY)/src/mesa/shader/slang/library/Makefile \ + $(DIRECTORY)/src/mesa/swrast/*.[ch] \ + $(DIRECTORY)/src/mesa/swrast/descrip.mms \ + $(DIRECTORY)/src/mesa/swrast_setup/*.[ch] \ + $(DIRECTORY)/src/mesa/swrast_setup/descrip.mms \ + $(DIRECTORY)/src/mesa/vbo/*.[chS] \ + $(DIRECTORY)/src/mesa/vbo/descrip.mms \ + $(DIRECTORY)/src/mesa/tnl/*.[chS] \ + $(DIRECTORY)/src/mesa/tnl/descrip.mms \ + $(DIRECTORY)/src/mesa/tnl_dd/*.[ch] \ + $(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch] \ + $(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm \ + $(DIRECTORY)/src/mesa/drivers/Makefile \ + $(DIRECTORY)/src/mesa/drivers/beos/*.cpp \ + $(DIRECTORY)/src/mesa/drivers/beos/Makefile \ + $(DIRECTORY)/src/mesa/drivers/common/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/common/descrip.mms \ + $(DIRECTORY)/src/mesa/drivers/directfb/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/directfb/Makefile \ + $(DIRECTORY)/src/mesa/drivers/dos/*.[chS] \ + $(DIRECTORY)/src/mesa/drivers/fbdev/Makefile \ + $(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c \ + $(DIRECTORY)/src/mesa/drivers/glide/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/ggi/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in \ + $(DIRECTORY)/src/mesa/drivers/ggi/default/*.c \ + $(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in \ + $(DIRECTORY)/src/mesa/drivers/ggi/display/*.c \ + $(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in \ + $(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h \ + $(DIRECTORY)/src/mesa/drivers/osmesa/Makefile \ + $(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win \ + $(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms \ + $(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def \ + $(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/svga/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/windows/*/*.def \ + $(DIRECTORY)/src/mesa/drivers/x11/Makefile \ + $(DIRECTORY)/src/mesa/drivers/x11/descrip.mms \ + $(DIRECTORY)/src/mesa/drivers/x11/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/glslcompiler/Makefile \ + $(DIRECTORY)/src/mesa/drivers/glslcompiler/glslcompiler.c \ + $(DIRECTORY)/src/mesa/ppc/*.[ch] \ + $(DIRECTORY)/src/mesa/sparc/*.[chS] \ + $(DIRECTORY)/src/mesa/x86/Makefile \ + $(DIRECTORY)/src/mesa/x86/*.[ch] \ + $(DIRECTORY)/src/mesa/x86/*.S \ + $(DIRECTORY)/src/mesa/x86/rtasm/*.[ch] \ + $(DIRECTORY)/src/mesa/x86-64/*.[chS] \ + $(DIRECTORY)/src/mesa/x86-64/Makefile \ + $(DIRECTORY)/progs/Makefile \ + $(DIRECTORY)/progs/util/README \ + $(DIRECTORY)/progs/util/*.[ch] \ + $(DIRECTORY)/progs/util/sampleMakefile \ + $(DIRECTORY)/vms/analyze_map.com \ + $(DIRECTORY)/vms/xlib.opt \ + $(DIRECTORY)/vms/xlib_share.opt \ + $(DIRECTORY)/windows/VC8/ + + +DRI_FILES = \ + $(DIRECTORY)/include/GL/internal/dri_interface.h \ + $(DIRECTORY)/include/GL/internal/glcore.h \ + $(DIRECTORY)/include/GL/internal/sarea.h \ + $(DIRECTORY)/src/glx/Makefile \ + $(DIRECTORY)/src/glx/x11/Makefile \ + $(DIRECTORY)/src/glx/x11/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/dri/Makefile \ + $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \ + $(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in \ + $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po \ + $(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS] \ + $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \ + $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \ + $(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch] + +SGI_GLU_FILES = \ + $(DIRECTORY)/src/glu/Makefile \ + $(DIRECTORY)/src/glu/descrip.mms \ + $(DIRECTORY)/src/glu/glu.pc.in \ + $(DIRECTORY)/src/glu/sgi/Makefile \ + $(DIRECTORY)/src/glu/sgi/Makefile.mgw \ + $(DIRECTORY)/src/glu/sgi/Makefile.win \ + $(DIRECTORY)/src/glu/sgi/Makefile.DJ \ + $(DIRECTORY)/src/glu/sgi/glu.def \ + $(DIRECTORY)/src/glu/sgi/dummy.cc \ + $(DIRECTORY)/src/glu/sgi/descrip.mms \ + $(DIRECTORY)/src/glu/sgi/glu.exports \ + $(DIRECTORY)/src/glu/sgi/glu.exports.darwin \ + $(DIRECTORY)/src/glu/sgi/mesaglu.opt \ + $(DIRECTORY)/src/glu/sgi/include/gluos.h \ + $(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h \ + $(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc \ + $(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h \ + $(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc \ + $(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h \ + $(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc \ + $(DIRECTORY)/src/glu/sgi/libtess/README \ + $(DIRECTORY)/src/glu/sgi/libtess/alg-outline \ + $(DIRECTORY)/src/glu/sgi/libtess/*.[ch] \ + $(DIRECTORY)/src/glu/sgi/libutil/*.[ch] + +MESA_GLU_FILES = \ + $(DIRECTORY)/src/glu/mesa/README[12] \ + $(DIRECTORY)/src/glu/mesa/Makefile* \ + $(DIRECTORY)/src/glu/mesa/descrip.mms \ + $(DIRECTORY)/src/glu/mesa/mms_depend \ + $(DIRECTORY)/src/glu/mesa/*.def \ + $(DIRECTORY)/src/glu/mesa/depend \ + $(DIRECTORY)/src/glu/mesa/*.[ch] + +GLW_FILES = \ + $(DIRECTORY)/src/glw/*.[ch] \ + $(DIRECTORY)/src/glw/Makefile* \ + $(DIRECTORY)/src/glw/README \ + $(DIRECTORY)/src/glw/glw.pc.in \ + $(DIRECTORY)/src/glw/depend + +DEMO_FILES = \ + $(DIRECTORY)/progs/beos/*.cpp \ + $(DIRECTORY)/progs/beos/Makefile \ + $(DIRECTORY)/progs/images/*.rgb \ + $(DIRECTORY)/progs/images/*.rgba \ + $(DIRECTORY)/progs/demos/Makefile* \ + $(DIRECTORY)/progs/demos/descrip.mms \ + $(DIRECTORY)/progs/demos/*.[ch] \ + $(DIRECTORY)/progs/demos/*.cxx \ + $(DIRECTORY)/progs/demos/*.dat \ + $(DIRECTORY)/progs/demos/README \ + $(DIRECTORY)/progs/fbdev/Makefile \ + $(DIRECTORY)/progs/fbdev/glfbdevtest.c \ + $(DIRECTORY)/progs/osdemos/Makefile \ + $(DIRECTORY)/progs/osdemos/*.c \ + $(DIRECTORY)/progs/xdemos/Makefile* \ + $(DIRECTORY)/progs/xdemos/descrip.mms \ + $(DIRECTORY)/progs/xdemos/*.[chf] \ + $(DIRECTORY)/progs/redbook/Makefile* \ + $(DIRECTORY)/progs/redbook/README \ + $(DIRECTORY)/progs/redbook/*.[ch] \ + $(DIRECTORY)/progs/samples/Makefile* \ + $(DIRECTORY)/progs/samples/README \ + $(DIRECTORY)/progs/samples/*.c \ + $(DIRECTORY)/progs/glsl/Makefile* \ + $(DIRECTORY)/progs/glsl/*.c \ + $(DIRECTORY)/progs/glsl/*.frag \ + $(DIRECTORY)/progs/glsl/*.vert \ + $(DIRECTORY)/progs/windml/Makefile.ugl \ + $(DIRECTORY)/progs/windml/*.c \ + $(DIRECTORY)/progs/windml/*.bmp \ + $(DIRECTORY)/progs/ggi/*.c \ + $(DIRECTORY)/windows/VC6/progs/demos/*.dsp \ + $(DIRECTORY)/windows/VC6/progs/progs.dsw \ + $(DIRECTORY)/windows/VC7/progs/demos/*.vcproj \ + $(DIRECTORY)/windows/VC7/progs/progs.sln + +GLUT_FILES = \ + $(DIRECTORY)/include/GL/glut.h \ + $(DIRECTORY)/include/GL/glutf90.h \ + $(DIRECTORY)/src/glut/glx/Makefile* \ + $(DIRECTORY)/src/glut/glx/depend \ + $(DIRECTORY)/src/glut/glx/glut.pc.in \ + $(DIRECTORY)/src/glut/glx/*def \ + $(DIRECTORY)/src/glut/glx/descrip.mms \ + $(DIRECTORY)/src/glut/glx/mms_depend \ + $(DIRECTORY)/src/glut/glx/*.[ch] \ + $(DIRECTORY)/src/glut/beos/*.[ch] \ + $(DIRECTORY)/src/glut/beos/*.cpp \ + $(DIRECTORY)/src/glut/beos/Makefile \ + $(DIRECTORY)/src/glut/dos/*.[ch] \ + $(DIRECTORY)/src/glut/dos/Makefile.DJ \ + $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS] \ + $(DIRECTORY)/src/glut/ggi/*.[ch] \ + $(DIRECTORY)/src/glut/ggi/Makefile \ + $(DIRECTORY)/src/glut/fbdev/Makefile \ + $(DIRECTORY)/src/glut/fbdev/*[ch] \ + $(DIRECTORY)/src/glut/mini/*[ch] \ + $(DIRECTORY)/src/glut/mini/glut.pc.in \ + $(DIRECTORY)/src/glut/directfb/Makefile \ + $(DIRECTORY)/src/glut/directfb/NOTES \ + $(DIRECTORY)/src/glut/directfb/*[ch] \ + $(DIRECTORY)/windows/VC6/progs/glut/glut.dsp \ + $(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj + +DEPEND_FILES = \ + $(TOP)/src/mesa/depend \ + $(TOP)/src/glx/x11/depend \ + $(TOP)/src/glw/depend \ + $(TOP)/src/glut/glx/depend \ + $(TOP)/src/glu/sgi/depend + + +LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES) + + +# Everything for new a Mesa release: +tarballs: rm_depend configure aclocal.m4 lib_gz demo_gz glut_gz \ + lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5 + + +# Helper for autoconf builds +ACLOCAL = aclocal +ACLOCAL_FLAGS = +AUTOCONF = autoconf +AC_FLAGS = +aclocal.m4: configure.ac acinclude.m4 + $(ACLOCAL) $(ACLOCAL_FLAGS) +configure: configure.ac aclocal.m4 acinclude.m4 + $(AUTOCONF) $(AC_FLAGS) + +rm_depend: + @for dep in $(DEPEND_FILES) ; do \ + rm -f $$dep ; \ + touch $$dep ; \ + done + +lib_gz: + rm -f configs/current ; \ + rm -f configs/autoconf ; \ + cd .. ; \ + tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \ + gzip $(LIB_NAME).tar ; \ + mv $(LIB_NAME).tar.gz $(DIRECTORY) + +demo_gz: + cd .. ; \ + tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \ + gzip $(DEMO_NAME).tar ; \ + mv $(DEMO_NAME).tar.gz $(DIRECTORY) + +glut_gz: + cd .. ; \ + tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \ + gzip $(GLUT_NAME).tar ; \ + mv $(GLUT_NAME).tar.gz $(DIRECTORY) + +lib_bz2: + rm -f configs/current ; \ + rm -f configs/autoconf ; \ + cd .. ; \ + tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \ + bzip2 $(LIB_NAME).tar ; \ + mv $(LIB_NAME).tar.bz2 $(DIRECTORY) + +demo_bz2: + cd .. ; \ + tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \ + bzip2 $(DEMO_NAME).tar ; \ + mv $(DEMO_NAME).tar.bz2 $(DIRECTORY) + +glut_bz2: + cd .. ; \ + tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \ + bzip2 $(GLUT_NAME).tar ; \ + mv $(GLUT_NAME).tar.bz2 $(DIRECTORY) + +lib_zip: + rm -f configs/current ; \ + rm -f configs/autoconf ; \ + rm -f $(LIB_NAME).zip ; \ + cd .. ; \ + zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \ + mv $(LIB_NAME).zip $(DIRECTORY) + +demo_zip: + rm -f $(DEMO_NAME).zip ; \ + cd .. ; \ + zip -qr $(DEMO_NAME).zip $(DEMO_FILES) ; \ + mv $(DEMO_NAME).zip $(DIRECTORY) + +glut_zip: + rm -f $(GLUT_NAME).zip ; \ + cd .. ; \ + zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \ + mv $(GLUT_NAME).zip $(DIRECTORY) + +md5: + @-md5sum $(LIB_NAME).tar.gz + @-md5sum $(LIB_NAME).tar.bz2 + @-md5sum $(LIB_NAME).zip + @-md5sum $(DEMO_NAME).tar.gz + @-md5sum $(DEMO_NAME).tar.bz2 + @-md5sum $(DEMO_NAME).zip + @-md5sum $(GLUT_NAME).tar.gz + @-md5sum $(GLUT_NAME).tar.bz2 + @-md5sum $(GLUT_NAME).zip + +.PHONY: tarballs rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 \ + glut_bz2 lib_zip demo_zip glut_zip md5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.3/src/mesa/drivers/dri/intel/intel_fbo.c new/Mesa-7.4.4/src/mesa/drivers/dri/intel/intel_fbo.c --- old/Mesa-7.4.3/src/mesa/drivers/dri/intel/intel_fbo.c 2009-06-01 23:06:19.000000000 +0200 +++ new/Mesa-7.4.4/src/mesa/drivers/dri/intel/intel_fbo.c 2009-06-22 19:28:06.000000000 +0200 @@ -345,7 +345,8 @@ intel_region_reference(&rb->region, region); intel_region_release(&old); - rb->pfPitch = region->pitch; + if (region) + rb->pfPitch = region->pitch; } /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.3/src/mesa/drivers/dri/intel/intel_screen.c new/Mesa-7.4.4/src/mesa/drivers/dri/intel/intel_screen.c --- old/Mesa-7.4.3/src/mesa/drivers/dri/intel/intel_screen.c 2009-06-17 19:30:04.000000000 +0200 +++ new/Mesa-7.4.4/src/mesa/drivers/dri/intel/intel_screen.c 2009-06-22 19:28:06.000000000 +0200 @@ -409,7 +409,7 @@ } } - _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL); + _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.3/src/mesa/main/version.h new/Mesa-7.4.4/src/mesa/main/version.h --- old/Mesa-7.4.3/src/mesa/main/version.h 2009-06-17 19:30:03.000000000 +0200 +++ new/Mesa-7.4.4/src/mesa/main/version.h 2009-06-22 23:22:13.000000000 +0200 @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 7.4.3 + * Version: 7.4.4 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. @@ -31,8 +31,8 @@ /* Mesa version */ #define MESA_MAJOR 7 #define MESA_MINOR 4 -#define MESA_PATCH 3 -#define MESA_VERSION_STRING "7.4.3" +#define MESA_PATCH 4 +#define MESA_VERSION_STRING "7.4.4" /* To make version comparison easy */ #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openais for openSUSE:Factory
by root＠Hilbert.suse.de 20 Jun '09

20 Jun '09

Hello community, here is the log from the commit of package openais for openSUSE:Factory checked in at Sat Jun 20 06:14:34 CEST 2009. -------- --- openais/openais.changes 2009-06-09 01:57:56.000000000 +0200 +++ openais/openais.changes 2009-06-19 11:04:57.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 19 10:35:46 CEST 2009 - coolo(a)novell.com + +- disable as-needed for this package as it fails to build with it + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openais.spec ++++++ --- /var/tmp/diff_new_pack.Ed5782/_old 2009-06-20 06:14:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Ed5782/_new 2009-06-20 06:14:27.000000000 +0200 @@ -31,8 +31,8 @@ Name: openais Summary: The OpenAIS Standards-Based Cluster Framework executive and APIs Version: 0.80.3 -Release: 24 -License: BSD 3-Clause +Release: 25 +License: BSD 3-clause (or similar) Group: Productivity/Clustering/HA Url: http://www.openais.org/ Source: openais.tar.gz @@ -73,7 +73,7 @@ Abhijith Das %package -n libopenais2 -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: The OpenAIS Standards-Based Cluster Framework executive and APIs Group: Productivity/Clustering/HA @@ -105,7 +105,7 @@ Abhijith Das %package -n libopenais-devel -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: The openais Standards-Based Cluster Framework libraries Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} @@ -146,6 +146,9 @@ %patch4 %build +# This package failed when testing with -Wl,-as-needed being default. +# So we disable it here, if you want to retest, just delete this comment and the line below. +export SUSE_ASNEEDED=0 # -O3 required for performance reasons # So we get proper debug output, for now we don't compile with O3 #CFLAGS="$(echo '%{optflags}' | sed -e 's/-O[0-9]*//') -O3" @@ -259,6 +262,8 @@ %{_mandir}/man3/evs_*.3* %changelog +* Fri Jun 19 2009 coolo(a)novell.com +- disable as-needed for this package as it fails to build with it * Tue Jun 09 2009 ro(a)suse.de - fix build with gcc-4.4 (#elif -> #else) - renamed dprintf to my_dprintf to avoid collision with function ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wireless-tools for openSUSE:Factory
by root＠Hilbert.suse.de 20 Jun '09

20 Jun '09

Hello community, here is the log from the commit of package wireless-tools for openSUSE:Factory checked in at Sat Jun 20 06:13:28 CEST 2009. -------- --- wireless-tools/wireless-tools.changes 2009-06-08 17:20:01.000000000 +0200 +++ wireless-tools/wireless-tools.changes 2009-06-19 11:08:28.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 19 10:35:46 CEST 2009 - coolo(a)novell.com + +- disable as-needed for this package as it fails to build with it + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireless-tools.spec ++++++ --- /var/tmp/diff_new_pack.EL2751/_old 2009-06-20 06:13:16.000000000 +0200 +++ /var/tmp/diff_new_pack.EL2751/_new 2009-06-20 06:13:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wireless-tools (Version MACRO) +# spec file for package wireless-tools (Version 30.pre8) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Summary: Tools for a wireless LAN %define major_version 30 Version: %{major_version}.pre8 -Release: 1 +Release: 3 Group: Hardware/Wifi License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -93,6 +93,9 @@ %patch %build +# This package failed when testing with -Wl,-as-needed being default. +# So we disable it here, if you want to retest, just delete this comment and the line below. +export SUSE_ASNEEDED=0 make CFLAGS="$RPM_OPT_FLAGS" make CFLAGS="$RPM_OPT_FLAGS" -C ../lwepgen @@ -152,6 +155,8 @@ %{_includedir}/* %changelog +* Fri Jun 19 2009 coolo(a)novell.com +- disable as-needed for this package as it fails to build with it * Mon Jun 08 2009 hschaa(a)suse.de - Remove ipw2100.modprobe, the associate parameter already defaults to 0 since 2.6.30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Mesa for openSUSE:Factory
by root＠Hilbert.suse.de 20 Jun '09

20 Jun '09

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at Sat Jun 20 06:11:59 CEST 2009. -------- --- Mesa/Mesa.changes 2009-05-15 18:39:05.000000000 +0200 +++ Mesa/Mesa.changes 2009-06-20 03:45:25.000000000 +0200 @@ -1,0 +2,24 @@ +Sat Jun 20 03:35:17 CEST 2009 - sndirsch(a)suse.de + +- Mesa 7.4.3 + * Fixed texture object reference counting bug (bug 21756) + * Allow depth/stencil textures to be attached to GL_STENCIL_ATTACHMENT point + (SF bug 2793846) + * Added missing glGet case for GL_VERTEX_ARRAY_BINDING_APPLE + * Fixed some OSMesa build issues + * Fixed a vertex buffer object crash + * Fixed broken glTexImage3D() when image type = GL_BITMAP + * Fixed some GLSL preprocessor bugs + * Fixed framebuffer mem leak in i945/i965 DRI drivers + * Fixed texture coordinate repeat bug in swrast (bug 21872) + * Fixed incorrect viewport clamping (lower bound is zero, not one) + * GLX fix for glean's makeCurrent test case +- obsoletes reverted applied mesa_7_4_branch-commit-63cde0e.diff + +------------------------------------------------------------------- +Tue May 19 22:23:57 CEST 2009 - sndirsch(a)suse.de + +- mesa_7_4_branch-commit-63cde0e.diff + * commit, which introduced a regression; revert it (bnc #504578) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- MesaDemos-7.4.2.tar.bz2 MesaLib-7.4.2.tar.bz2 New: ---- MesaDemos-7.4.3.tar.bz2 MesaLib-7.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.p29932/_old 2009-06-20 06:10:52.000000000 +0200 +++ /var/tmp/diff_new_pack.p29932/_new 2009-06-20 06:10:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package Mesa (Version 7.4.2) +# spec file for package Mesa (Version 7.4.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig xorg-x11-devel Url: http://www.mesa3d.org -License: X11/MIT +License: MIT License (or similar) Group: System/Libraries Provides: xorg-x11-Mesa intel-i810-Mesa Mesa7 Obsoletes: xorg-x11-Mesa intel-i810-Mesa Mesa7 @@ -32,7 +32,7 @@ Obsoletes: Mesa-64bit %endif # -Version: 7.4.2 +Version: 7.4.3 Release: 1 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL Source: MesaLib-%{version}.tar.bz2 @@ -71,7 +71,7 @@ Brian Paul %package devel -License: X11/MIT +License: MIT License (or similar) Requires: Mesa = %version xorg-x11-devel Summary: Libraries, includes and more to develop Mesa applications Group: System/Libraries @@ -211,6 +211,24 @@ %{_mandir}/man3/* %changelog +* Sat Jun 20 2009 sndirsch(a)suse.de +- Mesa 7.4.3 + * Fixed texture object reference counting bug (bug 21756) + * Allow depth/stencil textures to be attached to GL_STENCIL_ATTACHMENT point + (SF bug 2793846) + * Added missing glGet case for GL_VERTEX_ARRAY_BINDING_APPLE + * Fixed some OSMesa build issues + * Fixed a vertex buffer object crash + * Fixed broken glTexImage3D() when image type = GL_BITMAP + * Fixed some GLSL preprocessor bugs + * Fixed framebuffer mem leak in i945/i965 DRI drivers + * Fixed texture coordinate repeat bug in swrast (bug 21872) + * Fixed incorrect viewport clamping (lower bound is zero, not one) + * GLX fix for glean's makeCurrent test case +- obsoletes reverted applied mesa_7_4_branch-commit-63cde0e.diff +* Tue May 19 2009 sndirsch(a)suse.de +- mesa_7_4_branch-commit-63cde0e.diff + * commit, which introduced a regression; revert it (bnc #504578) * Fri May 15 2009 sndirsch(a)suse.de - Mesa 7.4.2 * Fixed segfault when rendering to front buffer with DRI 1. ++++++ MesaDemos-7.4.2.tar.bz2 -> MesaDemos-7.4.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.4.2/progs/glsl/multitex.c new/Mesa-7.4.3/progs/glsl/multitex.c --- old/Mesa-7.4.2/progs/glsl/multitex.c 2009-02-27 18:11:41.000000000 +0100 +++ new/Mesa-7.4.3/progs/glsl/multitex.c 2009-06-17 19:30:03.000000000 +0200 @@ -271,9 +271,24 @@ InitUniforms(program, uniforms); + VertCoord_attr = glGetAttribLocation_func(program, "VertCoord"); + if (VertCoord_attr > 0) { + /* We want the VertCoord attrib to have position zero so that + * the call to glVertexAttrib(0, xyz) triggers vertex processing. + * Otherwise, if TexCoord0 or TexCoord1 gets position 0 we'd have + * to set that attribute last (which is a PITA to manage). + */ + glBindAttribLocation_func(program, 0, "VertCoord"); + /* re-link */ + glLinkProgram_func(program); + /* VertCoord_attr should be zero now */ + VertCoord_attr = glGetAttribLocation_func(program, "VertCoord"); + assert(VertCoord_attr == 0); + } + TexCoord0_attr = glGetAttribLocation_func(program, "TexCoord0"); TexCoord1_attr = glGetAttribLocation_func(program, "TexCoord1"); - VertCoord_attr = glGetAttribLocation_func(program, "VertCoord"); + printf("TexCoord0_attr = %d\n", TexCoord0_attr); printf("TexCoord1_attr = %d\n", TexCoord1_attr); printf("VertCoord_attr = %d\n", VertCoord_attr); ++++++ MesaLib-7.4.2.tar.bz2 -> MesaLib-7.4.3.tar.bz2 ++++++ ++++ 9062 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/configure.ac new/Mesa-7.4.3/configure.ac --- old/Mesa-7.4.2/configure.ac 2009-03-26 00:42:26.000000000 +0100 +++ new/Mesa-7.4.3/configure.ac 2009-06-17 19:30:03.000000000 +0200 @@ -786,12 +786,12 @@ osmesa) # only link libraries with osmesa if shared if test "$enable_static" = no; then - OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS" + OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" else OSMESA_LIB_DEPS="" fi OSMESA_MESA_DEPS="" - OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS" + OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" ;; *) # Link OSMesa to libGL otherwise @@ -805,9 +805,6 @@ OSMESA_PC_REQ="gl" ;; esac -if test "$enable_static" = no; then - OSMESA_LIB_DEPS="$OSMESA_LIB_DEPS" -fi OSMESA_PC_LIB_PRIV="$OSMESA_PC_LIB_PRIV" AC_SUBST([OSMESA_LIB_DEPS]) AC_SUBST([OSMESA_MESA_DEPS]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/docs/download.html new/Mesa-7.4.3/docs/download.html --- old/Mesa-7.4.2/docs/download.html 2009-05-15 14:21:35.000000000 +0200 +++ new/Mesa-7.4.3/docs/download.html 2009-06-19 23:14:09.000000000 +0200 @@ -9,9 +9,7 @@ <H1>Downloading</H1> <p> -Current stable release: <b>7.4.2</b> -<br> -Last unstable/development release: <b>7.3</b> +Current stable release: <b>7.4.3</b> </p> <p> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/docs/news.html new/Mesa-7.4.3/docs/news.html --- old/Mesa-7.4.2/docs/news.html 2009-05-15 14:21:05.000000000 +0200 +++ new/Mesa-7.4.3/docs/news.html 2009-06-19 23:13:38.000000000 +0200 @@ -11,6 +11,13 @@ <H1>News</H1> +<h2>June 19, 2009</h2> +<p> +<a href="relnotes-7.4.3.html">Mesa 7.4.3</a> is released. +This is a stable release fixing bugs since the 7.4.2 release. +</p> + + <h2>May 15, 2009</h2> <p> <a href="relnotes-7.4.2.html">Mesa 7.4.2</a> is released. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/docs/relnotes-7.4.2.html new/Mesa-7.4.3/docs/relnotes-7.4.2.html --- old/Mesa-7.4.2/docs/relnotes-7.4.2.html 2009-05-15 14:21:24.000000000 +0200 +++ new/Mesa-7.4.3/docs/relnotes-7.4.2.html 2009-06-17 19:30:02.000000000 +0200 @@ -26,7 +26,15 @@ <h2>MD5 checksums</h2> <pre> -tbd +172f5193154dad731387f97bd44ab68f MesaLib-7.4.2.tar.gz +b10a76e32bde4645cfc34ea0416d7d8b MesaLib-7.4.2.tar.bz2 +cc6dfc2efd424cc342b84e6bcd78ce5d MesaLib-7.4.2.zip +182a7e78aa7a480b3650a5c956dbddd1 MesaDemos-7.4.2.tar.gz +bf559a0485667a3bfa4513a23501579b MesaDemos-7.4.2.tar.bz2 +5379e622b65e8c22022dba34aeb6f4f9 MesaDemos-7.4.2.zip +7cc43c1c35bf6a279a16e063dea3b8c5 MesaGLUT-7.4.2.tar.gz +e0dfc44d537904a030861e5b3c760c11 MesaGLUT-7.4.2.tar.bz2 +4a6cf5bbbac190d6ba97448b3098b7f4 MesaGLUT-7.4.2.zip </pre> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/docs/relnotes-7.4.3.html new/Mesa-7.4.3/docs/relnotes-7.4.3.html --- old/Mesa-7.4.2/docs/relnotes-7.4.3.html 1970-01-01 01:00:00.000000000 +0100 +++ new/Mesa-7.4.3/docs/relnotes-7.4.3.html 2009-06-19 23:15:44.000000000 +0200 @@ -0,0 +1,70 @@ +<HTML> + +<TITLE>Mesa Release Notes</TITLE> + +<head><link rel="stylesheet" type="text/css" href="mesa.css"></head> + +<BODY> + +<body bgcolor="#eeeeee"> + +<H1>Mesa 7.4.3 Release Notes / 19 June 2009</H1> + +<p> +Mesa 7.4.3 is a stable development release fixing bugs since the 7.4.2 release. +</p> +<p> +Mesa 7.4.3 implements the OpenGL 2.1 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 2.1. +</p> +<p> +See the <a href="install.html">Compiling/Installing page</a> for prerequisites +for DRI hardware acceleration. +</p> + + +<h2>MD5 checksums</h2> +<pre> +</pre> + + +<h2>Bug fixes</h2> +<ul> +<li>Fixed texture object reference counting bug (bug 21756) +<li>Allow depth/stencil textures to be attached to GL_STENCIL_ATTACHMENT point + (SF bug 2793846) +<li>Added missing glGet case for GL_VERTEX_ARRAY_BINDING_APPLE +<li>Fixed some OSMesa build issues +<li>Fixed a vertex buffer object crash +<li>Fixed broken glTexImage3D() when image type = GL_BITMAP +<li>Fixed some GLSL preprocessor bugs +<li>Fixed framebuffer mem leak in i945/i965 DRI drivers +<li>Fixed texture coordinate repeat bug in swrast (bug 21872) +<li>Fixed incorrect viewport clamping (lower bound is zero, not one) +<li>GLX fix for glean's makeCurrent test case +</ul> + + + +<h2>Driver Status</h2> + +<pre> +Driver Status +---------------------- ---------------------- +DRI drivers varies with the driver +XMesa/GLX (on Xlib) implements OpenGL 2.1 +OSMesa (off-screen) implements OpenGL 2.1 +Windows/Win32 implements OpenGL 2.1 +Glide (3dfx Voodoo1/2) implements OpenGL 1.3 +SVGA unsupported +Wind River UGL unsupported +DJGPP unsupported +GGI unsupported +BeOS unsupported +Allegro unsupported +D3D unsupported +</pre> + +</body> +</html> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/docs/relnotes.html new/Mesa-7.4.3/docs/relnotes.html --- old/Mesa-7.4.2/docs/relnotes.html 2009-04-18 19:12:09.000000000 +0200 +++ new/Mesa-7.4.3/docs/relnotes.html 2009-06-17 19:30:02.000000000 +0200 @@ -20,6 +20,7 @@ </p> <UL> +<LI><A HREF="relnotes-7.4.3.html">7.4.3 release notes</A> <LI><A HREF="relnotes-7.4.2.html">7.4.2 release notes</A> <LI><A HREF="relnotes-7.4.1.html">7.4.1 release notes</A> <LI><A HREF="relnotes-7.4.html">7.4 release notes</A> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/Makefile new/Mesa-7.4.3/Makefile --- old/Mesa-7.4.2/Makefile 2009-05-14 21:19:11.000000000 +0200 +++ new/Mesa-7.4.3/Makefile 2009-06-17 19:31:54.000000000 +0200 @@ -178,7 +178,7 @@ # Rules for making release tarballs -VERSION=7.4.2 +VERSION=7.4.3 DIRECTORY = Mesa-$(VERSION) LIB_NAME = MesaLib-$(VERSION) DEMO_NAME = MesaDemos-$(VERSION) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/Makefile~ new/Mesa-7.4.3/Makefile~ --- old/Mesa-7.4.2/Makefile~ 2009-04-18 18:49:25.000000000 +0200 +++ new/Mesa-7.4.3/Makefile~ 1970-01-01 01:00:00.000000000 +0100 @@ -1,537 +0,0 @@ -# Top-level Mesa makefile - -TOP = . - -SUBDIRS = src progs - - -default: $(TOP)/configs/current - @for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE)) || exit 1 ; \ - fi \ - done - - -doxygen: - cd doxygen && $(MAKE) - -clean: - -@touch $(TOP)/configs/current - -@for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) clean) ; \ - fi \ - done - -@test -s $(TOP)/configs/current || rm -f $(TOP)/configs/current - - -realclean: clean - -rm -rf lib* - -rm -f $(TOP)/configs/current - -rm -f $(TOP)/configs/autoconf - -rm -rf autom4te.cache - -find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \ - -name depend -o -name depend.bak ')' -exec rm -f '{}' ';' - - -distclean: realclean - - -install: - @for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) install) || exit 1 ; \ - fi \ - done - - -# DirectFBGL module installation -linux-directfb-install: - cd src/mesa/drivers/directfb && $(MAKE) install - - -.PHONY: default doxygen clean realclean distclean install linux-directfb-install - - -# If there's no current configuration file -$(TOP)/configs/current: - @echo - @echo - @echo "Please choose a configuration from the following list:" - @ls -1 $(TOP)/configs | grep -v "current\|default\|CVS\|autoconf.*" - @echo - @echo "Then type 'make <config>' (ex: 'make linux-x86')" - @echo - @echo "Or, run './configure' then 'make'" - @echo "See './configure --help' for details" - @echo - @echo "(ignore the following error message)" - @exit 1 - - -# Rules to set/install a specific build configuration -aix \ -aix-64 \ -aix-64-static \ -aix-gcc \ -aix-static \ -autoconf \ -bluegene-osmesa \ -bluegene-xlc-osmesa \ -beos \ -catamount-osmesa-pgi \ -darwin \ -darwin-fat-32bit \ -darwin-fat-all \ -darwin-static \ -darwin-static-x86ppc \ -freebsd \ -freebsd-dri \ -freebsd-dri-amd64 \ -freebsd-dri-x86 \ -hpux10 \ -hpux10-gcc \ -hpux10-static \ -hpux11-32 \ -hpux11-32-static \ -hpux11-32-static-nothreads \ -hpux11-64 \ -hpux11-64-static \ -hpux11-ia64 \ -hpux11-ia64-static \ -hpux9 \ -hpux9-gcc \ -irix6-64 \ -irix6-64-static \ -irix6-n32 \ -irix6-n32-static \ -irix6-o32 \ -irix6-o32-static \ -linux \ -linux-alpha \ -linux-alpha-static \ -linux-debug \ -linux-directfb \ -linux-dri \ -linux-dri-debug \ -linux-dri-x86 \ -linux-dri-x86-64 \ -linux-dri-ppc \ -linux-dri-xcb \ -linux-indirect \ -linux-fbdev \ -linux-glide \ -linux-ia64-icc \ -linux-ia64-icc-static \ -linux-icc \ -linux-icc-static \ -linux-osmesa \ -linux-osmesa16 \ -linux-osmesa16-static \ -linux-osmesa32 \ -linux-ppc \ -linux-ppc-static \ -linux-solo \ -linux-solo-x86 \ -linux-solo-ia64 \ -linux-sparc \ -linux-sparc5 \ -linux-static \ -linux-ultrasparc \ -linux-tcc \ -linux-x86 \ -linux-x86-debug \ -linux-x86-32 \ -linux-x86-64 \ -linux-x86-64-debug \ -linux-x86-64-static \ -linux-x86-glide \ -linux-x86-static \ -netbsd \ -openbsd \ -osf1 \ -osf1-static \ -solaris-x86 \ -solaris-x86-gcc \ -solaris-x86-gcc-static \ -sunos4 \ -sunos4-gcc \ -sunos4-static \ -sunos5 \ -sunos5-gcc \ -sunos5-64-gcc \ -sunos5-smp \ -sunos5-v8 \ -sunos5-v8-static \ -sunos5-v9 \ -sunos5-v9-static \ -sunos5-v9-cc-g++ \ -ultrix-gcc: - @ if test -f configs/current || test -L configs/current ; then \ - echo "Please run 'make realclean' before changing configs" ; \ - exit 1 ; \ - fi - (cd configs && rm -f current && ln -s $@ current) - $(MAKE) default - - -# Rules for making release tarballs - -VERSION=7.4.1 -DIRECTORY = Mesa-$(VERSION) -LIB_NAME = MesaLib-$(VERSION) -DEMO_NAME = MesaDemos-$(VERSION) -GLUT_NAME = MesaGLUT-$(VERSION) - -MAIN_FILES = \ - $(DIRECTORY)/Makefile* \ - $(DIRECTORY)/configure \ - $(DIRECTORY)/configure.ac \ - $(DIRECTORY)/acinclude.m4 \ - $(DIRECTORY)/aclocal.m4 \ - $(DIRECTORY)/descrip.mms \ - $(DIRECTORY)/mms-config. \ - $(DIRECTORY)/bin/config.guess \ - $(DIRECTORY)/bin/config.sub \ - $(DIRECTORY)/bin/install-sh \ - $(DIRECTORY)/bin/mklib \ - $(DIRECTORY)/bin/minstall \ - $(DIRECTORY)/bin/version.mk \ - $(DIRECTORY)/configs/[a-z]* \ - $(DIRECTORY)/docs/*.html \ - $(DIRECTORY)/docs/COPYING \ - $(DIRECTORY)/docs/README.* \ - $(DIRECTORY)/docs/RELNOTES* \ - $(DIRECTORY)/docs/*.spec \ - $(DIRECTORY)/include/GL/internal/glcore.h \ - $(DIRECTORY)/include/GL/dmesa.h \ - $(DIRECTORY)/include/GL/ggimesa.h \ - $(DIRECTORY)/include/GL/gl.h \ - $(DIRECTORY)/include/GL/glext.h \ - $(DIRECTORY)/include/GL/gl_mangle.h \ - $(DIRECTORY)/include/GL/glu.h \ - $(DIRECTORY)/include/GL/glu_mangle.h \ - $(DIRECTORY)/include/GL/glx.h \ - $(DIRECTORY)/include/GL/glxext.h \ - $(DIRECTORY)/include/GL/glx_mangle.h \ - $(DIRECTORY)/include/GL/glfbdev.h \ - $(DIRECTORY)/include/GL/mesa_wgl.h \ - $(DIRECTORY)/include/GL/mglmesa.h \ - $(DIRECTORY)/include/GL/osmesa.h \ - $(DIRECTORY)/include/GL/svgamesa.h \ - $(DIRECTORY)/include/GL/vms_x_fix.h \ - $(DIRECTORY)/include/GL/wmesa.h \ - $(DIRECTORY)/src/Makefile \ - $(DIRECTORY)/src/descrip.mms \ - $(DIRECTORY)/src/mesa/Makefile* \ - $(DIRECTORY)/src/mesa/sources \ - $(DIRECTORY)/src/mesa/descrip.mms \ - $(DIRECTORY)/src/mesa/gl.pc.in \ - $(DIRECTORY)/src/mesa/osmesa.pc.in \ - $(DIRECTORY)/src/mesa/depend \ - $(DIRECTORY)/src/mesa/main/*.[chS] \ - $(DIRECTORY)/src/mesa/main/descrip.mms \ - $(DIRECTORY)/src/mesa/glapi/*.[chS] \ - $(DIRECTORY)/src/mesa/glapi/descrip.mms \ - $(DIRECTORY)/src/mesa/math/*.[ch] \ - $(DIRECTORY)/src/mesa/math/descrip.mms \ - $(DIRECTORY)/src/mesa/shader/*.[ch] \ - $(DIRECTORY)/src/mesa/shader/descrip.mms \ - $(DIRECTORY)/src/mesa/shader/grammar/*.[ch] \ - $(DIRECTORY)/src/mesa/shader/grammar/descrip.mms \ - $(DIRECTORY)/src/mesa/shader/slang/*.[ch] \ - $(DIRECTORY)/src/mesa/shader/slang/descrip.mms \ - $(DIRECTORY)/src/mesa/shader/slang/library/*.[ch] \ - $(DIRECTORY)/src/mesa/shader/slang/library/*.gc \ - $(DIRECTORY)/src/mesa/shader/slang/library/*.syn \ - $(DIRECTORY)/src/mesa/shader/slang/library/Makefile \ - $(DIRECTORY)/src/mesa/swrast/*.[ch] \ - $(DIRECTORY)/src/mesa/swrast/descrip.mms \ - $(DIRECTORY)/src/mesa/swrast_setup/*.[ch] \ - $(DIRECTORY)/src/mesa/swrast_setup/descrip.mms \ - $(DIRECTORY)/src/mesa/vbo/*.[chS] \ - $(DIRECTORY)/src/mesa/vbo/descrip.mms \ - $(DIRECTORY)/src/mesa/tnl/*.[chS] \ - $(DIRECTORY)/src/mesa/tnl/descrip.mms \ - $(DIRECTORY)/src/mesa/tnl_dd/*.[ch] \ - $(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch] \ - $(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm \ - $(DIRECTORY)/src/mesa/drivers/Makefile \ - $(DIRECTORY)/src/mesa/drivers/beos/*.cpp \ - $(DIRECTORY)/src/mesa/drivers/beos/Makefile \ - $(DIRECTORY)/src/mesa/drivers/common/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/common/descrip.mms \ - $(DIRECTORY)/src/mesa/drivers/directfb/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/directfb/Makefile \ - $(DIRECTORY)/src/mesa/drivers/dos/*.[chS] \ - $(DIRECTORY)/src/mesa/drivers/fbdev/Makefile \ - $(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c \ - $(DIRECTORY)/src/mesa/drivers/glide/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/ggi/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in \ - $(DIRECTORY)/src/mesa/drivers/ggi/default/*.c \ - $(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in \ - $(DIRECTORY)/src/mesa/drivers/ggi/display/*.c \ - $(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in \ - $(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h \ - $(DIRECTORY)/src/mesa/drivers/osmesa/Makefile \ - $(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win \ - $(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms \ - $(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def \ - $(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/svga/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/windows/*/*.def \ - $(DIRECTORY)/src/mesa/drivers/x11/Makefile \ - $(DIRECTORY)/src/mesa/drivers/x11/descrip.mms \ - $(DIRECTORY)/src/mesa/drivers/x11/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/glslcompiler/Makefile \ - $(DIRECTORY)/src/mesa/drivers/glslcompiler/glslcompiler.c \ - $(DIRECTORY)/src/mesa/ppc/*.[ch] \ - $(DIRECTORY)/src/mesa/sparc/*.[chS] \ - $(DIRECTORY)/src/mesa/x86/Makefile \ - $(DIRECTORY)/src/mesa/x86/*.[ch] \ - $(DIRECTORY)/src/mesa/x86/*.S \ - $(DIRECTORY)/src/mesa/x86/rtasm/*.[ch] \ - $(DIRECTORY)/src/mesa/x86-64/*.[chS] \ - $(DIRECTORY)/src/mesa/x86-64/Makefile \ - $(DIRECTORY)/progs/Makefile \ - $(DIRECTORY)/progs/util/README \ - $(DIRECTORY)/progs/util/*.[ch] \ - $(DIRECTORY)/progs/util/sampleMakefile \ - $(DIRECTORY)/vms/analyze_map.com \ - $(DIRECTORY)/vms/xlib.opt \ - $(DIRECTORY)/vms/xlib_share.opt \ - $(DIRECTORY)/windows/VC8/ - - -DRI_FILES = \ - $(DIRECTORY)/include/GL/internal/dri_interface.h \ - $(DIRECTORY)/include/GL/internal/glcore.h \ - $(DIRECTORY)/include/GL/internal/sarea.h \ - $(DIRECTORY)/src/glx/Makefile \ - $(DIRECTORY)/src/glx/x11/Makefile \ - $(DIRECTORY)/src/glx/x11/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/dri/Makefile \ - $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \ - $(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in \ - $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po \ - $(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS] \ - $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \ - $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \ - $(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch] - -SGI_GLU_FILES = \ - $(DIRECTORY)/src/glu/Makefile \ - $(DIRECTORY)/src/glu/descrip.mms \ - $(DIRECTORY)/src/glu/glu.pc.in \ - $(DIRECTORY)/src/glu/sgi/Makefile \ - $(DIRECTORY)/src/glu/sgi/Makefile.mgw \ - $(DIRECTORY)/src/glu/sgi/Makefile.win \ - $(DIRECTORY)/src/glu/sgi/Makefile.DJ \ - $(DIRECTORY)/src/glu/sgi/glu.def \ - $(DIRECTORY)/src/glu/sgi/dummy.cc \ - $(DIRECTORY)/src/glu/sgi/descrip.mms \ - $(DIRECTORY)/src/glu/sgi/glu.exports \ - $(DIRECTORY)/src/glu/sgi/glu.exports.darwin \ - $(DIRECTORY)/src/glu/sgi/mesaglu.opt \ - $(DIRECTORY)/src/glu/sgi/include/gluos.h \ - $(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h \ - $(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc \ - $(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h \ - $(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc \ - $(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h \ - $(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc \ - $(DIRECTORY)/src/glu/sgi/libtess/README \ - $(DIRECTORY)/src/glu/sgi/libtess/alg-outline \ - $(DIRECTORY)/src/glu/sgi/libtess/*.[ch] \ - $(DIRECTORY)/src/glu/sgi/libutil/*.[ch] - -MESA_GLU_FILES = \ - $(DIRECTORY)/src/glu/mesa/README[12] \ - $(DIRECTORY)/src/glu/mesa/Makefile* \ - $(DIRECTORY)/src/glu/mesa/descrip.mms \ - $(DIRECTORY)/src/glu/mesa/mms_depend \ - $(DIRECTORY)/src/glu/mesa/*.def \ - $(DIRECTORY)/src/glu/mesa/depend \ - $(DIRECTORY)/src/glu/mesa/*.[ch] - -GLW_FILES = \ - $(DIRECTORY)/src/glw/*.[ch] \ - $(DIRECTORY)/src/glw/Makefile* \ - $(DIRECTORY)/src/glw/README \ - $(DIRECTORY)/src/glw/glw.pc.in \ - $(DIRECTORY)/src/glw/depend - -DEMO_FILES = \ - $(DIRECTORY)/progs/beos/*.cpp \ - $(DIRECTORY)/progs/beos/Makefile \ - $(DIRECTORY)/progs/images/*.rgb \ - $(DIRECTORY)/progs/images/*.rgba \ - $(DIRECTORY)/progs/demos/Makefile* \ - $(DIRECTORY)/progs/demos/descrip.mms \ - $(DIRECTORY)/progs/demos/*.[ch] \ - $(DIRECTORY)/progs/demos/*.cxx \ - $(DIRECTORY)/progs/demos/*.dat \ - $(DIRECTORY)/progs/demos/README \ - $(DIRECTORY)/progs/fbdev/Makefile \ - $(DIRECTORY)/progs/fbdev/glfbdevtest.c \ - $(DIRECTORY)/progs/osdemos/Makefile \ - $(DIRECTORY)/progs/osdemos/*.c \ - $(DIRECTORY)/progs/xdemos/Makefile* \ - $(DIRECTORY)/progs/xdemos/descrip.mms \ - $(DIRECTORY)/progs/xdemos/*.[chf] \ - $(DIRECTORY)/progs/redbook/Makefile* \ - $(DIRECTORY)/progs/redbook/README \ - $(DIRECTORY)/progs/redbook/*.[ch] \ - $(DIRECTORY)/progs/samples/Makefile* \ - $(DIRECTORY)/progs/samples/README \ - $(DIRECTORY)/progs/samples/*.c \ - $(DIRECTORY)/progs/glsl/Makefile* \ - $(DIRECTORY)/progs/glsl/*.c \ - $(DIRECTORY)/progs/glsl/*.frag \ - $(DIRECTORY)/progs/glsl/*.vert \ - $(DIRECTORY)/progs/windml/Makefile.ugl \ - $(DIRECTORY)/progs/windml/*.c \ - $(DIRECTORY)/progs/windml/*.bmp \ - $(DIRECTORY)/progs/ggi/*.c \ - $(DIRECTORY)/windows/VC6/progs/demos/*.dsp \ - $(DIRECTORY)/windows/VC6/progs/progs.dsw \ - $(DIRECTORY)/windows/VC7/progs/demos/*.vcproj \ - $(DIRECTORY)/windows/VC7/progs/progs.sln - -GLUT_FILES = \ - $(DIRECTORY)/include/GL/glut.h \ - $(DIRECTORY)/include/GL/glutf90.h \ - $(DIRECTORY)/src/glut/glx/Makefile* \ - $(DIRECTORY)/src/glut/glx/depend \ - $(DIRECTORY)/src/glut/glx/glut.pc.in \ - $(DIRECTORY)/src/glut/glx/*def \ - $(DIRECTORY)/src/glut/glx/descrip.mms \ - $(DIRECTORY)/src/glut/glx/mms_depend \ - $(DIRECTORY)/src/glut/glx/*.[ch] \ - $(DIRECTORY)/src/glut/beos/*.[ch] \ - $(DIRECTORY)/src/glut/beos/*.cpp \ - $(DIRECTORY)/src/glut/beos/Makefile \ - $(DIRECTORY)/src/glut/dos/*.[ch] \ - $(DIRECTORY)/src/glut/dos/Makefile.DJ \ - $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS] \ - $(DIRECTORY)/src/glut/ggi/*.[ch] \ - $(DIRECTORY)/src/glut/ggi/Makefile \ - $(DIRECTORY)/src/glut/fbdev/Makefile \ - $(DIRECTORY)/src/glut/fbdev/*[ch] \ - $(DIRECTORY)/src/glut/mini/*[ch] \ - $(DIRECTORY)/src/glut/mini/glut.pc.in \ - $(DIRECTORY)/src/glut/directfb/Makefile \ - $(DIRECTORY)/src/glut/directfb/NOTES \ - $(DIRECTORY)/src/glut/directfb/*[ch] \ - $(DIRECTORY)/windows/VC6/progs/glut/glut.dsp \ - $(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj - -DEPEND_FILES = \ - $(TOP)/src/mesa/depend \ - $(TOP)/src/glx/x11/depend \ - $(TOP)/src/glw/depend \ - $(TOP)/src/glut/glx/depend \ - $(TOP)/src/glu/sgi/depend - - -LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES) - - -# Everything for new a Mesa release: -tarballs: rm_depend configure aclocal.m4 lib_gz demo_gz glut_gz \ - lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5 - - -# Helper for autoconf builds -ACLOCAL = aclocal -ACLOCAL_FLAGS = -AUTOCONF = autoconf -AC_FLAGS = -aclocal.m4: configure.ac acinclude.m4 - $(ACLOCAL) $(ACLOCAL_FLAGS) -configure: configure.ac aclocal.m4 acinclude.m4 - $(AUTOCONF) $(AC_FLAGS) - -rm_depend: - @for dep in $(DEPEND_FILES) ; do \ - rm -f $$dep ; \ - touch $$dep ; \ - done - -lib_gz: - rm -f configs/current ; \ - rm -f configs/autoconf ; \ - cd .. ; \ - tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \ - gzip $(LIB_NAME).tar ; \ - mv $(LIB_NAME).tar.gz $(DIRECTORY) - -demo_gz: - cd .. ; \ - tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \ - gzip $(DEMO_NAME).tar ; \ - mv $(DEMO_NAME).tar.gz $(DIRECTORY) - -glut_gz: - cd .. ; \ - tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \ - gzip $(GLUT_NAME).tar ; \ - mv $(GLUT_NAME).tar.gz $(DIRECTORY) - -lib_bz2: - rm -f configs/current ; \ - rm -f configs/autoconf ; \ - cd .. ; \ - tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \ - bzip2 $(LIB_NAME).tar ; \ - mv $(LIB_NAME).tar.bz2 $(DIRECTORY) - -demo_bz2: - cd .. ; \ - tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \ - bzip2 $(DEMO_NAME).tar ; \ - mv $(DEMO_NAME).tar.bz2 $(DIRECTORY) - -glut_bz2: - cd .. ; \ - tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \ - bzip2 $(GLUT_NAME).tar ; \ - mv $(GLUT_NAME).tar.bz2 $(DIRECTORY) - -lib_zip: - rm -f configs/current ; \ - rm -f configs/autoconf ; \ - rm -f $(LIB_NAME).zip ; \ - cd .. ; \ - zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \ - mv $(LIB_NAME).zip $(DIRECTORY) - -demo_zip: - rm -f $(DEMO_NAME).zip ; \ - cd .. ; \ - zip -qr $(DEMO_NAME).zip $(DEMO_FILES) ; \ - mv $(DEMO_NAME).zip $(DIRECTORY) - -glut_zip: - rm -f $(GLUT_NAME).zip ; \ - cd .. ; \ - zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \ - mv $(GLUT_NAME).zip $(DIRECTORY) - -md5: - @-md5sum $(LIB_NAME).tar.gz - @-md5sum $(LIB_NAME).tar.bz2 - @-md5sum $(LIB_NAME).zip - @-md5sum $(DEMO_NAME).tar.gz - @-md5sum $(DEMO_NAME).tar.bz2 - @-md5sum $(DEMO_NAME).zip - @-md5sum $(GLUT_NAME).tar.gz - @-md5sum $(GLUT_NAME).tar.bz2 - @-md5sum $(GLUT_NAME).zip - -.PHONY: tarballs rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 \ - glut_bz2 lib_zip demo_zip glut_zip md5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/glx/x11/drisw_glx.c new/Mesa-7.4.3/src/glx/x11/drisw_glx.c --- old/Mesa-7.4.2/src/glx/x11/drisw_glx.c 2009-05-04 16:34:09.000000000 +0200 +++ new/Mesa-7.4.3/src/glx/x11/drisw_glx.c 2009-06-17 19:30:02.000000000 +0200 @@ -405,6 +405,8 @@ psp->createContext = driCreateContext; psp->createDrawable = driCreateDrawable; psp->swapBuffers = driSwapBuffers; + psp->waitX = NULL; + psp->waitGL = NULL; return psp; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/glx/x11/glxcurrent.c new/Mesa-7.4.3/src/glx/x11/glxcurrent.c --- old/Mesa-7.4.2/src/glx/x11/glxcurrent.c 2009-01-22 18:38:33.000000000 +0100 +++ new/Mesa-7.4.3/src/glx/x11/glxcurrent.c 2009-06-17 19:30:04.000000000 +0200 @@ -429,7 +429,7 @@ &dummy_reply); } #ifdef GLX_DIRECT_RENDERING - else if (oldGC->driContext) { + else if (oldGC->driContext && oldGC != gc) { oldGC->driContext->unbindContext(oldGC->driContext); } #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/drivers/dri/common/dri_util.c new/Mesa-7.4.3/src/mesa/drivers/dri/common/dri_util.c --- old/Mesa-7.4.2/src/mesa/drivers/dri/common/dri_util.c 2009-01-22 18:38:33.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/drivers/dri/common/dri_util.c 2009-06-17 19:30:04.000000000 +0200 @@ -119,6 +119,9 @@ pdp = pcp->driDrawablePriv; prp = pcp->driReadablePriv; + /* already unbound */ + if (!pdp && !prp) + return GL_TRUE; /* Let driver unbind drawable from context */ (*psp->DriverAPI.UnbindContext)(pcp); @@ -143,9 +146,10 @@ * window we can determine the last context bound to the window and * use that context's lock. (BrianP, 2-Dec-2000) */ + pcp->driDrawablePriv = pcp->driReadablePriv = NULL; + #if 0 /* Unbind the drawable */ - pcp->driDrawablePriv = NULL; pdp->driContextPriv = &psp->dummyContextPriv; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/drivers/dri/intel/intel_screen.c new/Mesa-7.4.3/src/mesa/drivers/dri/intel/intel_screen.c --- old/Mesa-7.4.2/src/mesa/drivers/dri/intel/intel_screen.c 2009-03-17 15:48:46.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/drivers/dri/intel/intel_screen.c 2009-06-17 19:30:04.000000000 +0200 @@ -385,7 +385,31 @@ static void intelDestroyBuffer(__DRIdrawablePrivate * driDrawPriv) { - _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); + struct intel_framebuffer *intel_fb = driDrawPriv->driverPrivate; + struct intel_renderbuffer *depth_rb; + struct intel_renderbuffer *stencil_rb; + + if (intel_fb) { + if (intel_fb->color_rb[0]) { + intel_renderbuffer_set_region(intel_fb->color_rb[0], NULL); + } + + if (intel_fb->color_rb[1]) { + intel_renderbuffer_set_region(intel_fb->color_rb[1], NULL); + } + + depth_rb = intel_get_renderbuffer(&intel_fb->Base, BUFFER_DEPTH); + if (depth_rb) { + intel_renderbuffer_set_region(depth_rb, NULL); + } + + stencil_rb = intel_get_renderbuffer(&intel_fb->Base, BUFFER_STENCIL); + if (stencil_rb) { + intel_renderbuffer_set_region(stencil_rb, NULL); + } + } + + _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/drivers/osmesa/Makefile new/Mesa-7.4.3/src/mesa/drivers/osmesa/Makefile --- old/Mesa-7.4.2/src/mesa/drivers/osmesa/Makefile 2009-01-22 18:38:34.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/drivers/osmesa/Makefile 2009-06-17 19:30:03.000000000 +0200 @@ -19,11 +19,12 @@ -I$(TOP)/src/mesa \ -I$(TOP)/src/mesa/main +# Standalone osmesa needs to be linked with core Mesa APIs +ifeq ($(DRIVER_DIRS), osmesa) CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a - - -.PHONY: osmesa8 -.PHONY: osmesa16 +else +CORE_MESA = +endif .c.o: @@ -31,31 +32,12 @@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) - @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ - $(MAKE) osmesa16 ; \ - else \ - $(MAKE) osmesa8 ; \ - fi - - - - -# The normal libOSMesa is used in conjuction with libGL -osmesa8: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) - -$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) - $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ - -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ - -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ - -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ - $(OSMESA_LIB_DEPS) $(OBJECTS) - - -# The libOSMesa16/libOSMesa32 libraries do not use libGL but rather are built -# with all the other Mesa sources (compiled with -DCHAN_BITS=16/32 -osmesa16: $(OBJECTS) $(CORE_MESA) +# libOSMesa can be used in conjuction with libGL or with all other Mesa +# sources. We can also build libOSMesa16/libOSMesa32 by setting +# -DCHAN_BITS=16/32. +$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA) $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/drivers/x11/fakeglx.c new/Mesa-7.4.3/src/mesa/drivers/x11/fakeglx.c --- old/Mesa-7.4.2/src/mesa/drivers/x11/fakeglx.c 2009-03-13 04:28:49.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/drivers/x11/fakeglx.c 2009-06-17 19:30:05.000000000 +0200 @@ -2218,7 +2218,7 @@ if (!dpy || !config || !pixmap) return 0; - for (attr = attribList; *attr; attr++) { + for (attr = attribList; attr && *attr; attr++) { switch (*attr) { case GLX_TEXTURE_FORMAT_EXT: attr++; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/main/context.c new/Mesa-7.4.3/src/mesa/main/context.c --- old/Mesa-7.4.2/src/mesa/main/context.c 2009-03-17 15:48:46.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/main/context.c 2009-06-17 19:31:54.000000000 +0200 @@ -1550,6 +1550,24 @@ /** + * Check if the viewport/scissor size has not yet been initialized. + * Initialize the size if the given width and height are non-zero. + */ +void +_mesa_check_init_viewport(GLcontext *ctx, GLuint width, GLuint height) +{ + if (!ctx->ViewportInitialized && width > 0 && height > 0) { + /* Note: set flag here, before calling _mesa_set_viewport(), to prevent + * potential infinite recursion. + */ + ctx->ViewportInitialized = GL_TRUE; + _mesa_set_viewport(ctx, 0, 0, width, height); + _mesa_set_scissor(ctx, 0, 0, width, height); + } +} + + +/** * Bind the given context to the given drawBuffer and readBuffer and * make it the current context for the calling thread. * We'll render into the drawBuffer and read pixels from the @@ -1651,25 +1669,24 @@ ASSERT(drawBuffer->Height > 0); #endif - if (newCtx->FirstTimeCurrent) { - /* set initial viewport and scissor size now */ - _mesa_set_viewport(newCtx, 0, 0, - drawBuffer->Width, drawBuffer->Height); - _mesa_set_scissor(newCtx, 0, 0, - drawBuffer->Width, drawBuffer->Height ); - check_context_limits(newCtx); + if (drawBuffer) { + _mesa_check_init_viewport(newCtx, + drawBuffer->Width, drawBuffer->Height); } } - /* We can use this to help debug user's problems. Tell them to set - * the MESA_INFO env variable before running their app. Then the - * first time each context is made current we'll print some useful - * information. - */ if (newCtx->FirstTimeCurrent) { + check_context_limits(newCtx); + + /* We can use this to help debug user's problems. Tell them to set + * the MESA_INFO env variable before running their app. Then the + * first time each context is made current we'll print some useful + * information. + */ if (_mesa_getenv("MESA_INFO")) { _mesa_print_info(); } + newCtx->FirstTimeCurrent = GL_FALSE; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/main/context.h new/Mesa-7.4.3/src/mesa/main/context.h --- old/Mesa-7.4.2/src/mesa/main/context.h 2009-03-13 04:28:49.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/main/context.h 2009-06-17 19:30:05.000000000 +0200 @@ -132,6 +132,9 @@ _mesa_make_current( GLcontext *ctx, GLframebuffer *drawBuffer, GLframebuffer *readBuffer ); +extern void +_mesa_check_init_viewport(GLcontext *ctx, GLuint width, GLuint height); + extern GLboolean _mesa_share_state(GLcontext *ctx, GLcontext *ctxToShare); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/main/fbobject.c new/Mesa-7.4.3/src/mesa/main/fbobject.c --- old/Mesa-7.4.2/src/mesa/main/fbobject.c 2009-03-13 04:28:49.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/main/fbobject.c 2009-06-17 19:31:54.000000000 +0200 @@ -323,6 +323,7 @@ /* OK */ } else if (ctx->Extensions.EXT_packed_depth_stencil && + ctx->Extensions.ARB_depth_texture && texImage->TexFormat->BaseFormat == GL_DEPTH_STENCIL_EXT) { /* OK */ } @@ -332,9 +333,18 @@ } } else { - /* no such thing as stencil textures */ - att->Complete = GL_FALSE; - return; + ASSERT(format == GL_STENCIL); + ASSERT(att->Renderbuffer->StencilBits); + if (ctx->Extensions.EXT_packed_depth_stencil && + ctx->Extensions.ARB_depth_texture && + att->Renderbuffer->_BaseFormat == GL_DEPTH_STENCIL_EXT) { + /* OK */ + } + else { + /* no such thing as stencil-only textures */ + att->Complete = GL_FALSE; + return; + } } } else if (att->Type == GL_RENDERBUFFER_EXT) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/main/get.c new/Mesa-7.4.3/src/mesa/main/get.c --- old/Mesa-7.4.2/src/mesa/main/get.c 2009-03-17 15:48:46.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/main/get.c 2009-06-17 19:30:03.000000000 +0200 @@ -1905,6 +1905,10 @@ CHECK_EXT1(ARB_shader_objects, "GetBooleanv"); params[0] = INT_TO_BOOLEAN(ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0); break; + case GL_VERTEX_ARRAY_BINDING_APPLE: + CHECK_EXT1(APPLE_vertex_array_object, "GetBooleanv"); + params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Name); + break; default: _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv(pname=0x%x)", pname); } @@ -3753,6 +3757,10 @@ CHECK_EXT1(ARB_shader_objects, "GetFloatv"); params[0] = (GLfloat)(ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0); break; + case GL_VERTEX_ARRAY_BINDING_APPLE: + CHECK_EXT1(APPLE_vertex_array_object, "GetFloatv"); + params[0] = (GLfloat)(ctx->Array.ArrayObj->Name); + break; default: _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv(pname=0x%x)", pname); } @@ -5601,6 +5609,10 @@ CHECK_EXT1(ARB_shader_objects, "GetIntegerv"); params[0] = ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0; break; + case GL_VERTEX_ARRAY_BINDING_APPLE: + CHECK_EXT1(APPLE_vertex_array_object, "GetIntegerv"); + params[0] = ctx->Array.ArrayObj->Name; + break; default: _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv(pname=0x%x)", pname); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/main/image.c new/Mesa-7.4.3/src/mesa/main/image.c --- old/Mesa-7.4.2/src/mesa/main/image.c 2009-01-22 18:38:34.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/main/image.c 2009-06-17 19:30:03.000000000 +0200 @@ -1,8 +1,9 @@ /* * Mesa 3-D graphics library - * Version: 7.1 + * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. + * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -738,12 +739,20 @@ GLint width, GLint height, GLenum format, GLenum type ) { + GLint bytesPerRow, bytesPerImage, remainder; + ASSERT(packing); - ASSERT(type != GL_BITMAP); - { + if (type == GL_BITMAP) { + if (packing->RowLength == 0) { + bytesPerRow = (width + 7) / 8; + } + else { + bytesPerRow = (packing->RowLength + 7) / 8; + } + } + else { const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type); - GLint bytesPerRow, bytesPerImage, remainder; if (bytesPerPixel <= 0) return -1; /* error */ @@ -753,17 +762,18 @@ else { bytesPerRow = bytesPerPixel * packing->RowLength; } - remainder = bytesPerRow % packing->Alignment; - if (remainder > 0) - bytesPerRow += (packing->Alignment - remainder); + } - if (packing->ImageHeight == 0) - bytesPerImage = bytesPerRow * height; - else - bytesPerImage = bytesPerRow * packing->ImageHeight; + remainder = bytesPerRow % packing->Alignment; + if (remainder > 0) + bytesPerRow += (packing->Alignment - remainder); - return bytesPerImage; - } + if (packing->ImageHeight == 0) + bytesPerImage = bytesPerRow * height; + else + bytesPerImage = bytesPerRow * packing->ImageHeight; + + return bytesPerImage; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/main/matrix.c new/Mesa-7.4.3/src/mesa/main/matrix.c --- old/Mesa-7.4.2/src/mesa/main/matrix.c 2009-03-13 04:28:49.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/main/matrix.c 2009-06-17 19:30:04.000000000 +0200 @@ -580,8 +580,8 @@ } /* clamp width and height to the implementation dependent range */ - width = CLAMP(width, 1, (GLsizei) ctx->Const.MaxViewportWidth); - height = CLAMP(height, 1, (GLsizei) ctx->Const.MaxViewportHeight); + width = MIN2(width, (GLsizei) ctx->Const.MaxViewportWidth); + height = MIN2(height, (GLsizei) ctx->Const.MaxViewportHeight); ctx->Viewport.X = x; ctx->Viewport.Width = width; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/main/mtypes.h new/Mesa-7.4.3/src/mesa/main/mtypes.h --- old/Mesa-7.4.2/src/mesa/main/mtypes.h 2009-03-20 15:49:39.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/main/mtypes.h 2009-06-17 19:31:54.000000000 +0200 @@ -3063,6 +3063,8 @@ GLenum RenderMode; /**< either GL_RENDER, GL_SELECT, GL_FEEDBACK */ GLbitfield NewState; /**< bitwise-or of _NEW_* flags */ + GLboolean ViewportInitialized; /**< has viewport size been initialized? */ + /** \name Derived state */ /*@{*/ /** Bitwise-or of DD_* flags. Note that this bitfield may be used before diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/main/state.c new/Mesa-7.4.3/src/mesa/main/state.c --- old/Mesa-7.4.2/src/mesa/main/state.c 2009-03-23 15:26:33.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/main/state.c 2009-06-17 19:31:54.000000000 +0200 @@ -157,7 +157,7 @@ /* 16..31 */ if (ctx->VertexProgram._Current) { - for (i = VERT_ATTRIB_GENERIC0; i < VERT_ATTRIB_MAX; i++) { + for (i = 0; i < Elements(ctx->Array.ArrayObj->VertexAttrib); i++) { if (ctx->Array.ArrayObj->VertexAttrib[i].Enabled) { min = MIN2(min, ctx->Array.ArrayObj->VertexAttrib[i]._MaxElement); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/main/texrender.c new/Mesa-7.4.3/src/mesa/main/texrender.c --- old/Mesa-7.4.2/src/mesa/main/texrender.c 2009-03-17 15:48:46.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/main/texrender.c 2009-06-17 19:30:02.000000000 +0200 @@ -507,6 +507,7 @@ trb->Base.BlueBits = trb->TexImage->TexFormat->BlueBits; trb->Base.AlphaBits = trb->TexImage->TexFormat->AlphaBits; trb->Base.DepthBits = trb->TexImage->TexFormat->DepthBits; + trb->Base.StencilBits = trb->TexImage->TexFormat->StencilBits; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/main/texstate.c new/Mesa-7.4.3/src/mesa/main/texstate.c --- old/Mesa-7.4.2/src/mesa/main/texstate.c 2009-05-11 17:46:29.000000000 +0200 +++ new/Mesa-7.4.3/src/mesa/main/texstate.c 2009-06-17 19:30:02.000000000 +0200 @@ -429,7 +429,7 @@ } if (texObj->_Complete) { texUnit->_ReallyEnabled = textureBit; - texUnit->_Current = texObj; + _mesa_reference_texobj(&texUnit->_Current, texObj); update_texture_compare_function(ctx, texObj); } } @@ -485,7 +485,6 @@ GLbitfield enableBits; GLuint tex; - texUnit->_Current = NULL; texUnit->_ReallyEnabled = 0; texUnit->_GenFlags = 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/main/version.h new/Mesa-7.4.3/src/mesa/main/version.h --- old/Mesa-7.4.2/src/mesa/main/version.h 2009-05-14 21:19:44.000000000 +0200 +++ new/Mesa-7.4.3/src/mesa/main/version.h 2009-06-17 19:30:03.000000000 +0200 @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 7.4.2 + * Version: 7.4.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. @@ -31,8 +31,8 @@ /* Mesa version */ #define MESA_MAJOR 7 #define MESA_MINOR 4 -#define MESA_PATCH 2 -#define MESA_VERSION_STRING "7.4.2" +#define MESA_PATCH 3 +#define MESA_VERSION_STRING "7.4.3" /* To make version comparison easy */ #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/shader/slang/slang_preprocess.c new/Mesa-7.4.3/src/mesa/shader/slang/slang_preprocess.c --- old/Mesa-7.4.2/src/mesa/shader/slang/slang_preprocess.c 2009-03-13 04:28:49.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/shader/slang/slang_preprocess.c 2009-06-17 19:30:04.000000000 +0200 @@ -1041,11 +1041,11 @@ /* Parse optional macro parameters. */ while (prod[i++] != PARAM_END) { - if (state.cond.top->effective) { - pp_symbol *param; + pp_symbol *param; - id = (const char *) (&prod[i]); - idlen = _mesa_strlen (id); + id = (const char *) (&prod[i]); + idlen = _mesa_strlen (id); + if (state.cond.top->effective) { pp_annotate (output, "%s, ", id); param = pp_symbols_push (&symbol->parameters); if (param == NULL) @@ -1059,8 +1059,23 @@ id = (const char *) (&prod[i]); idlen = _mesa_strlen (id); if (state.cond.top->effective) { + slang_string replacement; + expand_state es; + pp_annotate (output, ") %s", id); - slang_string_pushs (&symbol->replacement, id, idlen); + + slang_string_init(&replacement); + slang_string_pushs(&replacement, id, idlen); + + /* Expand macro replacement. */ + es.output = &symbol->replacement; + es.input = slang_string_cstr(&replacement); + es.state = &state; + if (!expand(&es, &state.symbols)) { + slang_string_free(&replacement); + goto error; + } + slang_string_free(&replacement); } i += idlen + 1; } @@ -1292,6 +1307,45 @@ /** + * Remove the continuation characters from the input string. + * This is the very first step in preprocessing and is effective + * even inside comment blocks. + * If there is a whitespace between a backslash and a newline, + * this is not considered as a line continuation. + * \return GL_TRUE for success, GL_FALSE otherwise. + */ +static GLboolean +_slang_preprocess_backslashes(slang_string *output, + const char *input) +{ + while (*input) { + if (input[0] == '\\') { + /* If a newline follows, eat the backslash and the newline. */ + if (input[1] == '\r') { + if (input[2] == '\n') { + input += 3; + } else { + input += 2; + } + } else if (input[1] == '\n') { + if (input[2] == '\r') { + input += 3; + } else { + input += 2; + } + } else { + /* Leave the backslash alone. */ + slang_string_pushc(output, *input++); + } + } else { + slang_string_pushc(output, *input++); + } + } + return GL_TRUE; +} + + +/** * Run preprocessor on source code. * \param extensions indicates which GL extensions are enabled * \param output the post-process results @@ -1308,6 +1362,7 @@ { grammar pid, eid; GLboolean success; + slang_string without_backslashes; pid = grammar_load_from_text ((const byte *) (slang_pp_directives_syn)); if (pid == 0) { @@ -1320,9 +1375,36 @@ grammar_destroy (pid); return GL_FALSE; } - success = preprocess_source (output, input, pid, eid, elog, extensions, pragmas); + + slang_string_init(&without_backslashes); + success = _slang_preprocess_backslashes(&without_backslashes, input); + + if (0) { + _mesa_printf("Pre-processed shader:\n"); + _mesa_printf("%s", slang_string_cstr(&without_backslashes)); + _mesa_printf("----------------------\n"); + } + + if (success) { + success = preprocess_source(output, + slang_string_cstr(&without_backslashes), + pid, + eid, + elog, + extensions, + pragmas); + } + + slang_string_free(&without_backslashes); grammar_destroy (eid); grammar_destroy (pid); + + if (0) { + _mesa_printf("Post-processed shader:\n"); + _mesa_printf("%s", slang_string_cstr(output)); + _mesa_printf("----------------------\n"); + } + return success; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/swrast/s_texfilter.c new/Mesa-7.4.3/src/mesa/swrast/s_texfilter.c --- old/Mesa-7.4.2/src/mesa/swrast/s_texfilter.c 2009-04-28 17:09:06.000000000 +0200 +++ new/Mesa-7.4.3/src/mesa/swrast/s_texfilter.c 2009-06-17 19:30:04.000000000 +0200 @@ -226,7 +226,7 @@ * If A is a signed integer, A % B doesn't give the right value for A < 0 * (in terms of texture repeat). Just casting to unsigned fixes that. */ -#define REMAINDER(A, B) ((unsigned) (A) % (unsigned) (B)) +#define REMAINDER(A, B) (((A) + (B) * 1024) % (B)) /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/vbo/vbo_exec_array.c new/Mesa-7.4.3/src/mesa/vbo/vbo_exec_array.c --- old/Mesa-7.4.2/src/mesa/vbo/vbo_exec_array.c 2009-03-13 04:28:49.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/vbo/vbo_exec_array.c 2009-06-17 19:31:54.000000000 +0200 @@ -114,8 +114,11 @@ for (i = 0; i < 8; i++) exec->array.legacy_array[VERT_ATTRIB_TEX0 + i] = &ctx->Array.ArrayObj->TexCoord[i]; - for (i = 0; i < VERT_ATTRIB_MAX; i++) + for (i = 0; i < MAX_VERTEX_ATTRIBS; i++) { + assert(i < Elements(ctx->Array.ArrayObj->VertexAttrib)); + assert(i < Elements(exec->array.generic_array)); exec->array.generic_array[i] = &ctx->Array.ArrayObj->VertexAttrib[i]; + } exec->array.array_obj = ctx->Array.ArrayObj->Name; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Mesa-7.4.2/src/mesa/vbo/vbo_exec_draw.c new/Mesa-7.4.3/src/mesa/vbo/vbo_exec_draw.c --- old/Mesa-7.4.2/src/mesa/vbo/vbo_exec_draw.c 2009-03-13 04:28:49.000000000 +0100 +++ new/Mesa-7.4.3/src/mesa/vbo/vbo_exec_draw.c 2009-06-17 19:31:54.000000000 +0200 @@ -184,6 +184,7 @@ (ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) { exec->vtx.inputs[16] = exec->vtx.inputs[0]; exec->vtx.attrsz[16] = exec->vtx.attrsz[0]; + exec->vtx.attrptr[16] = exec->vtx.attrptr[0]; exec->vtx.attrsz[0] = 0; } break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit samba for openSUSE:Factory
by root＠Hilbert.suse.de 20 Jun '09

20 Jun '09

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at Sat Jun 20 06:10:34 CEST 2009. -------- --- samba/samba.changes 2009-06-04 19:16:51.000000000 +0200 +++ samba/samba.changes 2009-06-16 18:30:55.000000000 +0200 @@ -1,0 +2,91 @@ +Mon Jun 16 16:51:38 CEST 2009 - lmuelle(a)suse.de + +- Update to 3.3.5. + + Fix SAMR and LSA checks (bug #6089, #6289) + + Fix posix acls when setting an ACL without explicit ACE for the + owner (bug #2346). + + Fix joining of Win7 into Samba domain (bug #6099). + + Fix joining of Win2000 SP4 clients (bug #6301). + + + BUG 2346: Fix posix acls when setting an ACL without explicit ACE for the + owner. + + BUG 5832: Fix build on RHEL when ccache is not available. + + BUG 5853: Add keyutils-devel to build requires to fix build on RHEL. + + BUG 5897: Fix shutdown script example in the smb.conf manpage. + + BUG 6089: Revert the extra SAMR and LSA checks. + + BUG 6099: Fix joining of Win7 into Samba domain. + + BUG 6157: Fix handling of multi-value attribute "uid". + + BUG 6289: Revert the extra SAMR and LSA checks. + + BUG 6297: Owner of sticky directory cannot delete files created by others. + + BUG 6301: Fix joining of Win2000 SP4 clients. + + BUG 6309: Support remote unjoining of Windows 2003 or greater. + + BUG 6315: smbd crashes doing vfs_full_audit on IPC$ close event. + + BUG 6320: Handle registry config source in file_list. + + BUG 6330: Fix DFS on AIX. + + BUG 6336: Fix 'net groupmap set' segfault. + + BUG 6361: Make --rcfile work in smbget. + + BUG 6365: Re-Add the "dropbox" functionality with -wx rights on a + directory. + + BUG 6372: Fix usermanager only displaying 1024 groups and aliases. + + BUG 6382: Fix case insensitive access to DFS links. + + BUG 6415: Filter out of range mappings in default idmap config in + idmap_tdb. + + BUG 6416: Filter out of range mappings in default idmap config in + idmap_tdb2. + + BUG 6417: Filter out of range mappings in default idmap config in + idmap_ldap. + + BUG 6441: Fix the compile with --enable-dnssd. + + BUG 6449: 'net rap user add' crashes without -C option. + + BUG 6465: Fix enumeration of empty aliases (ldb backend). + + + Prevent infinite include nesting. + + Mark registry shares without path unavailable. + + Also handle DirX return codes. + + Fix Coverity ID 897. + + Do not crash in ctdbd_traverse if ctdbd is not around. + + Fix a race condition in winbind leading to a panic. + + Some man pam_winbind improvements. + + Zero an uninitialized array. + +------------------------------------------------------------------- +Mon Jun 16 14:42:33 CEST 2009 - lmuelle(a)suse.de + +- Update to 3.2.12. + + Fix SAMR and LSA checks (bug #6089, #6289) + + Fix posix acls when setting an ACL without explicit ACE for the + owner (bug #2346). + + Fix "force user" (bug #6291). + + Fix Winbind crash (bug #6279). + + Fix joining of Win7 into Samba domain (bug #6099). + + + BUG 2346: Fix posix acls when setting an ACL without explicit ACE for the + owner. + + BUG 5798: CFLAGS info lost in configure. + + BUG 5832: Fix build on RHEL when ccache is not available. + + BUG 5835: Add keyutils-devel to build requires. + + BUG 5945: Fix out of memory error with Winbind idmap. + + BUG 6089: Revert the extra SAMR and LSA checks. + + BUG 6099: Fix joining of Win7 into Samba domain. + + BUG 6279: Fix Winbind crash. + + BUG 6289: Revert the extra SAMR and LSA checks. + + BUG 6291: Fix "force user". + + BUG 6301: Fix samr_ConnectVersion enum which is 32bit not 16bit. + + BUG 6372: Fix usermanager only displaying 1024 groups and aliases. + + BUG 6386: Groupdb mapping fix. + + BUG 6382: Fix case insensitive access to DFS links. + + BUG 6465: Fix enumeration of empty aliases (ldb backend). + + + Prevent creation of keys containing the '/' character. + + Fix bug in processing of open modes in POSIX open. + + Protect netlogon_creds_server_step() against NULL creds. + + Also handle DirX return codes. + + Fix a race condition in winbind leading to a panic. + + Fix a crash bug if we timeout in net rpc trustdom list. + + Fix profile acls in some corner cases. + +------------------------------------------------------------------- +Fri Jun 12 15:47:51 CEST 2009 - lmuelle(a)suse.de + +- Explicitly use 'tdbsam' as passdb backend in the default smb.conf file. + +------------------------------------------------------------------- @@ -4 +95 @@ -- Enable cifs.upcall on versions newer than SUSE 10.0 +- Enable cifs.upcall on versions newer than SUSE 10.0. @@ -357,0 +449,6 @@ +Tue Feb 10 07:17:07 CET 2009 - boyang(a)suse.de + +- Backport of the clean event context after fork and krb5 refresh chain + fixes; (bnc#415026). + +------------------------------------------------------------------- --- samba/samba-doc.changes 2009-03-10 15:26:51.000000000 +0100 +++ samba/samba-doc.changes 2009-06-08 21:07:04.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 8 14:07:22 CEST 2009 - ro(a)suse.de + +- BuildRequire keyutils-devel. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- samba-3.3.4.tar.bz2 New: ---- samba-3.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.T19017/_old 2009-06-20 06:07:38.000000000 +0200 +++ /var/tmp/diff_new_pack.T19017/_new 2009-06-20 06:07:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package samba-doc (Version 3.3.4) +# spec file for package samba-doc (Version 3.3.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,14 +19,41 @@ Name: samba-doc -BuildRequires: ccache cracklib-devel cups-devel e2fsprogs-devel gdbm-devel krb5-devel libacl-devel libiniparser-devel libnscd-devel openldap2-devel pam-devel popt-devel pwdutils python-devel readline-devel -%define samba_ver 3.3.4 +BuildRequires: cups-devel e2fsprogs-devel libacl-devel pam-devel popt-devel python-devel readline-devel +%if 0%{?suse_version} +BuildRequires: cracklib-devel openldap2-devel +%endif +%if 0%{?suse_version} > 1030 +BuildRequires: gdbm-devel pwdutils +%endif +%if 0%{?suse_version} > 930 +BuildRequires: krb5-devel libiniparser-devel libnscd-devel +%endif +%if 0%{?suse_version} > 930 && 0%{?suse_version} < 1031 +BuildRequires: dmapi-devel libnscd-devel libxml2-devel mysql-devel postgresql-devel xfsprogs-devel +%endif +%if 0%{?suse_version} > 830 && 0%{?suse_version} < 931 +BuildRequires: heimdal-devel +%endif +%if 0%{?fedora_version} +BuildRequires: cracklib-devel +%endif +%if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} +BuildRequires: krb5-devel openldap-devel +%endif +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 +BuildRequires: keyutils-devel +%endif +%if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} +BuildRequires: ctdb-devel +%endif +%define samba_ver 3.3.5 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} License: GPL v3 or later Url: http://www.samba.org/ -Version: 3.3.4 -Release: 4 +Version: 3.3.5 +Release: 1 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -323,10 +350,18 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %changelog +* Mon Jun 08 2009 ro(a)suse.de +- BuildRequire keyutils-devel. * Tue Mar 10 2009 lmuelle(a)suse.de - Only call '%%find_lang pam_winbind' in the samba spec file, not samba-doc. * Thu Jan 24 2008 lmuelle(a)suse.de ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.T19017/_old 2009-06-20 06:07:38.000000000 +0200 +++ /var/tmp/diff_new_pack.T19017/_new 2009-06-20 06:07:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package samba (Version 3.3.4) +# spec file for package samba (Version 3.3.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,7 +47,7 @@ %if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} BuildRequires: ctdb-devel %endif -%define samba_ver 3.3.4 +%define samba_ver 3.3.5 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %define vscan_ver 0.3.6b @@ -56,8 +56,8 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on -Version: 3.3.4 -Release: 4 +Version: 3.3.5 +Release: 1 %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -140,8 +140,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %package client License: GPL v3 or later @@ -180,8 +183,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -204,8 +210,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 @@ -234,8 +243,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %endif @@ -261,8 +273,11 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %if %{make_utils} @@ -283,8 +298,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 %endif @@ -313,8 +328,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -351,8 +369,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %else @@ -365,8 +386,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %endif This package includes the smbclient library. @@ -399,8 +423,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %package -n libnetapi0 License: GPL v3 or later @@ -418,8 +445,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %package -n libnetapi-devel License: GPL v3 or later @@ -438,8 +468,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -465,8 +498,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %else @@ -479,8 +515,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %endif This package includes the smbsharemodes library. @@ -510,8 +549,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %if %{make_ldapsmb} @@ -531,8 +573,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %package -n libtalloc-devel License: LGPL v3 or later @@ -551,8 +596,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %package -n libtdb1 License: LGPL v3 or later @@ -570,8 +618,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %package -n libtdb-devel License: LGPL v3 or later @@ -590,8 +641,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %package -n libwbclient0 License: GPL v3 or later @@ -609,8 +663,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %package -n libwbclient-devel License: GPL v3 or later @@ -629,8 +686,11 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %package -n ldapsmb License: GPL v2 or later @@ -638,7 +698,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 263 +Release: 264 Requires: perl-ldap %description -n ldapsmb @@ -651,8 +711,11 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 920 @@ -674,8 +737,11 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %endif %if %{make_vscan} @@ -704,8 +770,11 @@ -------- Rainer Link <rainer(a)openantivirus.org> -Source Timestamp: 2135 -Branch : 3.3.4 +Source Timestamp: 2147 +Branch : 3.3.5 + +Source Timestamp: 2147 +Branch : 3.3.5 %endif @@ -1538,7 +1607,6 @@ /%{_lib}/security/pam_winbind.so %{_libdir}/samba/idmap %{_libdir}/samba/nss_info -%doc %{_mandir}/man7/pam_winbind.7.* %doc %{_mandir}/man7/winbind_krb5_locator.7.* %doc %{_mandir}/man8/idmap_ad.8.* %doc %{_mandir}/man8/idmap_adex.8.* @@ -1548,6 +1616,7 @@ %doc %{_mandir}/man8/idmap_rid.8.* %doc %{_mandir}/man8/idmap_tdb.8.* %doc %{_mandir}/man8/idmap_tdb2.8.* +%doc %{_mandir}/man8/pam_winbind.8.* %if 0%{?suse_version} && 0%{?suse_version} < 1100 %dir %{_datadir}/omc %dir %{_datadir}/omc/svcinfo.d @@ -1706,8 +1775,86 @@ %endif %changelog +* Tue Jun 16 2009 lmuelle(a)suse.de +- Update to 3.3.5. + + Fix SAMR and LSA checks (bug #6089, #6289) + + Fix posix acls when setting an ACL without explicit ACE for the + owner (bug #2346). + + Fix joining of Win7 into Samba domain (bug #6099). + + Fix joining of Win2000 SP4 clients (bug #6301). + + BUG 2346: Fix posix acls when setting an ACL without explicit ACE for the + owner. + + BUG 5832: Fix build on RHEL when ccache is not available. + + BUG 5853: Add keyutils-devel to build requires to fix build on RHEL. + + BUG 5897: Fix shutdown script example in the smb.conf manpage. + + BUG 6089: Revert the extra SAMR and LSA checks. + + BUG 6099: Fix joining of Win7 into Samba domain. + + BUG 6157: Fix handling of multi-value attribute "uid". + + BUG 6289: Revert the extra SAMR and LSA checks. + + BUG 6297: Owner of sticky directory cannot delete files created by others. + + BUG 6301: Fix joining of Win2000 SP4 clients. + + BUG 6309: Support remote unjoining of Windows 2003 or greater. + + BUG 6315: smbd crashes doing vfs_full_audit on IPC$ close event. + + BUG 6320: Handle registry config source in file_list. + + BUG 6330: Fix DFS on AIX. + + BUG 6336: Fix 'net groupmap set' segfault. + + BUG 6361: Make --rcfile work in smbget. + + BUG 6365: Re-Add the "dropbox" functionality with -wx rights on a + directory. + + BUG 6372: Fix usermanager only displaying 1024 groups and aliases. + + BUG 6382: Fix case insensitive access to DFS links. + + BUG 6415: Filter out of range mappings in default idmap config in + idmap_tdb. + + BUG 6416: Filter out of range mappings in default idmap config in + idmap_tdb2. + + BUG 6417: Filter out of range mappings in default idmap config in + idmap_ldap. + + BUG 6441: Fix the compile with --enable-dnssd. + + BUG 6449: 'net rap user add' crashes without -C option. + + BUG 6465: Fix enumeration of empty aliases (ldb backend). + + Prevent infinite include nesting. + + Mark registry shares without path unavailable. + + Also handle DirX return codes. + + Fix Coverity ID 897. + + Do not crash in ctdbd_traverse if ctdbd is not around. + + Fix a race condition in winbind leading to a panic. + + Some man pam_winbind improvements. + + Zero an uninitialized array. +* Tue Jun 16 2009 lmuelle(a)suse.de +- Update to 3.2.12. + + Fix SAMR and LSA checks (bug #6089, #6289) + + Fix posix acls when setting an ACL without explicit ACE for the + owner (bug #2346). + + Fix "force user" (bug #6291). + + Fix Winbind crash (bug #6279). + + Fix joining of Win7 into Samba domain (bug #6099). + + BUG 2346: Fix posix acls when setting an ACL without explicit ACE for the + owner. + + BUG 5798: CFLAGS info lost in configure. + + BUG 5832: Fix build on RHEL when ccache is not available. + + BUG 5835: Add keyutils-devel to build requires. + + BUG 5945: Fix out of memory error with Winbind idmap. + + BUG 6089: Revert the extra SAMR and LSA checks. + + BUG 6099: Fix joining of Win7 into Samba domain. + + BUG 6279: Fix Winbind crash. + + BUG 6289: Revert the extra SAMR and LSA checks. + + BUG 6291: Fix "force user". + + BUG 6301: Fix samr_ConnectVersion enum which is 32bit not 16bit. + + BUG 6372: Fix usermanager only displaying 1024 groups and aliases. + + BUG 6386: Groupdb mapping fix. + + BUG 6382: Fix case insensitive access to DFS links. + + BUG 6465: Fix enumeration of empty aliases (ldb backend). + + Prevent creation of keys containing the '/' character. + + Fix bug in processing of open modes in POSIX open. + + Protect netlogon_creds_server_step() against NULL creds. + + Also handle DirX return codes. + + Fix a race condition in winbind leading to a panic. + + Fix a crash bug if we timeout in net rpc trustdom list. + + Fix profile acls in some corner cases. +* Fri Jun 12 2009 lmuelle(a)suse.de +- Explicitly use 'tdbsam' as passdb backend in the default smb.conf file. * Thu Jun 04 2009 sjayaraman(a)suse.de -- Enable cifs.upcall on versions newer than SUSE 10.0 +- Enable cifs.upcall on versions newer than SUSE 10.0. * Thu Jun 04 2009 sjayaraman(a)suse.de - Add BuildRequires to keyutils-devel. * Thu Jun 04 2009 sjayaraman(a)suse.de @@ -1998,6 +2145,9 @@ - Define init_samba_module in all samba-vscan modules; (bnc#469218). * Sat Feb 21 2009 lmuelle(a)suse.de - Add GPLv3 header to all init scripts; (bnc#459766). +* Tue Feb 10 2009 boyang(a)suse.de +- Backport of the clean event context after fork and krb5 refresh chain + fixes; (bnc#415026). * Mon Feb 09 2009 jmcdonough(a)suse.de - Revert accidental partial strict allocate upstream commit * Sun Feb 08 2009 jmcdonough(a)suse.de ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.T19017/_old 2009-06-20 06:07:38.000000000 +0200 +++ /var/tmp/diff_new_pack.T19017/_new 2009-06-20 06:07:38.000000000 +0200 @@ -1,2 +1,2 @@ -2135 -Branch : 3.3.4 +2147 +Branch : 3.3.5 ++++++ patches.tar.bz2 ++++++ ++++++ samba-3.3.4.tar.bz2 -> samba-3.3.5.tar.bz2 ++++++ samba/samba-3.3.4.tar.bz2 samba/samba-3.3.5.tar.bz2 differ: byte 11, line 1 ++++++ vendor-files.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/config/smb.conf.vendor new/vendor-files/config/smb.conf.vendor --- old/vendor-files/config/smb.conf.vendor 2009-05-01 23:06:12.000000000 +0200 +++ new/vendor-files/config/smb.conf.vendor 2009-06-16 17:55:38.000000000 +0200 @@ -32,8 +32,8 @@ # choose your passdb backend # options: smbpasswd, tdbsam, ldapsam, plugin -# default: passdb backend = smbpasswd -# passdb backend = smbpasswd:/etc/samba/smbpasswd ldapsam:ldap://localhost tdbsam:/etc/samba/passdb.tdb +# default: passdb backend = tdbsam + passdb backend = tdbsam # passdb backend = ldapsam:ldap://localhost # passdb backend = ldapsam:ldaps://localhost # passdb backend = smbpasswd diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2009-06-04 19:06:08.000000000 +0200 +++ new/vendor-files/tools/package-data 2009-06-16 18:25:34.000000000 +0200 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2135" +SAMBA_PACKAGE_SVN_VERSION="2147" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libusb-compat for openSUSE:Factory
by root＠Hilbert.suse.de 20 Jun '09

20 Jun '09

Hello community, here is the log from the commit of package libusb-compat for openSUSE:Factory checked in at Sat Jun 20 06:07:05 CEST 2009. -------- --- libusb-compat/libusb-compat.changes 2009-06-05 12:19:43.000000000 +0200 +++ libusb-compat/libusb-compat.changes 2009-06-19 14:56:25.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jun 17 15:54:32 CEST 2009 - meissner(a)suse.de + +- Fixed crashes of libgphoto2 (and other usb_find_busses() and + usb_find_devices() users) when no USB device is in the system + (like in a chroot without /sys, or on s390 or similar). + bnc#432129 (again) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libusb-compat-uninitialized.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libusb-compat.spec ++++++ --- /var/tmp/diff_new_pack.J16782/_old 2009-06-20 06:06:33.000000000 +0200 +++ /var/tmp/diff_new_pack.J16782/_new 2009-06-20 06:06:33.000000000 +0200 @@ -21,13 +21,14 @@ Name: libusb-compat %define FULLY_REPLACE_LIBUSB_0_1 1 Url: http://libusb.wiki.sourceforge.net/LibusbCompat0.1 -License: BSD 3-Clause; LGPL v2.1 or later +License: BSD 3-clause (or similar) ; LGPL v2.1 or later Group: System/Libraries Summary: libusb-1.0 Compatibility Layer for libusb-0.1 Version: 0.1.1 -Release: 1 +Release: 2 Source: %{name}-%{version}.tar.bz2 -Patch: libusb-compat-libusb0-incompat.patch +Patch0: libusb-compat-libusb0-incompat.patch +Patch1: libusb-compat-uninitialized.patch BuildRequires: libusb-1_0-devel pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libusb-0_1-5 = %{version}-%{release} @@ -47,7 +48,7 @@ # Prevent 'Duplicate License entries' breakage in Autobuild: %package -n libusb-0_1-4 -License: BSD 3-Clause; LGPL v2.1 or later +License: BSD 3-clause (or similar) ; LGPL v2.1 or later %else %package -n libusb-0_1-5 @@ -55,8 +56,6 @@ %endif Group: System/Libraries # A better version than 0.1.12 provided by libusb-0_1: -Version: 0.1.13 -Release: 1 Summary: libusb-1.0 Compatibility Library for libusb-0.1 # Special symbol for packages, that use libusb-0.1 API, but use libusb-1.0 features: Provides: libusb-1_0-features-in-0_1-api @@ -100,7 +99,7 @@ Daniel Drake <dsd(a)gentoo.org> %package devel -License: BSD 3-Clause; LGPL v2.1 or later +License: BSD 3-clause (or similar) ; LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: libusb-1.0 Compatibility Layer for libusb-0.1 Requires: libusb-1_0-features-in-0_1-api libusb-1_0-devel glibc-devel @@ -128,8 +127,9 @@ %prep %setup -q %if !%FULLY_REPLACE_LIBUSB_0_1 -%patch +%patch0 %endif +%patch1 -p0 %build autoreconf -f -i @@ -167,6 +167,11 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jun 17 2009 meissner(a)suse.de +- Fixed crashes of libgphoto2 (and other usb_find_busses() and + usb_find_devices() users) when no USB device is in the system + (like in a chroot without /sys, or on s390 or similar). + bnc#432129 (again) * Fri Jun 05 2009 sbrabec(a)suse.cz - Updated to version 0.1.1: * improvements to match libusb-0.1 endpoint addressing behaviour ++++++ libusb-compat-uninitialized.patch ++++++ --- libusb/core.c +++ libusb/core.c @@ -141,6 +141,10 @@ int i; int r; + if (!ctx) { + usbi_err("find_busses ctx is NULL (libusb not initialized)", r); + return -1; + } r = libusb_get_device_list(ctx, &dev_list); if (r < 0) { usbi_err("get_device_list failed with error %d", r); @@ -531,6 +535,10 @@ int changes = 0; usbi_dbg(""); + if (!ctx) { + usbi_err("usb_find_devices ctx is NULL (libusb not initialized)", r); + return -1; + } dev_list_len = libusb_get_device_list(ctx, &dev_list); if (dev_list_len < 0) return dev_list_len; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit capisuite for openSUSE:Factory
by root＠Hilbert.suse.de 20 Jun '09

20 Jun '09

Hello community, here is the log from the commit of package capisuite for openSUSE:Factory checked in at Sat Jun 20 06:03:37 CEST 2009. -------- --- capisuite/capisuite.changes 2009-01-15 18:02:59.000000000 +0100 +++ capisuite/capisuite.changes 2009-06-19 10:59:52.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 19 10:35:46 CEST 2009 - coolo(a)novell.com + +- disable as-needed for this package as it fails to build with it + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ capisuite.spec ++++++ --- /var/tmp/diff_new_pack.EB6280/_old 2009-06-20 06:01:40.000000000 +0200 +++ /var/tmp/diff_new_pack.EB6280/_new 2009-06-20 06:01:40.000000000 +0200 @@ -24,7 +24,7 @@ Group: Hardware/ISDN AutoReqProv: on Version: 0.4.5 -Release: 241 +Release: 242 %define pyver %(python -c 'import sys; print sys.version[:3]') Requires: sfftobmp sox tiff ghostscript-library python >= %pyver, python < %{pyver}.99 Summary: ISDN Telecommunication Suite Providing Fax and Voice Services @@ -67,6 +67,9 @@ %patch6 -p1 %build +# This package failed when testing with -Wl,-as-needed being default. +# So we disable it here, if you want to retest, just delete this comment and the line below. +export SUSE_ASNEEDED=0 aclocal autoheader autoconf @@ -117,10 +120,12 @@ %doc %{_mandir}/man8/capisuite.8.gz %changelog +* Fri Jun 19 2009 coolo(a)novell.com +- disable as-needed for this package as it fails to build with it * Thu Jan 15 2009 kkeil(a)suse.de - fix call to sox (bnc#462603) - fix text exceptions for python 2.6 -* Sun Aug 17 2008 kkeil(a)suse.de +* Mon Aug 18 2008 kkeil(a)suse.de - fix init script * Thu Oct 11 2007 kkeil(a)suse.de - fixes for GCC 4.3 @@ -222,7 +227,7 @@ * Wed Jan 29 2003 ghillie(a)suse.de - don't start if no user configured for default scripts - added insserv to %%post (spec file) -* Mon Jan 27 2003 ghillie(a)suse.de +* Tue Jan 28 2003 ghillie(a)suse.de - included startup script * Mon Jan 27 2003 ghillie(a)suse.de - updated to 0.3 (split configuration files into fax and ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit celestia for openSUSE:Factory
by root＠Hilbert.suse.de 20 Jun '09

20 Jun '09

Hello community, here is the log from the commit of package celestia for openSUSE:Factory checked in at Sat Jun 20 05:58:15 CEST 2009. -------- --- KDE/celestia/celestia.changes 2009-04-28 11:55:51.000000000 +0200 +++ celestia/celestia.changes 2009-06-19 11:00:04.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 19 10:35:46 CEST 2009 - coolo(a)novell.com + +- disable as-needed for this package as it fails to build with it + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ celestia.spec ++++++ --- /var/tmp/diff_new_pack.v32411/_old 2009-06-20 05:57:42.000000000 +0200 +++ /var/tmp/diff_new_pack.v32411/_new 2009-06-20 05:57:42.000000000 +0200 @@ -21,7 +21,7 @@ Name: celestia Summary: OpenGL Space Simulator Version: 1.5.1 -Release: 48 +Release: 49 License: GPL v2 or later Group: Productivity/Scientific/Astronomy Url: http://celestia.sourceforge.net @@ -74,6 +74,9 @@ %patch6 -p1 %build +# This package failed when testing with -Wl,-as-needed being default. +# So we disable it here, if you want to retest, just delete this comment and the line below. +export SUSE_ASNEEDED=0 . /etc/opt/kde3/common_options srcdir=`pwd` CXXFLAGS="$RPM_OPT_FLAGS" \ ./configure --with-kde \ @@ -120,6 +123,8 @@ %{_datadir}/pixmaps/*.png %changelog +* Fri Jun 19 2009 coolo(a)novell.com +- disable as-needed for this package as it fails to build with it * Tue Apr 28 2009 coolo(a)suse.de - fix compilation with gcc 4.4 * Sat Apr 04 2009 coolo(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cpufrequtils for openSUSE:Factory
by root＠Hilbert.suse.de 20 Jun '09

20 Jun '09

Hello community, here is the log from the commit of package cpufrequtils for openSUSE:Factory checked in at Sat Jun 20 05:56:18 CEST 2009. -------- --- cpufrequtils/cpufrequtils.changes 2009-06-15 10:12:31.000000000 +0200 +++ cpufrequtils/cpufrequtils.changes 2009-06-19 11:00:11.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 19 10:35:46 CEST 2009 - coolo(a)novell.com + +- disable as-needed for this package as it fails to build with it + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpufrequtils.spec ++++++ --- /var/tmp/diff_new_pack.j27066/_old 2009-06-20 05:55:03.000000000 +0200 +++ /var/tmp/diff_new_pack.j27066/_new 2009-06-20 05:55:03.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: doxygen lynx Url: http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html Version: 005 -Release: 1 +Release: 2 Summary: Tools to Determine and Set CPUfreq Settings License: GPL v2 or later Group: System/Base @@ -51,6 +51,9 @@ %setup -q %build +# This package failed when testing with -Wl,-as-needed being default. +# So we disable it here, if you want to retest, just delete this comment and the line below. +export SUSE_ASNEEDED=0 CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir" export CFLAGS="$RPM_OPT_FLAGS" make STRIP=true $CONF @@ -76,6 +79,8 @@ /usr/bin/cpufreq-* %changelog +* Fri Jun 19 2009 coolo(a)novell.com +- disable as-needed for this package as it fails to build with it * Mon Jun 15 2009 seife(a)suse.de - update to version 005: - documentation fixes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dosemu for openSUSE:Factory
by root＠Hilbert.suse.de 20 Jun '09

20 Jun '09

Hello community, here is the log from the commit of package dosemu for openSUSE:Factory checked in at Sat Jun 20 05:53:53 CEST 2009. -------- --- dosemu/dosemu.changes 2008-10-17 08:52:51.000000000 +0200 +++ dosemu/dosemu.changes 2009-06-18 12:09:43.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 18 12:08:04 CEST 2009 - snwint(a)suse.de + +- David Binderman: fix loop bounds (bnc #512168) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- dosemu-1.4.0-sizeof.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosemu.spec ++++++ --- /var/tmp/diff_new_pack.C20676/_old 2009-06-20 05:52:22.000000000 +0200 +++ /var/tmp/diff_new_pack.C20676/_new 2009-06-20 05:52:22.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dosemu (Version 1.4.0.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,13 +25,14 @@ Group: System/Emulators/PC AutoReqProv: on Version: 1.4.0.1 -Release: 59 +Release: 60 Summary: The DOS Emulator Source: dosemu-1.4.0.tgz Source1: dosemu-freedos-bin.tgz Patch: dosemu-1.4.0.1.diff Patch1: dosemu-1.4.0-open.diff Patch2: dosemu-1.4.0-destbufferoverflow.patch +Patch3: dosemu-1.4.0-sizeof.diff Url: http://www.dosemu.org BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -132,6 +133,7 @@ %patch -p1 %patch1 %patch2 +%patch3 %build %configure --sysconfdir=%{_sysconfdir}/%{name} --with-docdir=%{_docdir}/dosemu \ @@ -164,6 +166,8 @@ %config(noreplace) %{_sysconfdir}/dosemu/drives/d %changelog +* Thu Jun 18 2009 snwint(a)suse.de +- David Binderman: fix loop bounds (bnc #512168) * Fri Oct 17 2008 olh(a)suse.de - add ExclusiveArch x86 x86_64 * Thu Oct 09 2008 crrodriguez(a)suse.de @@ -428,7 +432,7 @@ - deleted double entry for %%files * Thu Nov 26 1998 ke(a)suse.de - remove "/" from inst scripts. -* Wed Nov 18 1998 bs(a)suse.de +* Tue Nov 17 1998 bs(a)suse.de - Update to 0.98.3 * Tue Aug 18 1998 ke(a)suse.de - mkdexe: add security patch (marc and werner). ++++++ dosemu-1.4.0-sizeof.diff ++++++ --- src/plugin/X/X_keymaps.c +++ src/plugin/X/X_keymaps.c @@ -137,7 +137,7 @@ pkey = key; } else { /* print spaces instead of \0's */ - for (i = 0; i < sizeof(ckey); i++) if (!ckey[i]) ckey[i] = ' '; + for (i = 0; i < sizeof ckey / sizeof *ckey; i++) if (!ckey[i]) ckey[i] = ' '; mismatch++; score -= syms; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0