From 7f12d1b2ca6acf66babc202967b34c9e1c9af8982788839bab171a7c2696ac1e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 25 Mar 2010 23:19:38 +0000 Subject: [PATCH] Accepting request 35605 from X11:XOrg Copy from X11:XOrg/Mesa based on submit request 35605 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/35605 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=83 --- Mesa.changes | 13 +++ Mesa.spec | 46 +++++----- MesaDemos-7.7.tar.bz2 | 3 - MesaDemos-7.8-rc1.tar.bz2 | 3 + MesaLib-7.7.tar.bz2 | 3 - MesaLib-7.8-rc1.tar.bz2 | 3 + Mesa_indirect_old_xserver_compatibility.diff | 15 ---- disable_gem_warning.diff | 12 --- dri_driver_dir.diff | 17 +++- egl-buildfix.diff | 10 +++ link-shared.diff | 88 -------------------- missing_Makefile.diff | 64 ++++++++++++++ spantmp2_h_ppc_build_fix.diff | 11 --- 13 files changed, 130 insertions(+), 158 deletions(-) delete mode 100644 MesaDemos-7.7.tar.bz2 create mode 100644 MesaDemos-7.8-rc1.tar.bz2 delete mode 100644 MesaLib-7.7.tar.bz2 create mode 100644 MesaLib-7.8-rc1.tar.bz2 delete mode 100644 Mesa_indirect_old_xserver_compatibility.diff delete mode 100644 disable_gem_warning.diff create mode 100644 egl-buildfix.diff delete mode 100644 link-shared.diff create mode 100644 missing_Makefile.diff delete mode 100644 spantmp2_h_ppc_build_fix.diff diff --git a/Mesa.changes b/Mesa.changes index fe3d0e8..1e666bc 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Sun Feb 28 22:10:09 CET 2010 - sndirsch@suse.de diff --git a/Mesa.spec b/Mesa.spec index e6c945e..f62e9d4 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -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: XFree86-Mesa-64bit 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 @@ Authors: 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 @@ rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl} # 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 @@ rm -rf $RPM_BUILD_ROOT /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 @@ rm -rf $RPM_BUILD_ROOT /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 diff --git a/MesaDemos-7.7.tar.bz2 b/MesaDemos-7.7.tar.bz2 deleted file mode 100644 index 87343b0..0000000 --- a/MesaDemos-7.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:793dd1d256c02b4bf6a62828e23a1329f8532c81ef0a5c748f79ee4bfb30ac77 -size 16216595 diff --git a/MesaDemos-7.8-rc1.tar.bz2 b/MesaDemos-7.8-rc1.tar.bz2 new file mode 100644 index 0000000..e1ef686 --- /dev/null +++ b/MesaDemos-7.8-rc1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c46a66dddd2f04b09fc948f2ab9c576125b1b72a0df29f6686fc476e9d956e21 +size 16186011 diff --git a/MesaLib-7.7.tar.bz2 b/MesaLib-7.7.tar.bz2 deleted file mode 100644 index 5932c42..0000000 --- a/MesaLib-7.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9273da0f1d6e341f7961ec13912ebc532e21c2b267945b7b79648c79c3017c1 -size 4992536 diff --git a/MesaLib-7.8-rc1.tar.bz2 b/MesaLib-7.8-rc1.tar.bz2 new file mode 100644 index 0000000..0fdb469 --- /dev/null +++ b/MesaLib-7.8-rc1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c8e42f6e5ecf3c5436bf9df9a83306bb21fea5c53e309a82fcf0936fac27ee8 +size 5135279 diff --git a/Mesa_indirect_old_xserver_compatibility.diff b/Mesa_indirect_old_xserver_compatibility.diff deleted file mode 100644 index d96063c..0000000 --- a/Mesa_indirect_old_xserver_compatibility.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c -index b6bdbd5..9be1358 100644 ---- a/src/glx/x11/glxext.c -+++ b/src/glx/x11/glxext.c -@@ -720,8 +720,8 @@ __glXInitialize(Display * dpy) - dpyPriv->dri2Display = dri2CreateDisplay(dpy); - dpyPriv->driDisplay = driCreateDisplay(dpy); - } -- if (glx_direct) -- dpyPriv->driswDisplay = driswCreateDisplay(dpy); -+// if (glx_direct) -+// dpyPriv->driswDisplay = driswCreateDisplay(dpy); - #endif - - if (!AllocAndFetchScreenConfigs(dpy, dpyPriv)) { diff --git a/disable_gem_warning.diff b/disable_gem_warning.diff deleted file mode 100644 index 6d9a3b9..0000000 --- a/disable_gem_warning.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- Mesa-7.5.1/src/mesa/drivers/dri/intel/intel_screen.c.orig 2009-09-04 00:23:54.000000000 +0200 -+++ Mesa-7.5.1/src/mesa/drivers/dri/intel/intel_screen.c 2009-09-04 00:24:17.000000000 +0200 -@@ -618,9 +618,6 @@ intel_init_bufmgr(intelScreenPrivate *in - if (intelScreen->bufmgr == NULL) { - if (gem_disable) { - _mesa_warning(NULL, "GEM disabled. Using classic."); -- } else { -- _mesa_warning(NULL, -- "Failed to initialize GEM. Falling back to classic."); - } - - if (intelScreen->tex.size == 0) { diff --git a/dri_driver_dir.diff b/dri_driver_dir.diff index eebc7b1..005bfd4 100644 --- a/dri_driver_dir.diff +++ b/dri_driver_dir.diff @@ -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\" diff --git a/egl-buildfix.diff b/egl-buildfix.diff new file mode 100644 index 0000000..d5daa23 --- /dev/null +++ b/egl-buildfix.diff @@ -0,0 +1,10 @@ +--- 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 diff --git a/link-shared.diff b/link-shared.diff deleted file mode 100644 index e4b57c1..0000000 --- a/link-shared.diff +++ /dev/null @@ -1,88 +0,0 @@ ---- src/mesa/Makefile -+++ src/mesa/Makefile -@@ -57,7 +57,11 @@ - mimeset -f "$@" ; \ - fi - --linux-solo: depend subdirs libmesa.a -+$(TOP)/$(LIB_DIR)/libmesa_private.so: $(SOLO_OBJECTS) -+ @ $(TOP)/bin/mklib -o mesa_private \ -+ -install $(TOP)/$(LIB_DIR) $(SOLO_OBJECTS) -+ -+linux-solo: depend subdirs libmesa.a $(TOP)/$(LIB_DIR)/libmesa_private.so - cd drivers/dri ; $(MAKE) - - -@@ -161,6 +165,7 @@ - @if [ "${DRIVER_DIRS}" = "dri" ] ; then \ - cd drivers/dri ; $(MAKE) install ; \ - fi -+ $(INSTALL) $(TOP)/$(LIB_DIR)/libmesa_private.* $(DESTDIR)/$(INSTALL_DIR)/$(LIB_DIR) - - ## NOT INSTALLED YET: - ## $(INSTALL) -d $(INSTALL_DIR)/include/GLES ---- src/mesa/drivers/dri/Makefile.template -+++ src/mesa/drivers/dri/Makefile.template -@@ -1,6 +1,6 @@ - # -*-makefile-*- - --MESA_MODULES = $(TOP)/src/mesa/libmesa.a -+MESA_MODULES = $(TOP)/$(LIB_DIR)/libmesa_private.so - - COMMON_SOURCES = \ - ../../common/driverfuncs.c \ -@@ -77,7 +77,7 @@ - - $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template - $(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \ -- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) -+ $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) -Wl,--undefined -Wl,--allow-shlib-undefined - - - $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME) ---- src/mesa/drivers/dri/s3v/s3v_context.c -+++ src/mesa/drivers/dri/s3v/s3v_context.c -@@ -177,7 +177,8 @@ - s3vInitExtensions( ctx ); - s3vInitDriverFuncs( ctx ); - s3vInitStateFuncs( ctx ); -- s3vInitSpanFuncs( ctx ); -+ /* ???! not defined anywhere. WTF ?! */ -+ /*s3vInitSpanFuncs( ctx );*/ - s3vInitTextureFuncs( ctx ); - s3vInitTriFuncs( ctx ); - s3vInitState( vmesa ); ---- src/mesa/x86/read_rgba_span_x86.S -+++ src/mesa/x86/read_rgba_span_x86.S -@@ -91,7 +91,6 @@ - */ - - .globl _generic_read_RGBA_span_BGRA8888_REV_MMX --.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX - .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function - _generic_read_RGBA_span_BGRA8888_REV_MMX: - pushl %ebx -@@ -191,7 +190,6 @@ - */ - - .globl _generic_read_RGBA_span_BGRA8888_REV_SSE --.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE - .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function - _generic_read_RGBA_span_BGRA8888_REV_SSE: - pushl %esi -@@ -358,7 +356,6 @@ - - .text - .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2 --.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2 - .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function - _generic_read_RGBA_span_BGRA8888_REV_SSE2: - pushl %esi -@@ -568,7 +565,6 @@ - - .text - .globl _generic_read_RGBA_span_RGB565_MMX -- .hidden _generic_read_RGBA_span_RGB565_MMX - .type _generic_read_RGBA_span_RGB565_MMX, @function - - _generic_read_RGBA_span_RGB565_MMX: diff --git a/missing_Makefile.diff b/missing_Makefile.diff new file mode 100644 index 0000000..ecbfccb --- /dev/null +++ b/missing_Makefile.diff @@ -0,0 +1,64 @@ +--- 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: diff --git a/spantmp2_h_ppc_build_fix.diff b/spantmp2_h_ppc_build_fix.diff deleted file mode 100644 index 6fb765b..0000000 --- a/spantmp2_h_ppc_build_fix.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mesa/drivers/dri/common/spantmp2.h -+++ src/mesa/drivers/dri/common/spantmp2.h -@@ -400,7 +400,7 @@ - # define READ_RGBA( rgba, _x, _y ) \ - do { \ - GLuint p = GET_VALUE(_x, _y); \ -- *((uint32_t *) rgba) = (t << 8) | 0xff; \ -+ *((uint32_t *) rgba) = (p << 8) | 0xff; \ - } while (0) - # else - # define READ_RGBA( rgba, _x, _y ) \