Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at Fri Mar 26 00:19:35 CET 2010. -------- --- Mesa/Mesa.changes 2010-02-28 22:28:17.000000000 +0100 +++ Mesa/Mesa.changes 2010-03-18 01:24:42.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Mar 18 01:23:56 CET 2010 - ro@suse.de + +- use 7.8-rc1 tarballs + +------------------------------------------------------------------- +Wed Mar 17 21:56:33 CET 2010 - ro@suse.de + +- update to 7.8 + - dos, ggi and classic svga drivers removed along with + their header files +- re-enable nouveau driver + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- MesaDemos-7.7.tar.bz2 MesaLib-7.7.tar.bz2 Mesa_indirect_old_xserver_compatibility.diff disable_gem_warning.diff link-shared.diff spantmp2_h_ppc_build_fix.diff New: ---- MesaDemos-7.8-rc1.tar.bz2 MesaLib-7.8-rc1.tar.bz2 egl-buildfix.diff missing_Makefile.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.dSJVA9/_old 2010-03-26 00:17:12.000000000 +0100 +++ /var/tmp/diff_new_pack.dSJVA9/_new 2010-03-26 00:17:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package Mesa (Version 7.7) +# spec file for package Mesa (Version 7.7.99) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,7 +17,7 @@ # norootforbuild -%define enable_nouveau 0 +%define enable_nouveau 1 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel @@ -33,20 +33,22 @@ Obsoletes: Mesa-64bit %endif # -Version: 7.7 -Release: 7 +%define _version 7.8-rc1 +Version: 7.7.99 +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 -Source1: MesaDemos-%{version}.tar.bz2 +Source: MesaLib-%{_version}.tar.bz2 +Source1: MesaDemos-%{_version}.tar.bz2 Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 Source5: drirc +# add update path for dri drivers Patch1: dri_driver_dir.diff -Patch2: spantmp2_h_ppc_build_fix.diff -Patch6: link-shared.diff -Patch7: disable_gem_warning.diff -Patch15: Mesa_indirect_old_xserver_compatibility.diff +# to be upstreamed +Patch8: egl-buildfix.diff +# from Mesa 7.8 branch +Patch9: missing_Makefile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -106,7 +108,7 @@ Brian Paul %prep -%setup -n %{name}-%{version} -b1 -b4 +%setup -n %{name}-%{_version} -b1 -b4 -q # make legal department happy (Bug #204110) test -f src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1 test -f progs/ggi/asc-view.c && exit 1 @@ -115,29 +117,27 @@ # we use freeglut rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h} %patch1 -%patch2 -sed -i 's/REPLACE/%_lib/g' src/glx/x11/Makefile -### FIXME -#%patch6 -%patch7 -p1 -%patch15 -p1 +sed -i 's/REPLACE/%_lib/g' src/glx/Makefile +sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile +%patch8 +%patch9 %build %install -rm src/mesa/depend +rm -f src/mesa/depend autoreconf -fi ### libGL (disable savage/mga, bnc #402132/#403071) %configure --disable-glw \ --with-driver=dri \ %ifarch %ix86 x86_64 - --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,sis,tdfx,unichrome,ffb,swrast \ + --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,sis,tdfx,unichrome,swrast \ %if %enable_nouveau --enable-gallium-nouveau \ %endif %endif %ifarch ppc %sparc - --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,tdfx,unichrome,ffb,swrast \ + --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,tdfx,unichrome,swrast \ %endif %ifarch s390 s390x --with-dri-drivers=swrast \ @@ -195,12 +195,11 @@ /usr/%{_lib}/libGL.so /usr/%{_lib}/lib*.so.* /usr/%{_lib}/dri/ +/usr/%{_lib}/egl/ %files devel %defattr(-,root,root) %doc docs/*.html docs/*.spec -/usr/include/GL/dmesa.h -/usr/include/GL/ggimesa.h /usr/include/GL/gl_mangle.h /usr/include/GL/glfbdev.h /usr/include/GL/glu.h @@ -209,11 +208,12 @@ /usr/include/GL/mesa_wgl.h /usr/include/GL/mglmesa.h /usr/include/GL/osmesa.h -/usr/include/GL/svgamesa.h /usr/include/GL/vms_x_fix.h /usr/include/GL/wmesa.h /usr/include/GL/internal/dri_interface.h /usr/include/GL/wglext.h +/usr/include/EGL +/usr/include/KHR %exclude /usr/include/GL/glew.h %exclude /usr/include/GL/glxew.h %exclude /usr/include/GL/wglew.h ++++++ dri_driver_dir.diff ++++++ --- /var/tmp/diff_new_pack.dSJVA9/_old 2010-03-26 00:17:12.000000000 +0100 +++ /var/tmp/diff_new_pack.dSJVA9/_new 2010-03-26 00:17:12.000000000 +0100 @@ -1,9 +1,20 @@ ---- src/glx/x11/Makefile.orig 2008-07-01 19:22:40.000000000 +0000 -+++ src/glx/x11/Makefile 2008-07-01 19:25:30.000000000 +0000 +--- src/egl/drivers/dri2/Makefile ++++ src/egl/drivers/dri2/Makefile +@@ -10,7 +10,7 @@ + -I$(TOP)/include \ + -I$(TOP)/src/egl/main \ + -I$(TOP)/src/mesa \ +- -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \ ++ -DDEFAULT_DRIVER_DIR=\"/usr/REPLACE/dri/updates:/usr/REPLACE/dri\" \ + $(EGL_DRI2_CFLAGS) + + EGL_LIBS = $(EGL_DRI2_LIBS) +--- src/glx/Makefile ++++ src/glx/Makefile @@ -2,7 +2,7 @@ include $(TOP)/configs/current - EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER \ + EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT \ - -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" + -DDEFAULT_DRIVER_DIR=\"/usr/REPLACE/dri/updates:/usr/REPLACE/dri\" ++++++ egl-buildfix.diff ++++++ --- src/egl/drivers/glx/Makefile +++ src/egl/drivers/glx/Makefile @@ -11,6 +11,6 @@ -I$(TOP)/src/egl/main EGL_CFLAGS = -EGL_LIBS = -lX11 -lGL +EGL_LIBS = -lX11 -l$(GL_LIB) include ../Makefile.template ++++++ missing_Makefile.diff ++++++ --- src/gallium/winsys/drm/Makefile.egl 2010/03/18 01:31:42 1.1 +++ src/gallium/winsys/drm/Makefile.egl 2010/03/17 17:44:19 @@ -0,0 +1,61 @@ +# src/gallium/winsys/drm/Makefile.egl + +# The driver Makefile should define +# +# EGL_DRIVER_NAME, the name of the driver +# EGL_DRIVER_SOURCES, the sources of the driver +# EGL_DRIVER_LIBS, extra libraries needed by the driver +# EGL_DRIVER_PIPES, the pipe drivers of the driver +# +# before including this file. + +EGL_DRIVER_OBJECTS = $(EGL_DRIVER_SOURCES:.c=.o) + +common_LIBS = -ldrm -lm -ldl + +x11_ST = $(TOP)/src/gallium/state_trackers/egl/libeglx11.a +x11_LIBS = $(common_LIBS) -lX11 -lXext -lXfixes + +kms_ST = $(TOP)/src/gallium/state_trackers/egl/libeglkms.a +kms_LIBS = $(common_LIBS) + +##### RULES ##### + +.c.o: + $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ + + +##### TARGETS ##### + +EGL_DISPLAY_DRIVERS = $(foreach dpy, $(EGL_DISPLAYS), egl_$(dpy)_$(EGL_DRIVER_NAME).so) + +EGL_DISPLAY_LIBS = $(foreach drv, $(EGL_DISPLAY_DRIVERS), $(TOP)/$(LIB_DIR)/$(drv)) + +default: $(EGL_DISPLAY_LIBS) + +$(EGL_DISPLAY_LIBS): $(TOP)/$(LIB_DIR)/%.so: %.so + $(INSTALL) $< $(TOP)/$(LIB_DIR) + +define mklib-egl +$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \ + $(MKLIB_OPTIONS) $(EGL_DRIVER_OBJECTS) $($(1)_ST) \ + $(EGL_DRIVER_PIPES) $(GALLIUM_AUXILIARIES) $($(1)_LIBS) $(EGL_DRIVER_LIBS) +endef + +egl_x11_$(EGL_DRIVER_NAME).so: $(EGL_DRIVER_OBJECTS) $(x11_ST) $(EGL_DRIVER_PIPES) $(GALLIUM_AUXILIARIES) Makefile + $(call mklib-egl,x11) + +egl_kms_$(EGL_DRIVER_NAME).so: $(EGL_DRIVER_OBJECTS) $(kms_ST) $(EGL_DRIVER_PIPES) $(GALLIUM_AUXILIARIES) Makefile + $(call mklib-egl,kms) + +clean: + -rm -f $(EGL_DRIVER_OBJECTS) + -rm -f $(EGL_DISPLAY_DRIVERS) + +install: $(EGL_DISPLAY_LIBS) + $(INSTALL) -d $(DESTDIR)$(EGL_DRIVER_INSTALL_DIR) + for lib in $(EGL_DISPLAY_LIBS); do \ + $(MINSTALL) -m 755 "$$lib" $(DESTDIR)$(EGL_DRIVER_INSTALL_DIR); \ + done + +depend: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org