From 5431137cd7e34c0512abd0d982450ad23e19ab37bde0ffca8b1acd7a2cdf4730 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 16 Jun 2015 10:29:59 +0000 Subject: [PATCH 1/5] Accepting request 312123 from home:tobijk:X11:XOrg - Update to version 10.6.0: - New GL/EGL Features: + GL_AMD_pinned_memory on r600, radeonsi + GL_ARB_clip_control on i965 + GL_ARB_depth_buffer_float on freedreno + GL_ARB_depth_clamp on freedreno + GL_ARB_direct_state_access on all drivers for Core GL contexts. + GL_ARB_draw_indirect, GL_ARB_multi_draw_indirect on r600 + GL_ARB_draw_instanced on freedreno + GL_ARB_gpu_shader_fp64 on nvc0, softpipe + GL_ARB_gpu_shader5 on i965/gen8+ + GL_ARB_instanced_arrays on freedreno + GL_ARB_pipeline_statistics_query on i965, nv50, nvc0, r600, radeonsi, softpipe + GL_ARB_program_interface_query (all drivers) + GL_ARB_texture_stencil8 on nv50, nvc0, r600, radeonsi, softpipe + GL_ARB_texture_view on llvmpipe, softpipe + GL_ARB_uniform_buffer_object on freedreno + GL_ARB_vertex_attrib_64bit on nvc0, softpipe + GL_ARB_viewport_array, GL_AMD_vertex_shader_viewport_index on i965/gen6 + GL_EXT_draw_buffers2 on freedreno + GL_OES_EGL_sync on all drivers + EGL_KHR_fence_sync on i965, freedreno, nv50, nvc0, r600, radeonsi + EGL_KHR_wait_sync on i965, freedreno, nv50, nvc0, r600, radeonsi + EGL_KHR_cl_event2 on freedreno, nv50, nvc0, r600, radeonsi + GL_AMD_performance_monitor on nvc0 - Changes to package: + add --enable-shader-cache to configure options + remove Patch100: U_0001_gallium_include_util_macros.patch + remove Patch101: U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch + remove Patch102: U_0003_fix_build_after_macro_include.patch OBS-URL: https://build.opensuse.org/request/show/312123 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=452 --- Mesa.changes | 34 +++++++ Mesa.spec | 13 +-- U_0001_gallium_include_util_macros.patch | 89 ------------------- ...end_of_non_void_function_unreachable.patch | 24 ----- U_0003_fix_build_after_macro_include.patch | 24 ----- mesa-10.5.7.tar.xz | 3 - mesa-10.6.0.tar.xz | 3 + 7 files changed, 41 insertions(+), 149 deletions(-) delete mode 100644 U_0001_gallium_include_util_macros.patch delete mode 100644 U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch delete mode 100644 U_0003_fix_build_after_macro_include.patch delete mode 100644 mesa-10.5.7.tar.xz create mode 100644 mesa-10.6.0.tar.xz diff --git a/Mesa.changes b/Mesa.changes index 3e8c3a5..b12643d 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Mon Jun 15 14:19:06 UTC 2015 - tobias.johannes.klausmann@mni.thm.de + +- Update to version 10.6.0: +- New GL/EGL Features: + + GL_AMD_pinned_memory on r600, radeonsi + + GL_ARB_clip_control on i965 + + GL_ARB_depth_buffer_float on freedreno + + GL_ARB_depth_clamp on freedreno + + GL_ARB_direct_state_access on all drivers for Core GL contexts. + + GL_ARB_draw_indirect, GL_ARB_multi_draw_indirect on r600 + + GL_ARB_draw_instanced on freedreno + + GL_ARB_gpu_shader_fp64 on nvc0, softpipe + + GL_ARB_gpu_shader5 on i965/gen8+ + + GL_ARB_instanced_arrays on freedreno + + GL_ARB_pipeline_statistics_query on i965, nv50, nvc0, r600, radeonsi, softpipe + + GL_ARB_program_interface_query (all drivers) + + GL_ARB_texture_stencil8 on nv50, nvc0, r600, radeonsi, softpipe + + GL_ARB_texture_view on llvmpipe, softpipe + + GL_ARB_uniform_buffer_object on freedreno + + GL_ARB_vertex_attrib_64bit on nvc0, softpipe + + GL_ARB_viewport_array, GL_AMD_vertex_shader_viewport_index on i965/gen6 + + GL_EXT_draw_buffers2 on freedreno + + GL_OES_EGL_sync on all drivers + + EGL_KHR_fence_sync on i965, freedreno, nv50, nvc0, r600, radeonsi + + EGL_KHR_wait_sync on i965, freedreno, nv50, nvc0, r600, radeonsi + + EGL_KHR_cl_event2 on freedreno, nv50, nvc0, r600, radeonsi + + GL_AMD_performance_monitor on nvc0 +- Changes to package: + + add --enable-shader-cache to configure options + + remove Patch100: U_0001_gallium_include_util_macros.patch + + remove Patch101: U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch + + remove Patch102: U_0003_fix_build_after_macro_include.patch + ------------------------------------------------------------------- Mon Jun 8 23:10:43 UTC 2015 - zaitor@opensuse.org diff --git a/Mesa.spec b/Mesa.spec index 4045789..03e2fb1 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -18,7 +18,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 10.5.7 +%define _version 10.6.0 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x %define gallium_loader 1 %else @@ -37,7 +37,7 @@ %define with_nine 1 %endif Name: Mesa -Version: 10.5.7 +Version: 10.6.0 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT @@ -54,9 +54,6 @@ Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch Patch13: u_mesa-8.0.1-fix-16bpp.patch # Patch from Fedora, use shmget when available, under llvmpipe Patch15: u_mesa-8.0-llvmpipe-shmget.patch -Patch100: U_0001_gallium_include_util_macros.patch -Patch101: U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch -Patch102: U_0003_fix_build_after_macro_include.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: bison @@ -80,6 +77,7 @@ BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.41 BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.56 BuildRequires: pkgconfig(libkms) >= 1.0.0 BuildRequires: pkgconfig(libudev) > 151 +BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(presentproto) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) @@ -517,10 +515,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} #%patch11 -p1 #%patch15 -p1 #%patch13 -p1 -### -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 %build %if 0%{?suse_version} >= 1310 @@ -540,6 +534,7 @@ autoreconf -fvi --enable-texture-float \ --enable-osmesa \ --enable-dri3 \ + --enable-shader-cache \ %{?with_nine:--enable-nine} \ %if %{glamor} --enable-gbm \ diff --git a/U_0001_gallium_include_util_macros.patch b/U_0001_gallium_include_util_macros.patch deleted file mode 100644 index a60590b..0000000 --- a/U_0001_gallium_include_util_macros.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 984f3069370cd4a347cb38269d430b428385affd Mon Sep 17 00:00:00 2001 -From: Tobias Klausmann -Date: Thu, 12 Feb 2015 18:31:40 +0100 -Subject: gallium: include util/macros.h - -The most common macros are defined there, no use to duplicate these -Clean up the already redefinded macros - -Signed-off-by: Tobias Klausmann -Reviewed-by: Eric Anholt - -diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h -index fb018bf..cc4f444 100644 ---- a/src/gallium/include/pipe/p_compiler.h -+++ b/src/gallium/include/pipe/p_compiler.h -@@ -33,6 +33,8 @@ - - #include "p_config.h" - -+#include "util/macros.h" -+ - #include - #include - #include -@@ -204,61 +206,6 @@ void _ReadWriteBarrier(void); - - #endif - -- --/* You should use these macros to mark if blocks where the if condition -- * is either likely to be true, or unlikely to be true. -- * -- * This will inform human readers of this fact, and will also inform -- * the compiler, who will in turn inform the CPU. -- * -- * CPUs often start executing code inside the if or the else blocks -- * without knowing whether the condition is true or not, and will have -- * to throw the work away if they find out later they executed the -- * wrong part of the if. -- * -- * If these macros are used, the CPU is more likely to correctly predict -- * the right path, and will avoid speculatively executing the wrong branch, -- * thus not throwing away work, resulting in better performance. -- * -- * In light of this, it is also a good idea to mark as "likely" a path -- * which is not necessarily always more likely, but that will benefit much -- * more from performance improvements since it is already much faster than -- * the other path, or viceversa with "unlikely". -- * -- * Example usage: -- * if(unlikely(do_we_need_a_software_fallback())) -- * do_software_fallback(); -- * else -- * render_with_gpu(); -- * -- * The macros follow the Linux kernel convention, and more examples can -- * be found there. -- * -- * Note that profile guided optimization can offer better results, but -- * needs an appropriate coverage suite and does not inform human readers. -- */ --#ifndef likely --# if defined(__GNUC__) --# define likely(x) __builtin_expect(!!(x), 1) --# define unlikely(x) __builtin_expect(!!(x), 0) --# else --# define likely(x) (x) --# define unlikely(x) (x) --# endif --#endif -- -- --/** -- * Static (compile-time) assertion. -- * Basically, use COND to dimension an array. If COND is false/zero the -- * array size will be -1 and we'll get a compilation error. -- */ --#define STATIC_ASSERT(COND) \ -- do { \ -- (void) sizeof(char [1 - 2*!(COND)]); \ -- } while (0) -- -- - #if defined(__cplusplus) - } - #endif --- -cgit v0.10.2 - diff --git a/U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch b/U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch deleted file mode 100644 index 936ba85..0000000 --- a/U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 98ae01c82294882b1fddcd03adf24101b4f24d4f Mon Sep 17 00:00:00 2001 -From: Tobias Klausmann -Date: Thu, 12 Feb 2015 18:31:41 +0100 -Subject: st/nine: Mark end of non-void function unreachable - -Signed-off-by: Tobias Klausmann -Reviewed-by: Eric Anholt - -diff --git a/src/gallium/state_trackers/nine/nine_pipe.h b/src/gallium/state_trackers/nine/nine_pipe.h -index 17844d5..b8e728e 100644 ---- a/src/gallium/state_trackers/nine/nine_pipe.h -+++ b/src/gallium/state_trackers/nine/nine_pipe.h -@@ -222,7 +222,7 @@ d3d9_get_pipe_depth_format_bindings(D3DFORMAT format) - case D3DFMT_DF24: - case D3DFMT_INTZ: - return PIPE_BIND_DEPTH_STENCIL | PIPE_BIND_SAMPLER_VIEW; -- default: assert(0); -+ default: unreachable("Unexpected format"); - } - } - --- -cgit v0.10.2 - diff --git a/U_0003_fix_build_after_macro_include.patch b/U_0003_fix_build_after_macro_include.patch deleted file mode 100644 index 03186a3..0000000 --- a/U_0003_fix_build_after_macro_include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1d1e820a6dce5e6fc8f67bd0f00e402645774e1b Mon Sep 17 00:00:00 2001 -From: Eric Anholt -Date: Tue, 24 Feb 2015 13:47:58 +0000 -Subject: r600: Fix build after 984f3069370cd4a347cb38269d430b428385affd - -Same as for the CLAMP macro, undef it before including a header file that -tries to make fields with that name. - -diff --git a/src/gallium/drivers/r600/sb/sb_bc.h b/src/gallium/drivers/r600/sb/sb_bc.h -index 6d3dc4d..072d8f8 100644 ---- a/src/gallium/drivers/r600/sb/sb_bc.h -+++ b/src/gallium/drivers/r600/sb/sb_bc.h -@@ -784,7 +784,7 @@ public: \ - - // CLAMP macro defined elsewhere interferes with bytecode field name - #undef CLAMP -- -+#undef ARRAY_SIZE - #include "sb_bc_fmt_def.inc" - - #undef BC_FORMAT_BEGIN --- -cgit v0.10.2 - diff --git a/mesa-10.5.7.tar.xz b/mesa-10.5.7.tar.xz deleted file mode 100644 index bf554cf..0000000 --- a/mesa-10.5.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04d06890cd69af8089d6ca76f40e46dcf9cacfe4a9788b32be620574d4638818 -size 6992848 diff --git a/mesa-10.6.0.tar.xz b/mesa-10.6.0.tar.xz new file mode 100644 index 0000000..99e350e --- /dev/null +++ b/mesa-10.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f37e2633978deed02ff0522abc36c709586e2b555fd439a82ab71dce2c866c76 +size 7032132 From ab04f3beda547e00805bfe062058bf5ece570efbf3f1f606197ba4cff2db7002 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 23 Jun 2015 14:33:29 +0000 Subject: [PATCH 2/5] - n_Fixed-build-against-wayland-1.2.1.patch * required to fix build with wayland on openSUSE 13.1 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=453 --- Mesa.changes | 6 +++ Mesa.spec | 4 ++ n_Fixed-build-against-wayland-1.2.1.patch | 58 +++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 n_Fixed-build-against-wayland-1.2.1.patch diff --git a/Mesa.changes b/Mesa.changes index b12643d..d4a37e6 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 23 14:26:17 UTC 2015 - sndirsch@suse.com + +- n_Fixed-build-against-wayland-1.2.1.patch + * required to fix build with wayland on openSUSE 13.1 + ------------------------------------------------------------------- Mon Jun 15 14:19:06 UTC 2015 - tobias.johannes.klausmann@mni.thm.de diff --git a/Mesa.spec b/Mesa.spec index 03e2fb1..70950b9 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -48,6 +48,8 @@ Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc +# required for building against wayland of openSUSE 13.1 +Patch0: n_Fixed-build-against-wayland-1.2.1.patch # to be upstreamed Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch # Patch from Fedora, fix 16bpp in llvmpipe @@ -509,6 +511,8 @@ This package contains the VDPAU state tracker for radeonsi. %setup -q -n %{_name_archive}-%{_version} -b4 # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} +# required for building against wayland of openSUSE 13.1 +%patch0 -p1 ### disabled, but not dropped yet; these still need investigation in ### order to figure out whether the issue is still reproducable and ### hence a fix is required diff --git a/n_Fixed-build-against-wayland-1.2.1.patch b/n_Fixed-build-against-wayland-1.2.1.patch new file mode 100644 index 0000000..751ed03 --- /dev/null +++ b/n_Fixed-build-against-wayland-1.2.1.patch @@ -0,0 +1,58 @@ +From 5d277737eef98b4c5913bb5a29c16776c82c5d7c Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch +Date: Tue, 23 Jun 2015 16:19:51 +0200 +Subject: [PATCH] Fixed build against wayland 1.2.1 + +Wayland 1.2.1 still lacks definition of WL_SHM_FORMAT_RGB565 format. + +Signed-off-by: Stefan Dirsch + +--- + src/egl/drivers/dri2/platform_wayland.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c +index ea2f9f2..ee2b324 100644 +--- a/src/egl/drivers/dri2/platform_wayland.c ++++ b/src/egl/drivers/dri2/platform_wayland.c +@@ -1236,9 +1236,11 @@ dri2_initialize_wayland_drm(_EGLDriver *drv, _EGLDisplay *disp) + static int + dri2_wl_swrast_get_stride_for_format(int format, int w) + { ++#ifdef WL_SHM_FORMAT_RGB565 + if (format == WL_SHM_FORMAT_RGB565) + return 2 * w; + else /* ARGB8888 || XRGB8888 */ ++#endif + return 4 * w; + } + +@@ -1672,9 +1674,13 @@ dri2_wl_swrast_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, + if (!_eglInitSurface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf, attrib_list)) + goto cleanup_surf; + ++#ifdef WL_SHM_FORMAT_RGB565 + if (conf->RedSize == 5) + dri2_surf->format = WL_SHM_FORMAT_RGB565; + else if (conf->AlphaSize == 0) ++#else ++ if (conf->AlphaSize == 0) ++#endif + dri2_surf->format = WL_SHM_FORMAT_XRGB8888; + else + dri2_surf->format = WL_SHM_FORMAT_ARGB8888; +@@ -1728,9 +1734,11 @@ shm_handle_format(void *data, struct wl_shm *shm, uint32_t format) + case WL_SHM_FORMAT_XRGB8888: + dri2_dpy->formats |= HAS_XRGB8888; + break; ++#ifdef WL_SHM_FORMAT_RGB565 + case WL_SHM_FORMAT_RGB565: + dri2_dpy->formats |= HAS_RGB565; + break; ++#endif + } + } + +-- +1.8.4.5 + From 1241ae63adb0d27e2e3661fc1b43901b14a7143813ac0fdacef685aa2aaa8f4d Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 23 Jun 2015 14:56:59 +0000 Subject: [PATCH 3/5] - rewritten bogus patch 'n_Fixed-build-against-wayland-1.2.1.patch" OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=454 --- Mesa.spec | 2 ++ n_Fixed-build-against-wayland-1.2.1.patch | 44 +++++++++-------------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/Mesa.spec b/Mesa.spec index 70950b9..c5e5c25 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -511,8 +511,10 @@ This package contains the VDPAU state tracker for radeonsi. %setup -q -n %{_name_archive}-%{_version} -b4 # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} +%if 0%{?suse_version} < 1320 # required for building against wayland of openSUSE 13.1 %patch0 -p1 +%endif ### disabled, but not dropped yet; these still need investigation in ### order to figure out whether the issue is still reproducable and ### hence a fix is required diff --git a/n_Fixed-build-against-wayland-1.2.1.patch b/n_Fixed-build-against-wayland-1.2.1.patch index 751ed03..abf8c3e 100644 --- a/n_Fixed-build-against-wayland-1.2.1.patch +++ b/n_Fixed-build-against-wayland-1.2.1.patch @@ -1,55 +1,45 @@ -From 5d277737eef98b4c5913bb5a29c16776c82c5d7c Mon Sep 17 00:00:00 2001 +From 968a11158031d5d51e63f18cf4cddea7ae23177f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch -Date: Tue, 23 Jun 2015 16:19:51 +0200 +Date: Tue, 23 Jun 2015 16:43:51 +0200 Subject: [PATCH] Fixed build against wayland 1.2.1 Wayland 1.2.1 still lacks definition of WL_SHM_FORMAT_RGB565 format. - -Signed-off-by: Stefan Dirsch - --- - src/egl/drivers/dri2/platform_wayland.c | 8 ++++++++ - 1 file changed, 8 insertions(+) + src/egl/drivers/dri2/platform_wayland.c | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c -index ea2f9f2..ee2b324 100644 +index ea2f9f2..4351e08 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c -@@ -1236,9 +1236,11 @@ dri2_initialize_wayland_drm(_EGLDriver *drv, _EGLDisplay *disp) +@@ -1236,9 +1236,6 @@ dri2_initialize_wayland_drm(_EGLDriver *drv, _EGLDisplay *disp) static int dri2_wl_swrast_get_stride_for_format(int format, int w) { -+#ifdef WL_SHM_FORMAT_RGB565 - if (format == WL_SHM_FORMAT_RGB565) - return 2 * w; - else /* ARGB8888 || XRGB8888 */ -+#endif +- if (format == WL_SHM_FORMAT_RGB565) +- return 2 * w; +- else /* ARGB8888 || XRGB8888 */ return 4 * w; } -@@ -1672,9 +1674,13 @@ dri2_wl_swrast_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, +@@ -1672,9 +1669,7 @@ dri2_wl_swrast_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, if (!_eglInitSurface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf, attrib_list)) goto cleanup_surf; -+#ifdef WL_SHM_FORMAT_RGB565 - if (conf->RedSize == 5) - dri2_surf->format = WL_SHM_FORMAT_RGB565; - else if (conf->AlphaSize == 0) -+#else +- if (conf->RedSize == 5) +- dri2_surf->format = WL_SHM_FORMAT_RGB565; +- else if (conf->AlphaSize == 0) + if (conf->AlphaSize == 0) -+#endif dri2_surf->format = WL_SHM_FORMAT_XRGB8888; else dri2_surf->format = WL_SHM_FORMAT_ARGB8888; -@@ -1728,9 +1734,11 @@ shm_handle_format(void *data, struct wl_shm *shm, uint32_t format) +@@ -1728,9 +1723,6 @@ shm_handle_format(void *data, struct wl_shm *shm, uint32_t format) case WL_SHM_FORMAT_XRGB8888: dri2_dpy->formats |= HAS_XRGB8888; break; -+#ifdef WL_SHM_FORMAT_RGB565 - case WL_SHM_FORMAT_RGB565: - dri2_dpy->formats |= HAS_RGB565; - break; -+#endif +- case WL_SHM_FORMAT_RGB565: +- dri2_dpy->formats |= HAS_RGB565; +- break; } } From 627cb07c01572fdd74a4777f7c7523e8a6a5997df68c7ffd31976ac519e472c9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 29 Jun 2015 10:35:46 +0000 Subject: [PATCH 4/5] - Update to version 10.6.1 * This release includes core mesa and glsl patches (amonst which a Dota2 Reborn bugfix) affecting all dri drivers, nouveau specific fixes and a selection of shared-glapi commits - from build fixes, to ones ensuring that the dri modules can be loaded. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=455 --- Mesa.changes | 9 +++++++++ Mesa.spec | 4 ++-- mesa-10.6.0.tar.xz | 3 --- mesa-10.6.1.tar.xz | 3 +++ 4 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 mesa-10.6.0.tar.xz create mode 100644 mesa-10.6.1.tar.xz diff --git a/Mesa.changes b/Mesa.changes index d4a37e6..e5b2bda 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jun 29 10:09:24 UTC 2015 - sndirsch@suse.com + +- Update to version 10.6.1 + * This release includes core mesa and glsl patches (amonst which + a Dota2 Reborn bugfix) affecting all dri drivers, nouveau specific + fixes and a selection of shared-glapi commits - from build fixes, to + ones ensuring that the dri modules can be loaded. + ------------------------------------------------------------------- Tue Jun 23 14:26:17 UTC 2015 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index c5e5c25..f95444e 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -18,7 +18,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 10.6.0 +%define _version 10.6.1 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x %define gallium_loader 1 %else @@ -37,7 +37,7 @@ %define with_nine 1 %endif Name: Mesa -Version: 10.6.0 +Version: 10.6.1 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT diff --git a/mesa-10.6.0.tar.xz b/mesa-10.6.0.tar.xz deleted file mode 100644 index 99e350e..0000000 --- a/mesa-10.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f37e2633978deed02ff0522abc36c709586e2b555fd439a82ab71dce2c866c76 -size 7032132 diff --git a/mesa-10.6.1.tar.xz b/mesa-10.6.1.tar.xz new file mode 100644 index 0000000..8d5a9aa --- /dev/null +++ b/mesa-10.6.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c80a2b647e57c85dc36e609d9aed17f878f0d8e0cf9ace86d14cf604101e1eb +size 7035216 From ff2936a7e780fe710cfc661b8488b9dbbc3cac746de371e3873b148ead55b732 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 29 Jun 2015 14:20:13 +0000 Subject: [PATCH 5/5] Accepting request 314399 from home:mimi_vx:branches:X11:XOrg - adjust libdrm dependencies OBS-URL: https://build.opensuse.org/request/show/314399 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=456 --- Mesa.changes | 5 +++++ Mesa.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index e5b2bda..4022c0c 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 29 14:13:43 UTC 2015 - mimi.vx@gmail.com + +- adjust libdrm dependencies + ------------------------------------------------------------------- Mon Jun 29 10:09:24 UTC 2015 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index f95444e..761611c 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -74,7 +74,7 @@ BuildRequires: python-xml BuildRequires: pkgconfig(dri2proto) BuildRequires: pkgconfig(dri3proto) BuildRequires: pkgconfig(glproto) -BuildRequires: pkgconfig(libdrm) >= 2.4.30 +BuildRequires: pkgconfig(libdrm) >= 2.4.38 BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.41 BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.56 BuildRequires: pkgconfig(libkms) >= 1.0.0 @@ -109,7 +109,7 @@ BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.57 %endif %ifarch x86_64 %ix86 BuildRequires: libelf-devel -BuildRequires: pkgconfig(libdrm_intel) >= 2.4.52 +BuildRequires: pkgconfig(libdrm_intel) >= 2.4.60 %endif %if 0%{?suse_version} >= 1310 BuildRequires: pkgconfig(wayland-client)