From 935cfcc76c60f1fd1d295e000ccf67d3deff5865ec1232ec3e07a8526d2185b8 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 23 Aug 2013 11:55:30 +0000 Subject: [PATCH 1/4] Accepting request 196096 from home:sumski:branches:X11:XOrg Update to 9.2 rc2 + small baselibs cleanup OBS-URL: https://build.opensuse.org/request/show/196096 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=309 --- Mesa.changes | 7 +++++++ Mesa.spec | 4 ++-- MesaLib-9.2.0-rc1.tar.bz2 | 3 --- MesaLib-9.2.0-rc2.tar.bz2 | 3 +++ baselibs.conf | 26 ++++++++------------------ 5 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 MesaLib-9.2.0-rc1.tar.bz2 create mode 100644 MesaLib-9.2.0-rc2.tar.bz2 diff --git a/Mesa.changes b/Mesa.changes index b365dbd..e764920 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 23 10:54:18 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to 9.2 rc2 + * Documentation, glsl and buildsystem fixes since rc1 +- baselibs.conf cleanup: adjusted to current spec + ------------------------------------------------------------------- Tue Aug 20 13:12:17 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/Mesa.spec b/Mesa.spec index 11117ed..b10d0a9 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -29,11 +29,11 @@ %define llvm_r600 0 %endif -%define _version 9.2.0-rc1 +%define _version 9.2.0-rc2 %define _name_archive MesaLib Name: Mesa -Version: 9.2.0~rc1 +Version: 9.2.0~rc2 Release: 0 BuildRequires: autoconf >= 2.60 BuildRequires: automake diff --git a/MesaLib-9.2.0-rc1.tar.bz2 b/MesaLib-9.2.0-rc1.tar.bz2 deleted file mode 100644 index b2400db..0000000 --- a/MesaLib-9.2.0-rc1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df426c1354037c3cb9122a4aa53be58de2499730c69be09c6347f1758834f50a -size 6639264 diff --git a/MesaLib-9.2.0-rc2.tar.bz2 b/MesaLib-9.2.0-rc2.tar.bz2 new file mode 100644 index 0000000..58b0759 --- /dev/null +++ b/MesaLib-9.2.0-rc2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c455862dda4c49593ab804f7c5c8071ea61ab8f324ef5aa6a69b67c80935ab69 +size 6642555 diff --git a/baselibs.conf b/baselibs.conf index 18a5ff9..e848fa6 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -4,60 +4,50 @@ Mesa provides "XFree86-Mesa- xorg-x11-Mesa-" Mesa-devel #We need Mesa-!, do not put requires -Mesa-. + requires "Mesa- = " requires "Mesa-libEGL-devel- = " requires "Mesa-libGL-devel- = " requires "Mesa-libGLESv1_CM-devel- = " requires "Mesa-libGLESv2-devel- = " - #requires "Mesa-libGLESv3-devel- = " - requires "Mesa-libIndirectGL1- = " requires "Mesa-libIndirectGL-devel- = " - requires "libOSMesa9- = " - requires "libOSMesa-devel- = " - requires "libgbm-devel-" -# requires "libwayland-egl-devel- = " - requires "Mesa-libglapi0- = " requires "Mesa-libglapi-devel- = " + requires "libOSMesa-devel- = " + requires "libgbm-devel- = " + #Activate libwayland-egl-devel once 12.2 is gone + #requires "libwayland-egl-devel- = " obsoletes "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" provides "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" Mesa-libEGL1 Mesa-libEGL-devel - requires -Mesa-libEGL- requires "Mesa-libEGL1- = " Mesa-libGL1 requires "Mesa-" Mesa-libGL-devel - requires -Mesa-libGL- requires "Mesa-libGL1- = " Mesa-libGLESv1_CM1 Mesa-libGLESv1_CM-devel - requires -Mesa-libGLESv1_CM- + requires "Mesa-libEGL1-devel- = " requires "Mesa-libGLESv1_CM1- = " Mesa-libGLESv2-2 Mesa-libGLESv2-devel - requires -Mesa-libGLESv2- + requires "Mesa-libEGL1-devel- = " requires "Mesa-libGLESv2-2- = " Mesa-libGLESv3-devel -# requires -Mesa-libGLESv3- -# requires "Mesa-libGLESv3-3- = " + requires "Mesa-libEGL1-devel- = " Mesa-libIndirectGL1 Mesa-libIndirectGL-devel - requires -Mesa-libIndirectGL- requires "Mesa-libIndirectGL1- = " libOSMesa9 libOSMesa-devel - requires -libOSMesa- requires "libOSMesa9- = " libgbm1 libgbm-devel - requires -libgbm- requires "libgbm1- = " libwayland-egl1 libwayland-egl-devel - requires -libwayland-egl- requires "libwayland-egl1- = " Mesa-libglapi0 Mesa-libglapi-devel - requires -Mesa-libglapi- requires "Mesa-libglapi0- = " libXvMC_nouveau libXvMC_r300 From 2138f2187bd8de04316df5932f0ab8453c0aec099fc4877cbe3f32718f9f0186 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 23 Aug 2013 14:55:02 +0000 Subject: [PATCH 2/4] Accepting request 196107 from home:sumski:branches:X11:XOrg Fixed baselibs from previous change (sorry for the trouble!) OBS-URL: https://build.opensuse.org/request/show/196107 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=310 --- Mesa.changes | 6 ++++++ baselibs.conf | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index e764920..59eac21 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 23 12:23:15 UTC 2013 - hrvoje.senjan@gmail.com + +- Fix baselibs from previous change (there is no Mesa-libEGL1-devel), + but Mesa-libEGL-devel + ------------------------------------------------------------------- Fri Aug 23 10:54:18 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/baselibs.conf b/baselibs.conf index e848fa6..60b7f40 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -19,21 +19,21 @@ Mesa-devel provides "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" Mesa-libEGL1 Mesa-libEGL-devel - requires "Mesa-libEGL1- = " + requires "Mesa-libEGL- = " Mesa-libGL1 requires "Mesa-" Mesa-libGL-devel requires "Mesa-libGL1- = " Mesa-libGLESv1_CM1 Mesa-libGLESv1_CM-devel - requires "Mesa-libEGL1-devel- = " + requires "Mesa-libEGL-devel- = " requires "Mesa-libGLESv1_CM1- = " Mesa-libGLESv2-2 Mesa-libGLESv2-devel - requires "Mesa-libEGL1-devel- = " + requires "Mesa-libEGL-devel- = " requires "Mesa-libGLESv2-2- = " Mesa-libGLESv3-devel - requires "Mesa-libEGL1-devel- = " + requires "Mesa-libEGL-devel- = " Mesa-libIndirectGL1 Mesa-libIndirectGL-devel requires "Mesa-libIndirectGL1- = " From 45639bc68ae3b2ceae22512f91f3f9e28dfca243f42e669854c95520bb484542 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 23 Aug 2013 19:19:25 +0000 Subject: [PATCH 3/4] Accepting request 196132 from home:sumski:branches:X11:XOrg Stop versioning libgbm1/devel and libwayland-egl/devel by itself, they now follow general Mesa version. Last sr, i promise ;-) OBS-URL: https://build.opensuse.org/request/show/196132 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=311 --- Mesa.changes | 6 ++++++ Mesa.spec | 9 --------- baselibs.conf | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index 59eac21..f6decf8 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 23 15:03:44 UTC 2013 - hrvoje.senjan@gmail.com + +- Stop versioning libgbm1/devel and libwayland-egl/devel by itself, + they now follow general Mesa version + ------------------------------------------------------------------- Fri Aug 23 12:23:15 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/Mesa.spec b/Mesa.spec index b10d0a9..9abb543 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -371,9 +371,6 @@ the Mesa-libGLES* packages. %package -n libgbm1 Summary: Generic buffer management API Group: System/Libraries -# as per gbm.pc -Version: 0.0.0 -Release: 0 %description -n libgbm1 This package contains the GBM buffer management library. It provides @@ -386,8 +383,6 @@ openwfd. %package -n libgbm-devel Summary: Development files for the EGL API Group: Development/Libraries/C and C++ -Version: 0.0.0 -Release: 0 Requires: libgbm1 = %version %description -n libgbm-devel @@ -406,8 +401,6 @@ programs against the GBM library. %package -n libwayland-egl1 Summary: Additional egl functions for wayland Group: System/Libraries -Version: 1.0.0 -Release: 0 %description -n libwayland-egl1 This package provides additional functions for egl-using programs @@ -417,8 +410,6 @@ that need not run full-screen and cooperate with a compositor. %package -n libwayland-egl-devel Summary: Development files for libwayland-egl1 Group: Development/Libraries/C and C++ -Version: 1.0.0 -Release: 0 Requires: libwayland-egl1 = %version %description -n libwayland-egl-devel diff --git a/baselibs.conf b/baselibs.conf index 60b7f40..b7c94cb 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -19,7 +19,7 @@ Mesa-devel provides "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" Mesa-libEGL1 Mesa-libEGL-devel - requires "Mesa-libEGL- = " + requires "Mesa-libEGL1- = " Mesa-libGL1 requires "Mesa-" Mesa-libGL-devel From 7827ef476ce4308e9a1b49e4cc3c32a52348d0bc0a3c91de9dda7b6bfb07be2a Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 28 Aug 2013 08:46:34 +0000 Subject: [PATCH 4/4] Accepting request 196588 from home:tobijk:X11:XOrg update to final 9.2 OBS-URL: https://build.opensuse.org/request/show/196588 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=312 --- Mesa.changes | 30 ++++++++++++++++++++++++++++++ Mesa.spec | 4 ++-- MesaLib-9.2.0-rc2.tar.bz2 | 3 --- MesaLib-9.2.0.tar.bz2 | 3 +++ 4 files changed, 35 insertions(+), 5 deletions(-) delete mode 100644 MesaLib-9.2.0-rc2.tar.bz2 create mode 100644 MesaLib-9.2.0.tar.bz2 diff --git a/Mesa.changes b/Mesa.changes index f6decf8..6e0febd 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Tue Aug 27 23:56:19 UTC 2013 - tobias.johannes.klausmann@mni.thm.de + +- Update to final version 9.2: + Mesa 9.2 has been released! Mesa 9.2 is a feature release that includes + many updates and enhancements. +- New features: + + GL_ARB_shading_language_420pack in all drivers that support GLSL 1.30. + + GL_ARB_texture_buffer_range + + GL_ARB_texture_multisample + + GL_ARB_texture_storage_multisample + + GL_ARB_texture_query_lod + + Enable GL_ARB_texture_storage on radeon, r200, and nouveau + + GL_EXT_discard_framebuffer in all OpenGL ES (all versions) drivers + + GL_EXT_framebuffer_multisample_blit_scaled on i965 + + Added new freedreno gallium driver + + OSMesa interface for gallium llvmpipe/softpipe drivers + + Gallium Heads-Up Display (HUD) feature for performance monitoring + + Added support for UVD (2.2 and 3.0) video decoding on r600g and radeonsi + through VDPAU (requires Kernel 3.10 or later) +- Changes: + + Removed d3d1x state tracker (unused, unmaintained and broken) + + Removed GL_EXT_clip_volume_hint because no driver had enabled it since 2007. + + Removed GL_MESA_resize_buffers because it was only really implemented by the + (unsupported) GDI driver. + + GL_EXT_separate_shader_objects has been removed from all Gallium drivers, + because it disallows a critical GLSL shader optimization. + GL_ARB_separate_shader_objects doesn't have this issue. + + i965 Gen6+ requires Kernel 3.6 or later. (92d2f5a) + ------------------------------------------------------------------- Fri Aug 23 15:03:44 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/Mesa.spec b/Mesa.spec index 9abb543..feceb7a 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -29,11 +29,11 @@ %define llvm_r600 0 %endif -%define _version 9.2.0-rc2 +%define _version 9.2.0 %define _name_archive MesaLib Name: Mesa -Version: 9.2.0~rc2 +Version: 9.2.0 Release: 0 BuildRequires: autoconf >= 2.60 BuildRequires: automake diff --git a/MesaLib-9.2.0-rc2.tar.bz2 b/MesaLib-9.2.0-rc2.tar.bz2 deleted file mode 100644 index 58b0759..0000000 --- a/MesaLib-9.2.0-rc2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c455862dda4c49593ab804f7c5c8071ea61ab8f324ef5aa6a69b67c80935ab69 -size 6642555 diff --git a/MesaLib-9.2.0.tar.bz2 b/MesaLib-9.2.0.tar.bz2 new file mode 100644 index 0000000..ffb57aa --- /dev/null +++ b/MesaLib-9.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75e6a9bf59fb402f5fbed846be4effafa8a5809229579cd41023b906223a9187 +size 6643026