Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2012-09-17 15:18:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa", Maintainer is "sndir...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2012-08-24 13:55:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2012-09-17 15:18:18.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Aug 24 22:22:28 UTC 2012 - tobias.johannes.klausm...@mni.thm.de + +- Update to 8.1 prerelease: + + Added radeonsi to the dri drivers for x86/x86_64 + + Rewrite the configuration parts of the spec file + + Changed u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch + to apply! + + Changed u_remove-os-abi-tag.patch to apply! (Removed parts of it) + + Changed u_mesa-8.0.1-fix-16bpp.patch to apply! (Removed parts of it) + + Remove upstreamed patches: (double checked) + - upstream-llvm-patch.diff + - U_i965-gen7-Reduce-GT1-WM-thread-count-according-to-up.patch + +------------------------------------------------------------------- Old: ---- U_i965-gen7-Reduce-GT1-WM-thread-count-according-to-up.patch mesa-8.0.4.tar.bz2 upstream-llvm-patch.diff New: ---- mesa-8.98.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.oOOQzz/_old 2012-09-17 15:18:20.000000000 +0200 +++ /var/tmp/diff_new_pack.oOOQzz/_new 2012-09-17 15:18:20.000000000 +0200 @@ -17,15 +17,13 @@ %define glamor 1 - -# -%define _version 8.0.4 +%define _version 8.98.1 %define _name_archive mesa Name: Mesa -Version: 8.0.4 +Version: 8.98.1 Release: 0 -BuildRequires: autoconf >= 2.59 +BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: bison BuildRequires: fdupes @@ -46,6 +44,7 @@ %endif BuildRequires: pkgconfig(libdrm_nouveau) >= 0.6 BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.24 +BuildRequires: pkgconfig(libkms) BuildRequires: pkgconfig(libudev) > 150 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) @@ -79,7 +78,7 @@ Summary: System for rendering interactive 3-D graphics License: MIT Group: System/Libraries -Source: %{_name_archive}-%{_version}.tar.bz2 +Source: %{_name_archive}-%{version}.tar.bz2 Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 @@ -89,13 +88,10 @@ Patch1: Mesa-nodate.diff # to be upstreamed Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch -# Patch from upstream master to resolve build issues with llvm 3.1 -Patch12: upstream-llvm-patch.diff # Patch from Fedora, fix 16bpp in llvmpipe Patch13: u_mesa-8.0.1-fix-16bpp.patch # Patch to remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag Patch14: u_remove-os-abi-tag.patch -Patch15: U_i965-gen7-Reduce-GT1-WM-thread-count-according-to-up.patch # Patch from Fedora, use shmget when available, under llvmpipe Patch16: u_mesa-8.0-llvmpipe-shmget.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -123,10 +119,9 @@ Requires: Mesa-libGL-devel = %version Requires: Mesa-libGLESv1_CM-devel = %version Requires: Mesa-libGLESv2-devel = %version -Requires: Mesa-libGLU-devel = %version -Requires: Mesa-libIndirectGL1 = %version -Requires: Mesa-libglapi0 = %version -Requires: libOSMesa8 = %version +Requires: Mesa-libIndirectGL-devel = %version +Requires: Mesa-libglapi-devel = %version +Requires: libOSMesa-devel = %version Requires: libgbm-devel # bug437293 %ifarch ppc64 @@ -276,39 +271,6 @@ This package provides a development environment for building applications using the OpenGL|ES 2.x APIs. -%package -n Mesa-libGLU1 -Summary: Mesa OpenGL utility library -Group: System/Libraries - -%description -n Mesa-libGLU1 -GLU offers simple interfaces for building mipmaps; checking for the -presence of extensions in the OpenGL (or other libraries which follow -the same conventions for advertising extensions); drawing -piecewise-linear curves, NURBS, quadrics and other primitives -(including, but not limited to, teapots); tesselating surfaces; -setting up projection matrices and unprojecting screen coordinates to -world coordinates. - -This package provides the SGI implementation of GLU shipped with the -Mesa package. - -%package -n Mesa-libGLU-devel -Summary: Development files for the EGL API -Group: Development/Libraries/C and C++ -Requires: Mesa-libGLU1 = %version - -%description -n Mesa-libGLU-devel -GLU offers simple interfaces for building mipmaps; checking for the -presence of extensions in the OpenGL (or other libraries which follow -the same conventions for advertising extensions); drawing -piecewise-linear curves, NURBS, quadrics and other primitives -(including, but not limited to, teapots); tesselating surfaces; -setting up projection matrices and unprojecting screen coordinates to -world coordinates. - -This package contains includes headers and static libraries for -compiling programs with GLU. - %package -n Mesa-libIndirectGL1 # This is the equivalent to Debian's libgl1-mesa-swx11 Summary: Free implementation of the OpenGL API @@ -319,15 +281,54 @@ a direct rendering capable library, or one which uses GLX. For that, please see Mesa-libGL1. -%package -n libOSMesa8 +%package -n Mesa-libIndirectGL-devel +Summary: Development Files for the free implementation of the OpenGL API +Group: Development/Libraries/C and C++ +Requires: Mesa-libIndirectGL1 = %version + +%description -n Mesa-libIndirectGL-devel +This library provides a pure software rasterizer; it does not provide +a direct rendering capable library, or one which uses GLX. For that, +please see Mesa-libGL1. + +%package -n libOSMesa9 Summary: Mesa Off-screen rendering extension Group: System/Libraries -%description -n libOSMesa8 +%description -n libOSMesa9 OSmesa is a Mesa extension that allows programs to render to an off-screen buffer using the OpenGL API without having to create a rendering context on an X Server. It uses a pure software renderer. +%package -n libOSMesa-devel +Summary: Development files for the Mesa Offscreen Rendering extension +Group: Development/Libraries/C and C++ +Requires: libOSMesa9 = %version + +%description -n libOSMesa-devel +Development files for the OSmesa Mesa extension that allows programs to render to an +off-screen buffer using the OpenGL API without having to create a +rendering context on an X Server. It uses a pure software renderer. + +%package -n Mesa-libglapi0 +Summary: Free implementation of the GL API +Group: System/Libraries + +%description -n Mesa-libglapi0 +The Mesa GL API module is responsible for dispatching all the gl* +functions. It is intended to be mainly used by the Mesa-libGLES* +packages. + +%package -n Mesa-libglapi-devel +Summary: Development files for the free implementation of the GL API +Group: Development/Libraries/C and C++ +Requires: Mesa-libglapi0 = %version + +%description -n Mesa-libglapi-devel +Development files for the Mesa GL API module which is responsible for +dispatching all the gl* functions. It is intended to be mainly used by +the Mesa-libGLES* packages. + %package -n libgbm1 Summary: Generic buffer management API Group: System/Libraries @@ -452,6 +453,15 @@ still "work in progress", i.e. expect poor video quality, choppy videos and artefacts all over. +#%package -n libvdpau_radeonsi +#Summary: XVMC state tracker for radeonsi +#Group: System/Libraries + +#%description -n libvdpau_radeonsi +#This package contains the VDPAU state tracker for radeonsi. This is +#still "work in progress", i.e. expect poor video quality, choppy +#videos and artefacts all over. + %package -n libvdpau_softpipe Summary: Software implementation of XVMC state tracker Group: System/Libraries @@ -461,27 +471,15 @@ state tracker. This is still "work in progress", i.e. expect poor video quality, choppy videos and artefacts all over. -%package -n Mesa-libglapi0 -Summary: Free implementation of the GL API -Group: System/Libraries - -%description -n Mesa-libglapi0 -The Mesa GL API module is responsible for dispatching all the gl* -functions. It is intended to be mainly used by the Mesa-libGLES* -packages. - - %prep %setup -n %{_name_archive}-%{_version} -b4 -q %patch1 -p1 # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} #%patch11 -p1 -%patch12 -p1 %patch16 -p1 %patch13 -p1 %patch14 -p1 -%patch15 -p1 %build @@ -490,12 +488,12 @@ export TALLOC_LIBS=-ltalloc export TALLOC_CFLAGS="-I/usr/include" autoreconf -fi +### --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga \ %configure --enable-gles1 \ --enable-gles2 \ - --with-driver=dri \ + --enable-dri \ --with-egl-platforms=x11,drm \ --enable-shared-glapi \ - --enable-shared-dricore \ --enable-xa \ --enable-texture-float \ %if %glamor @@ -522,16 +520,21 @@ make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT # build and install Indirect Rendering only libGL -make realclean -%configure --with-driver=xlib \ +make clean-local +%configure --enable-xlib-glx \ + --enable-osmesa \ --disable-glu \ + --disable-dri \ + --with-egl-platforms=x11 \ --with-gallium-drivers="" \ + --with-gl-lib-name=IndirectGL \ CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -sed -i 's/GL_LIB = .*/GL_LIB = IndirectGL/g' configs/autoconf + make %{?_smp_mflags} -cp -a %{_lib}/libIndirectGL.so.* %{_lib}/libOSMesa.so* \ - $RPM_BUILD_ROOT/usr/%{_lib} -for dir in ../xc/doc/man/{GL/gl,GL/glx,GLU}; do +make install DESTDIR=$RPM_BUILD_ROOT + +#for dir in ../xc/doc/man/{GL/gl,GL/glx,GLU}; do +for dir in ../xc/doc/man/{GL/gl,GL/glx}; do pushd $dir xmkmf -a make %{?_smp_mflags} @@ -567,17 +570,13 @@ %postun -n Mesa-libGLESv2-2 -p /sbin/ldconfig -%post -n Mesa-libGLU1 -p /sbin/ldconfig - -%postun -n Mesa-libGLU1 -p /sbin/ldconfig - %post -n Mesa-libIndirectGL1 -p /sbin/ldconfig %postun -n Mesa-libIndirectGL1 -p /sbin/ldconfig -%post -n libOSMesa8 -p /sbin/ldconfig +%post -n libOSMesa9 -p /sbin/ldconfig -%postun -n libOSMesa8 -p /sbin/ldconfig +%postun -n libOSMesa9 -p /sbin/ldconfig %post -n libgbm1 -p /sbin/ldconfig @@ -607,6 +606,9 @@ %post -n libvdpau_r600 %postun -n libvdpau_r600 +#%post -n libvdpau_radeonsi +#%postun -n libvdpau_radeonsi + %post -n libvdpau_softpipe %postun -n libvdpau_softpipe %endif @@ -620,7 +622,7 @@ %doc docs/README* docs/COPYING %config /etc/drirc %{_libdir}/dri/ -#%{_libdir}/egl/ +%_libdir/libdricore9*.so.* %files -n Mesa-libEGL1 %defattr(-,root,root) @@ -632,6 +634,7 @@ %_includedir/KHR %_libdir/libEGL.so %_libdir/pkgconfig/egl.pc +%_libdir/libEGL.la %files -n Mesa-libGL1 %defattr(-,root,root) @@ -641,9 +644,9 @@ %defattr(-,root,root) %dir %_includedir/GL %_includedir/GL/*.h -%exclude %_includedir/GL/glu*.h %_libdir/libGL.so %_libdir/pkgconfig/gl.pc +%_libdir/libGL.la %_mandir/man3/gl[A-Z]* %files -n Mesa-libGLESv1_CM1 @@ -654,6 +657,7 @@ %defattr(-,root,root) %_includedir/GLES %_libdir/libGLESv1_CM.so +%_libdir/libGLESv1_CM.la %_libdir/pkgconfig/glesv1_cm.pc %files -n Mesa-libGLESv2-2 @@ -664,27 +668,27 @@ %defattr(-,root,root) %_includedir/GLES2 %_libdir/libGLESv2.so +%_libdir/libGLESv2.la %_libdir/pkgconfig/glesv2.pc -%files -n Mesa-libGLU1 +%files -n Mesa-libIndirectGL1 %defattr(-,root,root) -%_libdir/libGLU.so.1* +%_libdir/libIndirectGL.so.1* -%files -n Mesa-libGLU-devel +%files -n Mesa-libIndirectGL-devel %defattr(-,root,root) -%dir %_includedir/GL -%_includedir/GL/glu*.h -%_libdir/libGLU.so -%_libdir/pkgconfig/glu.pc -%_mandir/man3/glu* +%_libdir/libIndirectGL.so +%_libdir/libIndirectGL.la -%files -n Mesa-libIndirectGL1 +%files -n libOSMesa9 %defattr(-,root,root) -%_libdir/libIndirectGL.so.1* +%_libdir/libOSMesa.so.* -%files -n libOSMesa8 +%files -n libOSMesa-devel %defattr(-,root,root) -%_libdir/libOSMesa.so.8* +%_libdir/libOSMesa.so +%_libdir/libOSMesa.la +%_libdir/pkgconfig/osmesa.pc %files -n libgbm1 %defattr(-,root,root) @@ -694,6 +698,7 @@ %defattr(-,root,root) %_includedir/gbm.h %_libdir/libgbm.so +%_libdir/libgbm.la %_libdir/pkgconfig/gbm.pc %ifnarch s390 s390x %arm ppc ppc64 @@ -750,6 +755,12 @@ %_libdir/vdpau/libvdpau_r600.so.1 %_libdir/vdpau/libvdpau_r600.so.1.0 +#%files -n libvdpau_radeonsi +#%defattr(-,root,root) +#%_libdir/vdpau/libvdpau_radeonsi.so +#%_libdir/vdpau/libvdpau_radeonsi.so.1 +#%_libdir/vdpau/libvdpau_radeonsi.so.1.0 + %files -n libvdpau_softpipe %defattr(-,root,root) %_libdir/vdpau/libvdpau_softpipe.so @@ -761,12 +772,17 @@ %defattr(-,root,root) %_libdir/libglapi.so.0* +%files -n Mesa-libglapi-devel +%defattr(-,root,root) +%_libdir/libglapi.la + %files devel %defattr(-,root,root) %doc docs/*.html docs/*.spec %_includedir/GL/internal -%_libdir/libOSMesa.so %_libdir/libglapi.so +%_libdir/libdricore9*.so +%_libdir/libdricore9*.la %_libdir/pkgconfig/dri.pc %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.oOOQzz/_old 2012-09-17 15:18:20.000000000 +0200 +++ /var/tmp/diff_new_pack.oOOQzz/_new 2012-09-17 15:18:20.000000000 +0200 @@ -10,9 +10,12 @@ requires "Mesa-libGLESv2-devel-<targettype> = <version>" requires "Mesa-libGLU-devel-<targettype> = <version>" requires "Mesa-libIndirectGL1-<targettype> = <version>" - requires "libOSMesa8-<targettype> = <version>" + requires "Mesa-libIndirectGL-devel-<targettype> = <version>" + requires "libOSMesa9-<targettype> = <version>" + requires "libOSMesa-devel-<targettype> = <version>" requires "libgbm-devel-<targettype>" requires "Mesa-libglapi0-<targettype> = <version>" + requires "Mesa-libglapi-devel-<targettype> = <version>" obsoletes "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>" provides "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>" Mesa-libEGL1 @@ -36,12 +39,21 @@ requires -Mesa-libGLU-<targettype> requires "Mesa-libGLU1-<targettype> = <version>" Mesa-libIndirectGL1 -libOSMesa8 +Mesa-libIndirectGL1-devel + requires -Mesa-libIndirectGL-<targettype> + requires "Mesa-libIndirectGL1-<targettype> = <version>" +libOSMesa9 +libOSMesa-devel + requires -libOSMesa-<targettype> + requires "libOSMesa9-<targettype> = <version>" libgbm1 libgbm-devel requires -libgbm-<targettype> requires "libgbm1-<targettype> = <version>" Mesa-libglapi0 +Mesa-libglapi-devel + requires -Mesa-libglapi-<targettype> + requires "Mesa-libglapi0-<targettype> = <version>" libXvMC_nouveau libXvMC_r300 libXvMC_r600 @@ -49,4 +61,5 @@ libvdpau_nouveau libvdpau_r300 libvdpau_r600 +libvdpau_radeonsi libvdpau_softpipe ++++++ mesa-8.0.4.tar.bz2 -> mesa-8.98.1.tar.bz2 ++++++ ++++ 594604 lines of diff (skipped) ++++++ u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch ++++++ --- /var/tmp/diff_new_pack.oOOQzz/_old 2012-09-17 15:18:24.000000000 +0200 +++ /var/tmp/diff_new_pack.oOOQzz/_new 2012-09-17 15:18:24.000000000 +0200 @@ -13,6 +13,7 @@ for 8.0.1 Ported to 8.0.2 +Ported to 8.1 --- src/mesa/drivers/dri/swrast/swrast.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) @@ -21,7 +22,7 @@ index d18dd09..dd7d0c0 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c -@@ -63,6 +63,7 @@ +@@ -66,6 +66,7 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format, __DRIdrawable *dPriv) { @@ -29,7 +30,7 @@ struct dri_context *dri_ctx; int x, y, w, h; __DRIscreen *sPriv = dPriv->driScreenPriv; -@@ -93,6 +94,13 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, +@@ -96,6 +97,13 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, _mesa_init_teximage_fields(&dri_ctx->Base, texImage, w, h, 1, 0, internalFormat, texFormat); ++++++ u_mesa-8.0.1-fix-16bpp.patch ++++++ --- /var/tmp/diff_new_pack.oOOQzz/_old 2012-09-17 15:18:24.000000000 +0200 +++ /var/tmp/diff_new_pack.oOOQzz/_new 2012-09-17 15:18:24.000000000 +0200 @@ -1,17 +1,3 @@ -diff -up Mesa-8.0.1/src/glx/drisw_glx.c.jx Mesa-8.0.1/src/glx/drisw_glx.c ---- Mesa-8.0.1/src/glx/drisw_glx.c.jx 2012-04-02 10:34:23.000000000 -0400 -+++ Mesa-8.0.1/src/glx/drisw_glx.c 2012-04-02 11:44:19.296407735 -0400 -@@ -274,7 +274,9 @@ swrastShmGetImage(__DRIdrawable *read, c - do { - int i; - char *src = ximage->data; -- int dst_width = align(ximage->width * ximage->bits_per_pixel / 8, 256); -+ int bytes_per_pixel = ((ximage->bits_per_pixel + 7) / 8); -+ int dst_width = align(ximage->width * bytes_per_pixel, -+ 64 * bytes_per_pixel); - - for (i = 0; i < ximage->height; i++) { - memcpy(data, src, ximage->bytes_per_line); diff -up Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx Mesa-8.0.1/src/mesa/state_tracker/st_manager.c --- Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx 2012-02-14 18:44:00.000000000 -0500 +++ Mesa-8.0.1/src/mesa/state_tracker/st_manager.c 2012-04-02 12:02:14.613964417 -0400 ++++++ u_remove-os-abi-tag.patch ++++++ --- /var/tmp/diff_new_pack.oOOQzz/_old 2012-09-17 15:18:24.000000000 +0200 +++ /var/tmp/diff_new_pack.oOOQzz/_new 2012-09-17 15:18:24.000000000 +0200 @@ -26,30 +26,6 @@ print ' .section ".note.ABI-tag", "a"' print ' .p2align 2' print ' .long 1f - 0f /* name length */' -diff -u -r -p mesa-8.0.3.orig//src/mapi/glapi/glapi_x86-64.S mesa-8.0.3/src/mapi/glapi/glapi_x86-64.S ---- mesa-8.0.3.orig//src/mapi/glapi/glapi_x86-64.S 2012-06-12 12:07:39.000000000 +0200 -+++ mesa-8.0.3/src/mapi/glapi/glapi_x86-64.S 2012-06-12 12:09:43.000000000 +0200 -@@ -37448,7 +37448,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES): - .globl GL_PREFIX(TransformFeedbackVaryings) ; .set GL_PREFIX(TransformFeedbackVaryings), GL_PREFIX(TransformFeedbackVaryingsEXT) - .globl GL_PREFIX(ProvokingVertex) ; .set GL_PREFIX(ProvokingVertex), GL_PREFIX(ProvokingVertexEXT) - --#if defined(GLX_USE_TLS) && defined(__linux__) -+#if 0 && defined(__linux__) - .section ".note.ABI-tag", "a" - .p2align 2 - .long 1f - 0f /* name length */ -diff -u -r -p mesa-8.0.3.orig//src/mapi/glapi/glapi_x86.S mesa-8.0.3/src/mapi/glapi/glapi_x86.S ---- mesa-8.0.3.orig//src/mapi/glapi/glapi_x86.S 2012-06-12 12:07:39.000000000 +0200 -+++ mesa-8.0.3/src/mapi/glapi/glapi_x86.S 2012-06-12 12:09:01.000000000 +0200 -@@ -1504,7 +1504,7 @@ GLNAME(gl_dispatch_functions_start): - ALIGNTEXT16 - GLNAME(gl_dispatch_functions_end): - --#if defined(GLX_USE_TLS) && defined(__linux__) -+#if 0 && defined(__linux__) - .section ".note.ABI-tag", "a" - .p2align 2 - .long 1f - 0f /* name length */ diff -u -r -p mesa-8.0.3.orig//src/mapi/mapi/entry_x86-64_tls.h mesa-8.0.3/src/mapi/mapi/entry_x86-64_tls.h --- mesa-8.0.3.orig//src/mapi/mapi/entry_x86-64_tls.h 2012-06-12 12:07:39.000000000 +0200 +++ mesa-8.0.3/src/mapi/mapi/entry_x86-64_tls.h 2012-06-12 12:10:20.000000000 +0200 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org