From b8dee8542ac31782222758c46e7e178bf6318e4681e3c7405247bc628ce477db Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 19 Sep 2018 12:34:11 +0000 Subject: [PATCH 01/23] Updating link to change in openSUSE:Factory/Mesa revision 336.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=0edf486afee512a6d3b26548e8e6812d --- Mesa-drivers.changes | 95 ------------ Mesa-drivers.spec | 54 +++++-- Mesa.changes | 95 ------------ Mesa.spec | 54 +++++-- ...mark-ftruncate_res-as-MAYBE_UNUSED-i.patch | 39 ----- ...rk-total_length-as-MAYBE_UNUSED-in-g.patch | 40 ----- U_python-Fix-rich-comparisons.patch | 100 ------------- ...ey-functions-when-sorting-containers.patch | 61 -------- baselibs.conf | 8 + mesa-18.1.7.tar.xz | 3 + mesa-18.1.7.tar.xz.sha1sum | 1 + mesa-18.2.0.tar.xz | 3 - mesa-18.2.0.tar.xz.sha1sum | 1 - ...l_anv-make-scripts-python-2-3-compat.patch | 138 ++++++++++++++++++ ...py-make-the-script-python-2-3-compat.patch | 137 +++++++++++++++++ 15 files changed, 371 insertions(+), 458 deletions(-) delete mode 100644 U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch delete mode 100644 U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch delete mode 100644 U_python-Fix-rich-comparisons.patch delete mode 100644 U_python-Use-key-functions-when-sorting-containers.patch create mode 100644 mesa-18.1.7.tar.xz create mode 100644 mesa-18.1.7.tar.xz.sha1sum delete mode 100644 mesa-18.2.0.tar.xz delete mode 100644 mesa-18.2.0.tar.xz.sha1sum create mode 100644 u_intel_anv-make-scripts-python-2-3-compat.patch create mode 100644 u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 613776b..81566bd 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,98 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 11 13:28:26 UTC 2018 - sndirsch@suse.com - -- get rid of libwayland-egl1/libwayland-egl-devel completely; also - for older Leap versions - -------------------------------------------------------------------- -Mon Sep 10 13:29:24 UTC 2018 - sndirsch@suse.com - -- update to 18.2.0 - * This release consists of nearly 2200 commits from approximately - 130 developers. - * The top highlights include: - - OpenGL 4.3 on virgl. - - OpenGL 4.4 Compatibility profile on radeonsi. - - OpenGL ES 3.2 on radeonsi and virgl. - - GL_ARB_ES3_2_compatibility on radeonsi. - - GL_ARB_fragment_shader_interlock on i965. - - GL_ARB_sample_locations and GL_NV_sample_locations on nvc0 (GM200+). - - GL_ANDROID_extension_pack_es31a on radeonsi. - - GL_KHR_texture_compression_astc_ldr on radeonsi. - - GL_NV_conservative_raster and GL_NV_conservative_raster_dilate on - nvc0 (GM200+). - - GL_NV_conservative_raster_pre_snap_triangles on nvc0 (GP102+). - - multisampled images on nvc0 (GM107+) (now supported on GF100+). - * Additional features: - - ANV Extensions: - - VK_KHR_bind_memory2. - - VK_KHR_external_fence. - - VK_KHR_external_fence_capabilities. - - VK_KHR_external_semaphore. - - VK_KHR_external_semaphore_capabilities. - - VK_KHR_maintenance2. - - VK_KHR_maintenance3. - - VK_KHR_multiview. - - VK_KHR_relaxed_block_layout. - - VK_KHR_sampler_ycbcr_conversion. - - VK_KHR_8bit_storage. - - VK_KHR_create_renderpass2. - - VK_KHR_display. - - VK_KHR_display_swapchain. - - VK_KHR_external_fence_fd. - - VK_KHR_external_semaphore_fd. - - VK_KHR_get_display_properties2. - - VK_KHR_image_format_list. - - RADV Extensions: - - VK_KHR_bind_memory2. - - VK_KHR_external_fence. - - VK_KHR_external_fence_capabilities. - - VK_KHR_maintenance2. - - VK_KHR_maintenance3. - - VK_KHR_multiview. - - VK_KHR_relaxed_block_layout. - - VK_KHR_create_renderpass2. - - VK_KHR_display. - - VK_KHR_display_swapchain. - - VK_KHR_draw_indirect_count. - - VK_KHR_external_fence_fd. - - VK_KHR_get_display_properties2. - - VK_KHR_get_surface_capabilities2. - - VK_KHR_image_format_list. - - New GL extensions supported by all drivers: - - GL_OES_EGL_image_external. - - GL_OES_EGL_image_external_essl3. - - freedreno: - - GL 3.0's multisample anti-aliasing support on a5xx. - - GL_ARB_texture_multisample support on a5xx. - - GLES3.1's GS5 Packing/bitfield/conversion functions support on a5xx. - - Dynamically uniform UBO array indices. - - Packing/bitfield/conversion functions. - - Enhanced textureGather. - - GL_OES_texture_buffer. - - GL_ARB_seamless_cubemap_per_texture. - - i965: - - GL_OES_texture_view on gen8+. - - GL_EXT_texture_norm16. - - nouveau: - - GL_ARB_post_depth_coverage. - - GL_ARB_sample_locations. - - GL_EXT_texture_norm16. - - r600: - - GL_EXT_texture_norm16. - - radeonsi: - - GL_EXT_texture_norm16. - - virgl: - - GL_ARB_seamless_cubemap_per_texture. - - GL_ARB_shader_stencil_export. -- supersedes u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch, - u_intel_anv-make-scripts-python-2-3-compat.patch -- U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch, - U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch, - U_python-Fix-rich-comparisons.patch, - U_python-Use-key-functions-when-sorting-containers.patch - * buildfixes ... - ------------------------------------------------------------------- Mon Aug 27 12:07:28 UTC 2018 - sndirsch@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 16115d8..8286b1a 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.2.0 +%define _version 18.1.7 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -112,7 +112,7 @@ %endif Name: Mesa-drivers -Version: 18.2.0 +Version: 18.1.7 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -135,14 +135,11 @@ Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch # currently needed for libglvnd support Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch # Upstream +Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch +Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch Patch48: mako_4_radv.patch -Patch50: U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch -Patch51: U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch -Patch52: U_python-Fix-rich-comparisons.patch -Patch53: U_python-Use-key-functions-when-sorting-containers.patch - BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: fdupes @@ -181,7 +178,6 @@ BuildRequires: pkgconfig(xcb-present) BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xshmfence) BuildRequires: pkgconfig(xvmc) BuildRequires: pkgconfig(xxf86vm) @@ -278,6 +274,9 @@ Provides: s2tc-devel = %{version} Obsoletes: s2tc-devel < %{version} Provides: libtxc_dxtn-devel = %{version} Obsoletes: libtxc_dxtn-devel < %{version} +%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) +Requires: libwayland-egl-devel +%endif %description devel Mesa is a 3-D graphics library with an API which is very similar to @@ -575,6 +574,24 @@ openwfd. This package provides the development environment for compiling programs against the GBM library. +%package -n libwayland-egl1 +Summary: Additional egl functions for wayland +Group: System/Libraries + +%description -n libwayland-egl1 +This package provides additional functions for egl-using programs +that run within the wayland framework. This allows for applications +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++ +Requires: libwayland-egl1 = %{version} + +%description -n libwayland-egl-devel +This package is required to link wayland client applications to the EGL +implementation of Mesa. + %package -n Mesa-libd3d Summary: Mesa Direct3D9 state tracker # Manually provide d3d library (bnc#918294) @@ -727,12 +744,10 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch31 -p1 %endif +%patch43 -p1 +%patch44 -p1 %patch47 -p1 %patch48 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -831,9 +846,11 @@ make %{?_smp_mflags} V=1 %make_install find %{buildroot} -type f -name "*.la" -delete -print +%if !(0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}))) # libwayland-egl is provided by wayland itself rm -f %{buildroot}/%{_libdir}/libwayland-egl.so* rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc +%endif %if %{drivers} # Delete things that we do not package in the Mesa-drivers variant, but can @@ -924,6 +941,10 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %postun libglapi0 -p /sbin/ldconfig +%post -n libwayland-egl1 -p /sbin/ldconfig + +%postun -n libwayland-egl1 -p /sbin/ldconfig + %post -n Mesa-libd3d -p /sbin/ldconfig %postun -n Mesa-libd3d -p /sbin/ldconfig @@ -1008,6 +1029,15 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/libOSMesa.so %{_libdir}/pkgconfig/osmesa.pc +%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) +%files -n libwayland-egl1 +%{_libdir}/libwayland-egl.so.1* + +%files -n libwayland-egl-devel +%{_libdir}/libwayland-egl.so +%{_libdir}/pkgconfig/wayland-egl.pc +%endif + %files -n libgbm1 %{_libdir}/libgbm.so.1* diff --git a/Mesa.changes b/Mesa.changes index 613776b..81566bd 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,98 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 11 13:28:26 UTC 2018 - sndirsch@suse.com - -- get rid of libwayland-egl1/libwayland-egl-devel completely; also - for older Leap versions - -------------------------------------------------------------------- -Mon Sep 10 13:29:24 UTC 2018 - sndirsch@suse.com - -- update to 18.2.0 - * This release consists of nearly 2200 commits from approximately - 130 developers. - * The top highlights include: - - OpenGL 4.3 on virgl. - - OpenGL 4.4 Compatibility profile on radeonsi. - - OpenGL ES 3.2 on radeonsi and virgl. - - GL_ARB_ES3_2_compatibility on radeonsi. - - GL_ARB_fragment_shader_interlock on i965. - - GL_ARB_sample_locations and GL_NV_sample_locations on nvc0 (GM200+). - - GL_ANDROID_extension_pack_es31a on radeonsi. - - GL_KHR_texture_compression_astc_ldr on radeonsi. - - GL_NV_conservative_raster and GL_NV_conservative_raster_dilate on - nvc0 (GM200+). - - GL_NV_conservative_raster_pre_snap_triangles on nvc0 (GP102+). - - multisampled images on nvc0 (GM107+) (now supported on GF100+). - * Additional features: - - ANV Extensions: - - VK_KHR_bind_memory2. - - VK_KHR_external_fence. - - VK_KHR_external_fence_capabilities. - - VK_KHR_external_semaphore. - - VK_KHR_external_semaphore_capabilities. - - VK_KHR_maintenance2. - - VK_KHR_maintenance3. - - VK_KHR_multiview. - - VK_KHR_relaxed_block_layout. - - VK_KHR_sampler_ycbcr_conversion. - - VK_KHR_8bit_storage. - - VK_KHR_create_renderpass2. - - VK_KHR_display. - - VK_KHR_display_swapchain. - - VK_KHR_external_fence_fd. - - VK_KHR_external_semaphore_fd. - - VK_KHR_get_display_properties2. - - VK_KHR_image_format_list. - - RADV Extensions: - - VK_KHR_bind_memory2. - - VK_KHR_external_fence. - - VK_KHR_external_fence_capabilities. - - VK_KHR_maintenance2. - - VK_KHR_maintenance3. - - VK_KHR_multiview. - - VK_KHR_relaxed_block_layout. - - VK_KHR_create_renderpass2. - - VK_KHR_display. - - VK_KHR_display_swapchain. - - VK_KHR_draw_indirect_count. - - VK_KHR_external_fence_fd. - - VK_KHR_get_display_properties2. - - VK_KHR_get_surface_capabilities2. - - VK_KHR_image_format_list. - - New GL extensions supported by all drivers: - - GL_OES_EGL_image_external. - - GL_OES_EGL_image_external_essl3. - - freedreno: - - GL 3.0's multisample anti-aliasing support on a5xx. - - GL_ARB_texture_multisample support on a5xx. - - GLES3.1's GS5 Packing/bitfield/conversion functions support on a5xx. - - Dynamically uniform UBO array indices. - - Packing/bitfield/conversion functions. - - Enhanced textureGather. - - GL_OES_texture_buffer. - - GL_ARB_seamless_cubemap_per_texture. - - i965: - - GL_OES_texture_view on gen8+. - - GL_EXT_texture_norm16. - - nouveau: - - GL_ARB_post_depth_coverage. - - GL_ARB_sample_locations. - - GL_EXT_texture_norm16. - - r600: - - GL_EXT_texture_norm16. - - radeonsi: - - GL_EXT_texture_norm16. - - virgl: - - GL_ARB_seamless_cubemap_per_texture. - - GL_ARB_shader_stencil_export. -- supersedes u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch, - u_intel_anv-make-scripts-python-2-3-compat.patch -- U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch, - U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch, - U_python-Fix-rich-comparisons.patch, - U_python-Use-key-functions-when-sorting-containers.patch - * buildfixes ... - ------------------------------------------------------------------- Mon Aug 27 12:07:28 UTC 2018 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index d67d17a..3d0cc35 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.2.0 +%define _version 18.1.7 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -111,7 +111,7 @@ %endif Name: Mesa -Version: 18.2.0 +Version: 18.1.7 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -134,14 +134,11 @@ Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch # currently needed for libglvnd support Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch # Upstream +Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch +Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch Patch48: mako_4_radv.patch -Patch50: U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch -Patch51: U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch -Patch52: U_python-Fix-rich-comparisons.patch -Patch53: U_python-Use-key-functions-when-sorting-containers.patch - BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: fdupes @@ -180,7 +177,6 @@ BuildRequires: pkgconfig(xcb-present) BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xshmfence) BuildRequires: pkgconfig(xvmc) BuildRequires: pkgconfig(xxf86vm) @@ -277,6 +273,9 @@ Provides: s2tc-devel = %{version} Obsoletes: s2tc-devel < %{version} Provides: libtxc_dxtn-devel = %{version} Obsoletes: libtxc_dxtn-devel < %{version} +%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) +Requires: libwayland-egl-devel +%endif %description devel Mesa is a 3-D graphics library with an API which is very similar to @@ -574,6 +573,24 @@ openwfd. This package provides the development environment for compiling programs against the GBM library. +%package -n libwayland-egl1 +Summary: Additional egl functions for wayland +Group: System/Libraries + +%description -n libwayland-egl1 +This package provides additional functions for egl-using programs +that run within the wayland framework. This allows for applications +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++ +Requires: libwayland-egl1 = %{version} + +%description -n libwayland-egl-devel +This package is required to link wayland client applications to the EGL +implementation of Mesa. + %package -n Mesa-libd3d Summary: Mesa Direct3D9 state tracker # Manually provide d3d library (bnc#918294) @@ -726,12 +743,10 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch31 -p1 %endif +%patch43 -p1 +%patch44 -p1 %patch47 -p1 %patch48 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -830,9 +845,11 @@ make %{?_smp_mflags} V=1 %make_install find %{buildroot} -type f -name "*.la" -delete -print +%if !(0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}))) # libwayland-egl is provided by wayland itself rm -f %{buildroot}/%{_libdir}/libwayland-egl.so* rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc +%endif %if %{drivers} # Delete things that we do not package in the Mesa-drivers variant, but can @@ -923,6 +940,10 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %postun libglapi0 -p /sbin/ldconfig +%post -n libwayland-egl1 -p /sbin/ldconfig + +%postun -n libwayland-egl1 -p /sbin/ldconfig + %post -n Mesa-libd3d -p /sbin/ldconfig %postun -n Mesa-libd3d -p /sbin/ldconfig @@ -1007,6 +1028,15 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/libOSMesa.so %{_libdir}/pkgconfig/osmesa.pc +%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) +%files -n libwayland-egl1 +%{_libdir}/libwayland-egl.so.1* + +%files -n libwayland-egl-devel +%{_libdir}/libwayland-egl.so +%{_libdir}/pkgconfig/wayland-egl.pc +%endif + %files -n libgbm1 %{_libdir}/libgbm.so.1* diff --git a/U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch b/U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch deleted file mode 100644 index 78ed768..0000000 --- a/U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ccdefbb559a60c2560118d253a9eaeffd1e94eb6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= -Date: Sat, 18 Aug 2018 13:16:11 +0200 -Subject: [PATCH] intel: aubinator: mark ftruncate_res as MAYBE_UNUSED in - ensure_phys_mem -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Only used, when asserts are enabled. - -Fixes an unused-variable warning with GCC 8: - ../../../src/intel/tools/aubinator.c: In function 'ensure_phys_mem': - ../../../src/intel/tools/aubinator.c:209:11: warning: unused variable 'ftruncate_res' [-Wunused-variable] - int ftruncate_res = ftruncate(mem_fd, mem_fd_len += 4096); - ^~~~~~~~~~~~~ - -Signed-off-by: Kai Wasserbäch -Reviewed-by: Lionel Landwerlin ---- - src/intel/tools/aubinator.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/intel/tools/aubinator.c b/src/intel/tools/aubinator.c -index 9a3b1d1ef1..66a7db1043 100644 ---- a/src/intel/tools/aubinator.c -+++ b/src/intel/tools/aubinator.c -@@ -206,7 +206,7 @@ ensure_phys_mem(uint64_t phys_addr) - new_mem->phys_addr = phys_addr; - new_mem->fd_offset = mem_fd_len; - -- int ftruncate_res = ftruncate(mem_fd, mem_fd_len += 4096); -+ MAYBE_UNUSED int ftruncate_res = ftruncate(mem_fd, mem_fd_len += 4096); - assert(ftruncate_res == 0); - - new_mem->data = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, --- -2.16.4 - diff --git a/U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch b/U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch deleted file mode 100644 index 4e380fe..0000000 --- a/U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5fab32ddad8b32c4a05517c43623653f8634c4d9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= -Date: Sat, 18 Aug 2018 13:16:15 +0200 -Subject: [PATCH] intel/decoder: mark total_length as MAYBE_UNUSED in - gen_spec_load -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Only used, when asserts are enabled. - -Fixes an unused-variable warning with GCC 8: - ../../../src/intel/common/gen_decoder.c: In function 'gen_spec_load': - ../../../src/intel/common/gen_decoder.c:535:47: warning: variable 'total_length' set but not used [-Wunused-but-set-variable] - uint32_t text_offset = 0, text_length = 0, total_length; - ^~~~~~~~~~~~ - -Signed-off-by: Kai Wasserbäch -Reviewed-by: Lionel Landwerlin ---- - src/intel/common/gen_decoder.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/gen_decoder.c -index ec0a486b10..c14c23aad1 100644 ---- a/src/intel/common/gen_decoder.c -+++ b/src/intel/common/gen_decoder.c -@@ -532,7 +532,8 @@ gen_spec_load(const struct gen_device_info *devinfo) - struct parser_context ctx; - void *buf; - uint8_t *text_data = NULL; -- uint32_t text_offset = 0, text_length = 0, total_length; -+ uint32_t text_offset = 0, text_length = 0; -+ MAYBE_UNUSED uint32_t total_length; - uint32_t gen_10 = devinfo_to_gen(devinfo); - - for (int i = 0; i < ARRAY_SIZE(genxml_files_table); i++) { --- -2.16.4 - diff --git a/U_python-Fix-rich-comparisons.patch b/U_python-Fix-rich-comparisons.patch deleted file mode 100644 index 0132dd4..0000000 --- a/U_python-Fix-rich-comparisons.patch +++ /dev/null @@ -1,100 +0,0 @@ -From e1b88aee680bbdadd283b4a26db74672bb130df5 Mon Sep 17 00:00:00 2001 -From: Mathieu Bridon -Date: Tue, 17 Jul 2018 22:57:39 +0200 -Subject: [PATCH] python: Fix rich comparisons - -Python 3 doesn't call objects __cmp__() methods any more to compare -them. Instead, it requires implementing the rich comparison methods -explicitly: __eq__(), __ne(), __lt__(), __le__(), __gt__() and __ge__(). - -Fortunately Python 2 also supports those. - -This commit only implements the comparison methods which are actually -used by the build scripts. - -Signed-off-by: Mathieu Bridon -Reviewed-by: Dylan Baker ---- - src/amd/vulkan/radv_extensions.py | 5 +++-- - src/intel/vulkan/anv_extensions.py | 5 +++-- - src/mapi/mapi_abi.py | 15 +++++++-------- - 3 files changed, 13 insertions(+), 12 deletions(-) - -diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py -index 15d29becfd..8b5eee867a 100644 ---- a/src/amd/vulkan/radv_extensions.py -+++ b/src/amd/vulkan/radv_extensions.py -@@ -147,14 +147,15 @@ class VkVersion: - patch = self.patch if self.patch is not None else 0 - return (self.major << 22) | (self.minor << 12) | patch - -- def __cmp__(self, other): -+ def __gt__(self, other): - # If only one of them has a patch version, "ignore" it by making - # other's patch version match self. - if (self.patch is None) != (other.patch is None): - other = copy.copy(other) - other.patch = self.patch - -- return self.__int_ver().__cmp__(other.__int_ver()) -+ return self.__int_ver() > other.__int_ver() -+ - - MAX_API_VERSION = VkVersion(MAX_API_VERSION) - -diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py -index cffc3e700c..9a65aed1c4 100644 ---- a/src/intel/vulkan/anv_extensions.py -+++ b/src/intel/vulkan/anv_extensions.py -@@ -160,14 +160,15 @@ class VkVersion: - patch = self.patch if self.patch is not None else 0 - return (self.major << 22) | (self.minor << 12) | patch - -- def __cmp__(self, other): -+ def __gt__(self, other): - # If only one of them has a patch version, "ignore" it by making - # other's patch version match self. - if (self.patch is None) != (other.patch is None): - other = copy.copy(other) - other.patch = self.patch - -- return self.__int_ver().__cmp__(other.__int_ver()) -+ return self.__int_ver() > other.__int_ver() -+ - - - MAX_API_VERSION = VkVersion('0.0.0') -diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py -index be1d15d922..e4ce2b6caf 100644 ---- a/src/mapi/mapi_abi.py -+++ b/src/mapi/mapi_abi.py -@@ -121,19 +121,18 @@ class ABIEntry(object): - def __str__(self): - return self.c_prototype() - -- def __cmp__(self, other): -+ def __lt__(self, other): - # compare slot, alias, and then name -- res = cmp(self.slot, other.slot) -- if not res: -+ if self.slot == other.slot: - if not self.alias: -- res = -1 -+ return True - elif not other.alias: -- res = 1 -+ return False - -- if not res: -- res = cmp(self.name, other.name) -+ return self.name < other.name -+ -+ return self.slot < other.slot - -- return res - - def abi_parse_xml(xml): - """Parse a GLAPI XML file for ABI entries.""" --- -2.16.4 - diff --git a/U_python-Use-key-functions-when-sorting-containers.patch b/U_python-Use-key-functions-when-sorting-containers.patch deleted file mode 100644 index ce33f30..0000000 --- a/U_python-Use-key-functions-when-sorting-containers.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 8d3ff6244c7cc5a8399afcf0d1d98d7fd8148452 Mon Sep 17 00:00:00 2001 -From: Mathieu Bridon -Date: Thu, 9 Aug 2018 10:27:23 +0200 -Subject: [PATCH] python: Use key-functions when sorting containers - -In Python 2, the traditional way to sort containers was to use a -comparison function (which returned either -1, 0 or 1 when passed two -objects) and pass that as the "cmp" argument to the container's sort() -method. - -Python 2.4 introduced key-functions, which instead only operate on a -given item, and return a sorting key for this item. - -In general, this runs faster, because the cmp-function has to get run -multiple times for each item of the container. - -Python 3 removed the cmp-function, enforcing usage of key-functions -instead. - -This change makes the script compatible with Python 2 and Python 3. - -Signed-off-by: Mathieu Bridon -Reviewed-by: Eric Engestrom -Reviewed-by: Dylan Baker ---- - src/mapi/mapi_abi.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py -index e4ce2b6caf..d4c48ec430 100644 ---- a/src/mapi/mapi_abi.py -+++ b/src/mapi/mapi_abi.py -@@ -32,6 +32,7 @@ import os - GLAPI = os.path.join(".", os.path.dirname(sys.argv[0]), "glapi/gen") - sys.path.append(GLAPI) - -+from operator import attrgetter - import re - from optparse import OptionParser - import gl_XML -@@ -291,7 +292,7 @@ class ABIPrinter(object): - - # sort entries by their names - self.entries_sorted_by_names = self.entries[:] -- self.entries_sorted_by_names.sort(lambda x, y: cmp(x.name, y.name)) -+ self.entries_sorted_by_names.sort(key=attrgetter('name')) - - self.indent = ' ' * 3 - self.noop_warn = 'noop_warn' -@@ -441,7 +442,7 @@ class ABIPrinter(object): - """Return the string pool for use by stubs.""" - # sort entries by their names - sorted_entries = self.entries[:] -- sorted_entries.sort(lambda x, y: cmp(x.name, y.name)) -+ sorted_entries.sort(key=attrgetter('name')) - - pool = [] - offsets = {} --- -2.16.4 - diff --git a/baselibs.conf b/baselibs.conf index f90a933..7f07edd 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -23,6 +23,7 @@ Mesa-devel requires "Mesa-libglapi-devel- = " requires "libOSMesa-devel- = " requires "libgbm-devel- = " + requires "libwayland-egl-devel- = " requires "libglvnd-devel- >= 0.1.0" obsoletes "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" provides "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" @@ -62,6 +63,12 @@ libOSMesa-devel libgbm1 libgbm-devel requires "libgbm1- = " +libwayland-egl-devel + targetarch aarch64 requires "libwayland-egl1- = " + targetarch ppc64 requires "libwayland-egl1- = " + targetarch ppc64le requires "libwayland-egl1- = " + targetarch s390x requires "libwayland-egl1- = " + targetarch x86_64 requires "libwayland-egl1- = " Mesa-libglapi0 Mesa-libglapi-devel requires "Mesa-libglapi0- = " @@ -98,6 +105,7 @@ libvdpau_nouveau libvdpau_r300 libvdpau_r600 libvdpau_radeonsi +libwayland-egl1 Mesa-dri-vc4 Mesa-dri-nouveau Mesa-dri diff --git a/mesa-18.1.7.tar.xz b/mesa-18.1.7.tar.xz new file mode 100644 index 0000000..c5a0690 --- /dev/null +++ b/mesa-18.1.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:655e3b32ce3bdddd5e6e8768596e5d4bdef82d0dd37067c324cc4b2daa207306 +size 11136580 diff --git a/mesa-18.1.7.tar.xz.sha1sum b/mesa-18.1.7.tar.xz.sha1sum new file mode 100644 index 0000000..aeb93b6 --- /dev/null +++ b/mesa-18.1.7.tar.xz.sha1sum @@ -0,0 +1 @@ +8f86e16a1c03665e55bc284c0e4a5b0a953bcadc mesa-18.1.7.tar.xz diff --git a/mesa-18.2.0.tar.xz b/mesa-18.2.0.tar.xz deleted file mode 100644 index 8ecc054..0000000 --- a/mesa-18.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22452bdffff8e11bf4284278155a9f77cb28d6d73a12c507f1490732d0d9ddce -size 11331164 diff --git a/mesa-18.2.0.tar.xz.sha1sum b/mesa-18.2.0.tar.xz.sha1sum deleted file mode 100644 index 6a4475a..0000000 --- a/mesa-18.2.0.tar.xz.sha1sum +++ /dev/null @@ -1 +0,0 @@ -73723d9f3815487f474d84eb91a5cd17edfb63d4 mesa-18.2.0.tar.xz diff --git a/u_intel_anv-make-scripts-python-2-3-compat.patch b/u_intel_anv-make-scripts-python-2-3-compat.patch new file mode 100644 index 0000000..854bf64 --- /dev/null +++ b/u_intel_anv-make-scripts-python-2-3-compat.patch @@ -0,0 +1,138 @@ +Index: mesa-18.1.0-rc1/src/intel/vulkan/anv_extensions.py +=================================================================== +--- mesa-18.1.0-rc1.orig/src/intel/vulkan/anv_extensions.py ++++ mesa-18.1.0-rc1/src/intel/vulkan/anv_extensions.py +@@ -29,13 +29,15 @@ import copy + import re + import xml.etree.cElementTree as et + ++ + def _bool_to_c_expr(b): + if b is True: +- return 'true'; ++ return 'true' + elif b is False: +- return 'false'; ++ return 'false' + else: +- return b; ++ return b ++ + + class Extension: + def __init__(self, name, ext_version, enable): +@@ -43,11 +45,13 @@ class Extension: + self.ext_version = int(ext_version) + self.enable = _bool_to_c_expr(enable) + ++ + class ApiVersion: + def __init__(self, max_patch_version, enable): + self.max_patch_version = max_patch_version + self.enable = _bool_to_c_expr(enable) + ++ + # Supported API versions. Each one is the maximum patch version for the given + # version. Version come in increasing order and each version is available if + # it's provided "enable" condition is true and all previous versions are +@@ -60,7 +64,7 @@ API_VERSIONS = [ + ApiVersion('1.1.0', 'device->has_syncobj_wait'), + ] + +-MAX_API_VERSION = None # Computed later ++MAX_API_VERSION = None # Computed later + + # On Android, we disable all surface and swapchain extensions. Android's Vulkan + # loader implements VK_KHR_surface and VK_KHR_swapchain, and applications +@@ -113,6 +117,7 @@ EXTENSIONS = [ + 'device->has_context_priority'), + ] + ++ + class VkVersion: + def __init__(self, string): + split = string.split('.') +@@ -146,14 +151,59 @@ class VkVersion: + patch = self.patch if self.patch is not None else 0 + return (self.major << 22) | (self.minor << 12) | patch + +- def __cmp__(self, other): ++ def __eq__(self, other): ++ # If only one of them has a patch version, "ignore" it by making ++ # other's patch version match self. ++ if (self.patch is None) != (other.patch is None): ++ other = copy.copy(other) ++ other.patch = self.patch ++ ++ return self.__int_ver() == other.__int_ver() ++ ++ def __ne__(self, other): ++ # If only one of them has a patch version, "ignore" it by making ++ # other's patch version match self. ++ if (self.patch is None) != (other.patch is None): ++ other = copy.copy(other) ++ other.patch = self.patch ++ ++ return self.__int_ver() != other.__int_ver() ++ ++ def __lt__(self, other): ++ # If only one of them has a patch version, "ignore" it by making ++ # other's patch version match self. ++ if (self.patch is None) != (other.patch is None): ++ other = copy.copy(other) ++ other.patch = self.patch ++ ++ return self.__int_ver() < other.__int_ver() ++ ++ def __le__(self, other): ++ # If only one of them has a patch version, "ignore" it by making ++ # other's patch version match self. ++ if (self.patch is None) != (other.patch is None): ++ other = copy.copy(other) ++ other.patch = self.patch ++ ++ return self.__int_ver() <= other.__int_ver() ++ ++ def __ge__(self, other): ++ # If only one of them has a patch version, "ignore" it by making ++ # other's patch version match self. ++ if (self.patch is None) != (other.patch is None): ++ other = copy.copy(other) ++ other.patch = self.patch ++ ++ return self.__int_ver() >= other.__int_ver() ++ ++ def __gt__(self, other): + # If only one of them has a patch version, "ignore" it by making + # other's patch version match self. + if (self.patch is None) != (other.patch is None): + other = copy.copy(other) + other.patch = self.patch + +- return self.__int_ver().__cmp__(other.__int_ver()) ++ return self.__int_ver() > other.__int_ver() + + + MAX_API_VERSION = VkVersion('0.0.0') +Index: mesa-18.1.0-rc1/src/intel/vulkan/anv_entrypoints_gen.py +=================================================================== +--- mesa-18.1.0-rc1.orig/src/intel/vulkan/anv_entrypoints_gen.py ++++ mesa-18.1.0-rc1/src/intel/vulkan/anv_entrypoints_gen.py +@@ -145,7 +145,7 @@ static const struct string_map_entry str + /* Hash table stats: + * size ${len(strmap.sorted_strings)} entries + * collisions entries: +-% for i in xrange(10): ++% for i in range(10): + * ${i}${'+' if i == 9 else ' '} ${strmap.collisions[i]} + % endfor + */ +@@ -507,7 +507,7 @@ def get_entrypoints(doc, entrypoints_to_ + assert e.core_version is None + e.extensions.append(ext) + +- return [e for e in entrypoints.itervalues() if e.enabled] ++ return [e for e in entrypoints.values() if e.enabled] + + + def get_entrypoints_defines(doc): diff --git a/u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch b/u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch new file mode 100644 index 0000000..b3d34d3 --- /dev/null +++ b/u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch @@ -0,0 +1,137 @@ +From 62f6252476505bf556d1ad9e7c58cf7c1c6e510c Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch +Date: Thu, 1 Mar 2018 16:38:37 +0100 +Subject: [PATCH] r600/egd_tables.py: make the script python 2+3 compatible + +Patch by "Tomas Chvatal" with modifications +by "Michal Srb" to not break python 2. + +https://bugzilla.suse.com/show_bug.cgi?id=1082303 + +v2: +- no longer try to encode a unicode +- make use of 'from __future__ import print_function', so semantics + of print statements in python2 are closer to print functions in python3 + +https://lists.freedesktop.org/archives/mesa-dev/2018-February/187056.html + +Signed-off-by: Stefan Dirsch +Reviewed-by: Tomas Chvatal +Reviewed-by: Dylan Baker +--- + src/gallium/drivers/r600/egd_tables.py | 53 +++++++++++++++++----------------- + 1 file changed, 27 insertions(+), 26 deletions(-) + +diff --git a/src/gallium/drivers/r600/egd_tables.py b/src/gallium/drivers/r600/egd_tables.py +index d7b78c7fb1..4796456330 100644 +--- a/src/gallium/drivers/r600/egd_tables.py ++++ b/src/gallium/drivers/r600/egd_tables.py +@@ -1,3 +1,4 @@ ++from __future__ import print_function + + CopyRight = ''' + /* +@@ -60,7 +61,7 @@ class StringTable: + """ + fragments = [ + '"%s\\0" /* %s */' % ( +- te[0].encode('string_escape'), ++ te[0], + ', '.join(str(idx) for idx in te[2]) + ) + for te in self.table +@@ -217,10 +218,10 @@ def write_tables(regs, packets): + strings = StringTable() + strings_offsets = IntTable("int") + +- print '/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */' +- print +- print CopyRight.strip() +- print ''' ++ print('/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */') ++ print('') ++ print(CopyRight.strip()) ++ print(''' + #ifndef EG_TABLES_H + #define EG_TABLES_H + +@@ -242,20 +243,20 @@ struct eg_packet3 { + unsigned name_offset; + unsigned op; + }; +-''' ++''') + +- print 'static const struct eg_packet3 packet3_table[] = {' ++ print('static const struct eg_packet3 packet3_table[] = {') + for pkt in packets: +- print '\t{%s, %s},' % (strings.add(pkt[5:]), pkt) +- print '};' +- print ++ print('\t{%s, %s},' % (strings.add(pkt[5:]), pkt)) ++ print('};') ++ print('') + +- print 'static const struct eg_field egd_fields_table[] = {' ++ print('static const struct eg_field egd_fields_table[] = {') + + fields_idx = 0 + for reg in regs: + if len(reg.fields) and reg.own_fields: +- print '\t/* %s */' % (fields_idx) ++ print('\t/* %s */' % (fields_idx)) + + reg.fields_idx = fields_idx + +@@ -266,34 +267,34 @@ struct eg_packet3 { + while value[1] >= len(values_offsets): + values_offsets.append(-1) + values_offsets[value[1]] = strings.add(strip_prefix(value[0])) +- print '\t{%s, %s(~0u), %s, %s},' % ( ++ print('\t{%s, %s(~0u), %s, %s},' % ( + strings.add(field.name), field.s_name, +- len(values_offsets), strings_offsets.add(values_offsets)) ++ len(values_offsets), strings_offsets.add(values_offsets))) + else: +- print '\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name) ++ print('\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name)) + fields_idx += 1 + +- print '};' +- print ++ print('};') ++ print('') + +- print 'static const struct eg_reg egd_reg_table[] = {' ++ print('static const struct eg_reg egd_reg_table[] = {') + for reg in regs: + if len(reg.fields): +- print '\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name, +- len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx) ++ print('\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name, ++ len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx)) + else: +- print '\t{%s, %s},' % (strings.add(reg.name), reg.r_name) +- print '};' +- print ++ print('\t{%s, %s},' % (strings.add(reg.name), reg.r_name)) ++ print('};') ++ print('') + + strings.emit(sys.stdout, "egd_strings") + +- print ++ print('') + + strings_offsets.emit(sys.stdout, "egd_strings_offsets") + +- print +- print '#endif' ++ print('') ++ print('#endif') + + + def main(): +-- +2.13.6 + From dbe2ec5f48a61e633d14ea3352973fbac63ef66b4a35d05c19e93370a4e3520f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sun, 23 Sep 2018 10:25:38 +0000 Subject: [PATCH 02/23] Accepting request 637103 from home:mimi_vx:branches:X11:XOrg - update to 18.2.1 * Lot of fixes for Vulkan drivers. - get rid of libwayland-egl1/libwayland-egl-devel completely; also for older Leap versions - update to 18.2.0 * This release consists of nearly 2200 commits from approximately 130 developers. * The top highlights include: - OpenGL 4.3 on virgl. - OpenGL 4.4 Compatibility profile on radeonsi. - OpenGL ES 3.2 on radeonsi and virgl. - GL_ARB_ES3_2_compatibility on radeonsi. - GL_ARB_fragment_shader_interlock on i965. - GL_ARB_sample_locations and GL_NV_sample_locations on nvc0 (GM200+). - GL_ANDROID_extension_pack_es31a on radeonsi. - GL_KHR_texture_compression_astc_ldr on radeonsi. - GL_NV_conservative_raster and GL_NV_conservative_raster_dilate on nvc0 (GM200+). - GL_NV_conservative_raster_pre_snap_triangles on nvc0 (GP102+). - multisampled images on nvc0 (GM107+) (now supported on GF100+). * Additional features: - ANV Extensions: - VK_KHR_bind_memory2. - VK_KHR_external_fence. - VK_KHR_external_fence_capabilities. - VK_KHR_external_semaphore. - VK_KHR_external_semaphore_capabilities. - VK_KHR_maintenance2. OBS-URL: https://build.opensuse.org/request/show/637103 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=774 --- Mesa-drivers.changes | 101 +++++++++++++ Mesa-drivers.spec | 56 ++----- Mesa.changes | 101 +++++++++++++ Mesa.spec | 56 ++----- ...mark-ftruncate_res-as-MAYBE_UNUSED-i.patch | 39 +++++ ...rk-total_length-as-MAYBE_UNUSED-in-g.patch | 40 +++++ U_python-Fix-rich-comparisons.patch | 100 +++++++++++++ ...ey-functions-when-sorting-containers.patch | 61 ++++++++ baselibs.conf | 8 - mesa-18.1.7.tar.xz | 3 - mesa-18.1.7.tar.xz.sha1sum | 1 - mesa-18.2.1.tar.xz | 3 + mesa-18.2.1.tar.xz.sha1sum | 1 + ...l_anv-make-scripts-python-2-3-compat.patch | 138 ------------------ ...py-make-the-script-python-2-3-compat.patch | 137 ----------------- 15 files changed, 472 insertions(+), 373 deletions(-) create mode 100644 U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch create mode 100644 U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch create mode 100644 U_python-Fix-rich-comparisons.patch create mode 100644 U_python-Use-key-functions-when-sorting-containers.patch delete mode 100644 mesa-18.1.7.tar.xz delete mode 100644 mesa-18.1.7.tar.xz.sha1sum create mode 100644 mesa-18.2.1.tar.xz create mode 100644 mesa-18.2.1.tar.xz.sha1sum delete mode 100644 u_intel_anv-make-scripts-python-2-3-compat.patch delete mode 100644 u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 81566bd..cf06963 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,104 @@ +------------------------------------------------------------------- +Fri Sep 21 20:38:47 UTC 2018 - Ondřej Súkup + +- update to 18.2.1 + * Lot of fixes for Vulkan drivers. + +------------------------------------------------------------------- +Tue Sep 11 13:28:26 UTC 2018 - sndirsch@suse.com + +- get rid of libwayland-egl1/libwayland-egl-devel completely; also + for older Leap versions + +------------------------------------------------------------------- +Mon Sep 10 13:29:24 UTC 2018 - sndirsch@suse.com + +- update to 18.2.0 + * This release consists of nearly 2200 commits from approximately + 130 developers. + * The top highlights include: + - OpenGL 4.3 on virgl. + - OpenGL 4.4 Compatibility profile on radeonsi. + - OpenGL ES 3.2 on radeonsi and virgl. + - GL_ARB_ES3_2_compatibility on radeonsi. + - GL_ARB_fragment_shader_interlock on i965. + - GL_ARB_sample_locations and GL_NV_sample_locations on nvc0 (GM200+). + - GL_ANDROID_extension_pack_es31a on radeonsi. + - GL_KHR_texture_compression_astc_ldr on radeonsi. + - GL_NV_conservative_raster and GL_NV_conservative_raster_dilate on + nvc0 (GM200+). + - GL_NV_conservative_raster_pre_snap_triangles on nvc0 (GP102+). + - multisampled images on nvc0 (GM107+) (now supported on GF100+). + * Additional features: + - ANV Extensions: + - VK_KHR_bind_memory2. + - VK_KHR_external_fence. + - VK_KHR_external_fence_capabilities. + - VK_KHR_external_semaphore. + - VK_KHR_external_semaphore_capabilities. + - VK_KHR_maintenance2. + - VK_KHR_maintenance3. + - VK_KHR_multiview. + - VK_KHR_relaxed_block_layout. + - VK_KHR_sampler_ycbcr_conversion. + - VK_KHR_8bit_storage. + - VK_KHR_create_renderpass2. + - VK_KHR_display. + - VK_KHR_display_swapchain. + - VK_KHR_external_fence_fd. + - VK_KHR_external_semaphore_fd. + - VK_KHR_get_display_properties2. + - VK_KHR_image_format_list. + - RADV Extensions: + - VK_KHR_bind_memory2. + - VK_KHR_external_fence. + - VK_KHR_external_fence_capabilities. + - VK_KHR_maintenance2. + - VK_KHR_maintenance3. + - VK_KHR_multiview. + - VK_KHR_relaxed_block_layout. + - VK_KHR_create_renderpass2. + - VK_KHR_display. + - VK_KHR_display_swapchain. + - VK_KHR_draw_indirect_count. + - VK_KHR_external_fence_fd. + - VK_KHR_get_display_properties2. + - VK_KHR_get_surface_capabilities2. + - VK_KHR_image_format_list. + - New GL extensions supported by all drivers: + - GL_OES_EGL_image_external. + - GL_OES_EGL_image_external_essl3. + - freedreno: + - GL 3.0's multisample anti-aliasing support on a5xx. + - GL_ARB_texture_multisample support on a5xx. + - GLES3.1's GS5 Packing/bitfield/conversion functions support on a5xx. + - Dynamically uniform UBO array indices. + - Packing/bitfield/conversion functions. + - Enhanced textureGather. + - GL_OES_texture_buffer. + - GL_ARB_seamless_cubemap_per_texture. + - i965: + - GL_OES_texture_view on gen8+. + - GL_EXT_texture_norm16. + - nouveau: + - GL_ARB_post_depth_coverage. + - GL_ARB_sample_locations. + - GL_EXT_texture_norm16. + - r600: + - GL_EXT_texture_norm16. + - radeonsi: + - GL_EXT_texture_norm16. + - virgl: + - GL_ARB_seamless_cubemap_per_texture. + - GL_ARB_shader_stencil_export. +- supersedes u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch, + u_intel_anv-make-scripts-python-2-3-compat.patch +- U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch, + U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch, + U_python-Fix-rich-comparisons.patch, + U_python-Use-key-functions-when-sorting-containers.patch + * buildfixes ... + ------------------------------------------------------------------- Mon Aug 27 12:07:28 UTC 2018 - sndirsch@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 8286b1a..3e69b98 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.1.7 +%define _version 18.2.1 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -112,7 +112,7 @@ %endif Name: Mesa-drivers -Version: 18.1.7 +Version: 18.2.1 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -135,11 +135,14 @@ Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch # currently needed for libglvnd support Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch # Upstream -Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch -Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch Patch48: mako_4_radv.patch +Patch50: U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch +Patch51: U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch +Patch52: U_python-Fix-rich-comparisons.patch +Patch53: U_python-Use-key-functions-when-sorting-containers.patch + BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: fdupes @@ -178,6 +181,7 @@ BuildRequires: pkgconfig(xcb-present) BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xshmfence) BuildRequires: pkgconfig(xvmc) BuildRequires: pkgconfig(xxf86vm) @@ -274,9 +278,6 @@ Provides: s2tc-devel = %{version} Obsoletes: s2tc-devel < %{version} Provides: libtxc_dxtn-devel = %{version} Obsoletes: libtxc_dxtn-devel < %{version} -%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) -Requires: libwayland-egl-devel -%endif %description devel Mesa is a 3-D graphics library with an API which is very similar to @@ -574,24 +575,6 @@ openwfd. This package provides the development environment for compiling programs against the GBM library. -%package -n libwayland-egl1 -Summary: Additional egl functions for wayland -Group: System/Libraries - -%description -n libwayland-egl1 -This package provides additional functions for egl-using programs -that run within the wayland framework. This allows for applications -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++ -Requires: libwayland-egl1 = %{version} - -%description -n libwayland-egl-devel -This package is required to link wayland client applications to the EGL -implementation of Mesa. - %package -n Mesa-libd3d Summary: Mesa Direct3D9 state tracker # Manually provide d3d library (bnc#918294) @@ -744,10 +727,12 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch31 -p1 %endif -%patch43 -p1 -%patch44 -p1 %patch47 -p1 %patch48 -p1 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -846,11 +831,9 @@ make %{?_smp_mflags} V=1 %make_install find %{buildroot} -type f -name "*.la" -delete -print -%if !(0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}))) # libwayland-egl is provided by wayland itself rm -f %{buildroot}/%{_libdir}/libwayland-egl.so* rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc -%endif %if %{drivers} # Delete things that we do not package in the Mesa-drivers variant, but can @@ -941,10 +924,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %postun libglapi0 -p /sbin/ldconfig -%post -n libwayland-egl1 -p /sbin/ldconfig - -%postun -n libwayland-egl1 -p /sbin/ldconfig - %post -n Mesa-libd3d -p /sbin/ldconfig %postun -n Mesa-libd3d -p /sbin/ldconfig @@ -1029,15 +1008,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/libOSMesa.so %{_libdir}/pkgconfig/osmesa.pc -%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) -%files -n libwayland-egl1 -%{_libdir}/libwayland-egl.so.1* - -%files -n libwayland-egl-devel -%{_libdir}/libwayland-egl.so -%{_libdir}/pkgconfig/wayland-egl.pc -%endif - %files -n libgbm1 %{_libdir}/libgbm.so.1* diff --git a/Mesa.changes b/Mesa.changes index 81566bd..cf06963 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,104 @@ +------------------------------------------------------------------- +Fri Sep 21 20:38:47 UTC 2018 - Ondřej Súkup + +- update to 18.2.1 + * Lot of fixes for Vulkan drivers. + +------------------------------------------------------------------- +Tue Sep 11 13:28:26 UTC 2018 - sndirsch@suse.com + +- get rid of libwayland-egl1/libwayland-egl-devel completely; also + for older Leap versions + +------------------------------------------------------------------- +Mon Sep 10 13:29:24 UTC 2018 - sndirsch@suse.com + +- update to 18.2.0 + * This release consists of nearly 2200 commits from approximately + 130 developers. + * The top highlights include: + - OpenGL 4.3 on virgl. + - OpenGL 4.4 Compatibility profile on radeonsi. + - OpenGL ES 3.2 on radeonsi and virgl. + - GL_ARB_ES3_2_compatibility on radeonsi. + - GL_ARB_fragment_shader_interlock on i965. + - GL_ARB_sample_locations and GL_NV_sample_locations on nvc0 (GM200+). + - GL_ANDROID_extension_pack_es31a on radeonsi. + - GL_KHR_texture_compression_astc_ldr on radeonsi. + - GL_NV_conservative_raster and GL_NV_conservative_raster_dilate on + nvc0 (GM200+). + - GL_NV_conservative_raster_pre_snap_triangles on nvc0 (GP102+). + - multisampled images on nvc0 (GM107+) (now supported on GF100+). + * Additional features: + - ANV Extensions: + - VK_KHR_bind_memory2. + - VK_KHR_external_fence. + - VK_KHR_external_fence_capabilities. + - VK_KHR_external_semaphore. + - VK_KHR_external_semaphore_capabilities. + - VK_KHR_maintenance2. + - VK_KHR_maintenance3. + - VK_KHR_multiview. + - VK_KHR_relaxed_block_layout. + - VK_KHR_sampler_ycbcr_conversion. + - VK_KHR_8bit_storage. + - VK_KHR_create_renderpass2. + - VK_KHR_display. + - VK_KHR_display_swapchain. + - VK_KHR_external_fence_fd. + - VK_KHR_external_semaphore_fd. + - VK_KHR_get_display_properties2. + - VK_KHR_image_format_list. + - RADV Extensions: + - VK_KHR_bind_memory2. + - VK_KHR_external_fence. + - VK_KHR_external_fence_capabilities. + - VK_KHR_maintenance2. + - VK_KHR_maintenance3. + - VK_KHR_multiview. + - VK_KHR_relaxed_block_layout. + - VK_KHR_create_renderpass2. + - VK_KHR_display. + - VK_KHR_display_swapchain. + - VK_KHR_draw_indirect_count. + - VK_KHR_external_fence_fd. + - VK_KHR_get_display_properties2. + - VK_KHR_get_surface_capabilities2. + - VK_KHR_image_format_list. + - New GL extensions supported by all drivers: + - GL_OES_EGL_image_external. + - GL_OES_EGL_image_external_essl3. + - freedreno: + - GL 3.0's multisample anti-aliasing support on a5xx. + - GL_ARB_texture_multisample support on a5xx. + - GLES3.1's GS5 Packing/bitfield/conversion functions support on a5xx. + - Dynamically uniform UBO array indices. + - Packing/bitfield/conversion functions. + - Enhanced textureGather. + - GL_OES_texture_buffer. + - GL_ARB_seamless_cubemap_per_texture. + - i965: + - GL_OES_texture_view on gen8+. + - GL_EXT_texture_norm16. + - nouveau: + - GL_ARB_post_depth_coverage. + - GL_ARB_sample_locations. + - GL_EXT_texture_norm16. + - r600: + - GL_EXT_texture_norm16. + - radeonsi: + - GL_EXT_texture_norm16. + - virgl: + - GL_ARB_seamless_cubemap_per_texture. + - GL_ARB_shader_stencil_export. +- supersedes u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch, + u_intel_anv-make-scripts-python-2-3-compat.patch +- U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch, + U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch, + U_python-Fix-rich-comparisons.patch, + U_python-Use-key-functions-when-sorting-containers.patch + * buildfixes ... + ------------------------------------------------------------------- Mon Aug 27 12:07:28 UTC 2018 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 3d0cc35..deff1b0 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.1.7 +%define _version 18.2.1 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -111,7 +111,7 @@ %endif Name: Mesa -Version: 18.1.7 +Version: 18.2.1 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -134,11 +134,14 @@ Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch # currently needed for libglvnd support Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch # Upstream -Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch -Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch Patch48: mako_4_radv.patch +Patch50: U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch +Patch51: U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch +Patch52: U_python-Fix-rich-comparisons.patch +Patch53: U_python-Use-key-functions-when-sorting-containers.patch + BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: fdupes @@ -177,6 +180,7 @@ BuildRequires: pkgconfig(xcb-present) BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xshmfence) BuildRequires: pkgconfig(xvmc) BuildRequires: pkgconfig(xxf86vm) @@ -273,9 +277,6 @@ Provides: s2tc-devel = %{version} Obsoletes: s2tc-devel < %{version} Provides: libtxc_dxtn-devel = %{version} Obsoletes: libtxc_dxtn-devel < %{version} -%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) -Requires: libwayland-egl-devel -%endif %description devel Mesa is a 3-D graphics library with an API which is very similar to @@ -573,24 +574,6 @@ openwfd. This package provides the development environment for compiling programs against the GBM library. -%package -n libwayland-egl1 -Summary: Additional egl functions for wayland -Group: System/Libraries - -%description -n libwayland-egl1 -This package provides additional functions for egl-using programs -that run within the wayland framework. This allows for applications -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++ -Requires: libwayland-egl1 = %{version} - -%description -n libwayland-egl-devel -This package is required to link wayland client applications to the EGL -implementation of Mesa. - %package -n Mesa-libd3d Summary: Mesa Direct3D9 state tracker # Manually provide d3d library (bnc#918294) @@ -743,10 +726,12 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch31 -p1 %endif -%patch43 -p1 -%patch44 -p1 %patch47 -p1 %patch48 -p1 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -845,11 +830,9 @@ make %{?_smp_mflags} V=1 %make_install find %{buildroot} -type f -name "*.la" -delete -print -%if !(0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}))) # libwayland-egl is provided by wayland itself rm -f %{buildroot}/%{_libdir}/libwayland-egl.so* rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc -%endif %if %{drivers} # Delete things that we do not package in the Mesa-drivers variant, but can @@ -940,10 +923,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %postun libglapi0 -p /sbin/ldconfig -%post -n libwayland-egl1 -p /sbin/ldconfig - -%postun -n libwayland-egl1 -p /sbin/ldconfig - %post -n Mesa-libd3d -p /sbin/ldconfig %postun -n Mesa-libd3d -p /sbin/ldconfig @@ -1028,15 +1007,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/libOSMesa.so %{_libdir}/pkgconfig/osmesa.pc -%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) -%files -n libwayland-egl1 -%{_libdir}/libwayland-egl.so.1* - -%files -n libwayland-egl-devel -%{_libdir}/libwayland-egl.so -%{_libdir}/pkgconfig/wayland-egl.pc -%endif - %files -n libgbm1 %{_libdir}/libgbm.so.1* diff --git a/U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch b/U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch new file mode 100644 index 0000000..78ed768 --- /dev/null +++ b/U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch @@ -0,0 +1,39 @@ +From ccdefbb559a60c2560118d253a9eaeffd1e94eb6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= +Date: Sat, 18 Aug 2018 13:16:11 +0200 +Subject: [PATCH] intel: aubinator: mark ftruncate_res as MAYBE_UNUSED in + ensure_phys_mem +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Only used, when asserts are enabled. + +Fixes an unused-variable warning with GCC 8: + ../../../src/intel/tools/aubinator.c: In function 'ensure_phys_mem': + ../../../src/intel/tools/aubinator.c:209:11: warning: unused variable 'ftruncate_res' [-Wunused-variable] + int ftruncate_res = ftruncate(mem_fd, mem_fd_len += 4096); + ^~~~~~~~~~~~~ + +Signed-off-by: Kai Wasserbäch +Reviewed-by: Lionel Landwerlin +--- + src/intel/tools/aubinator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/intel/tools/aubinator.c b/src/intel/tools/aubinator.c +index 9a3b1d1ef1..66a7db1043 100644 +--- a/src/intel/tools/aubinator.c ++++ b/src/intel/tools/aubinator.c +@@ -206,7 +206,7 @@ ensure_phys_mem(uint64_t phys_addr) + new_mem->phys_addr = phys_addr; + new_mem->fd_offset = mem_fd_len; + +- int ftruncate_res = ftruncate(mem_fd, mem_fd_len += 4096); ++ MAYBE_UNUSED int ftruncate_res = ftruncate(mem_fd, mem_fd_len += 4096); + assert(ftruncate_res == 0); + + new_mem->data = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, +-- +2.16.4 + diff --git a/U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch b/U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch new file mode 100644 index 0000000..4e380fe --- /dev/null +++ b/U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch @@ -0,0 +1,40 @@ +From 5fab32ddad8b32c4a05517c43623653f8634c4d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= +Date: Sat, 18 Aug 2018 13:16:15 +0200 +Subject: [PATCH] intel/decoder: mark total_length as MAYBE_UNUSED in + gen_spec_load +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Only used, when asserts are enabled. + +Fixes an unused-variable warning with GCC 8: + ../../../src/intel/common/gen_decoder.c: In function 'gen_spec_load': + ../../../src/intel/common/gen_decoder.c:535:47: warning: variable 'total_length' set but not used [-Wunused-but-set-variable] + uint32_t text_offset = 0, text_length = 0, total_length; + ^~~~~~~~~~~~ + +Signed-off-by: Kai Wasserbäch +Reviewed-by: Lionel Landwerlin +--- + src/intel/common/gen_decoder.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/gen_decoder.c +index ec0a486b10..c14c23aad1 100644 +--- a/src/intel/common/gen_decoder.c ++++ b/src/intel/common/gen_decoder.c +@@ -532,7 +532,8 @@ gen_spec_load(const struct gen_device_info *devinfo) + struct parser_context ctx; + void *buf; + uint8_t *text_data = NULL; +- uint32_t text_offset = 0, text_length = 0, total_length; ++ uint32_t text_offset = 0, text_length = 0; ++ MAYBE_UNUSED uint32_t total_length; + uint32_t gen_10 = devinfo_to_gen(devinfo); + + for (int i = 0; i < ARRAY_SIZE(genxml_files_table); i++) { +-- +2.16.4 + diff --git a/U_python-Fix-rich-comparisons.patch b/U_python-Fix-rich-comparisons.patch new file mode 100644 index 0000000..0132dd4 --- /dev/null +++ b/U_python-Fix-rich-comparisons.patch @@ -0,0 +1,100 @@ +From e1b88aee680bbdadd283b4a26db74672bb130df5 Mon Sep 17 00:00:00 2001 +From: Mathieu Bridon +Date: Tue, 17 Jul 2018 22:57:39 +0200 +Subject: [PATCH] python: Fix rich comparisons + +Python 3 doesn't call objects __cmp__() methods any more to compare +them. Instead, it requires implementing the rich comparison methods +explicitly: __eq__(), __ne(), __lt__(), __le__(), __gt__() and __ge__(). + +Fortunately Python 2 also supports those. + +This commit only implements the comparison methods which are actually +used by the build scripts. + +Signed-off-by: Mathieu Bridon +Reviewed-by: Dylan Baker +--- + src/amd/vulkan/radv_extensions.py | 5 +++-- + src/intel/vulkan/anv_extensions.py | 5 +++-- + src/mapi/mapi_abi.py | 15 +++++++-------- + 3 files changed, 13 insertions(+), 12 deletions(-) + +diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py +index 15d29becfd..8b5eee867a 100644 +--- a/src/amd/vulkan/radv_extensions.py ++++ b/src/amd/vulkan/radv_extensions.py +@@ -147,14 +147,15 @@ class VkVersion: + patch = self.patch if self.patch is not None else 0 + return (self.major << 22) | (self.minor << 12) | patch + +- def __cmp__(self, other): ++ def __gt__(self, other): + # If only one of them has a patch version, "ignore" it by making + # other's patch version match self. + if (self.patch is None) != (other.patch is None): + other = copy.copy(other) + other.patch = self.patch + +- return self.__int_ver().__cmp__(other.__int_ver()) ++ return self.__int_ver() > other.__int_ver() ++ + + MAX_API_VERSION = VkVersion(MAX_API_VERSION) + +diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py +index cffc3e700c..9a65aed1c4 100644 +--- a/src/intel/vulkan/anv_extensions.py ++++ b/src/intel/vulkan/anv_extensions.py +@@ -160,14 +160,15 @@ class VkVersion: + patch = self.patch if self.patch is not None else 0 + return (self.major << 22) | (self.minor << 12) | patch + +- def __cmp__(self, other): ++ def __gt__(self, other): + # If only one of them has a patch version, "ignore" it by making + # other's patch version match self. + if (self.patch is None) != (other.patch is None): + other = copy.copy(other) + other.patch = self.patch + +- return self.__int_ver().__cmp__(other.__int_ver()) ++ return self.__int_ver() > other.__int_ver() ++ + + + MAX_API_VERSION = VkVersion('0.0.0') +diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py +index be1d15d922..e4ce2b6caf 100644 +--- a/src/mapi/mapi_abi.py ++++ b/src/mapi/mapi_abi.py +@@ -121,19 +121,18 @@ class ABIEntry(object): + def __str__(self): + return self.c_prototype() + +- def __cmp__(self, other): ++ def __lt__(self, other): + # compare slot, alias, and then name +- res = cmp(self.slot, other.slot) +- if not res: ++ if self.slot == other.slot: + if not self.alias: +- res = -1 ++ return True + elif not other.alias: +- res = 1 ++ return False + +- if not res: +- res = cmp(self.name, other.name) ++ return self.name < other.name ++ ++ return self.slot < other.slot + +- return res + + def abi_parse_xml(xml): + """Parse a GLAPI XML file for ABI entries.""" +-- +2.16.4 + diff --git a/U_python-Use-key-functions-when-sorting-containers.patch b/U_python-Use-key-functions-when-sorting-containers.patch new file mode 100644 index 0000000..ce33f30 --- /dev/null +++ b/U_python-Use-key-functions-when-sorting-containers.patch @@ -0,0 +1,61 @@ +From 8d3ff6244c7cc5a8399afcf0d1d98d7fd8148452 Mon Sep 17 00:00:00 2001 +From: Mathieu Bridon +Date: Thu, 9 Aug 2018 10:27:23 +0200 +Subject: [PATCH] python: Use key-functions when sorting containers + +In Python 2, the traditional way to sort containers was to use a +comparison function (which returned either -1, 0 or 1 when passed two +objects) and pass that as the "cmp" argument to the container's sort() +method. + +Python 2.4 introduced key-functions, which instead only operate on a +given item, and return a sorting key for this item. + +In general, this runs faster, because the cmp-function has to get run +multiple times for each item of the container. + +Python 3 removed the cmp-function, enforcing usage of key-functions +instead. + +This change makes the script compatible with Python 2 and Python 3. + +Signed-off-by: Mathieu Bridon +Reviewed-by: Eric Engestrom +Reviewed-by: Dylan Baker +--- + src/mapi/mapi_abi.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py +index e4ce2b6caf..d4c48ec430 100644 +--- a/src/mapi/mapi_abi.py ++++ b/src/mapi/mapi_abi.py +@@ -32,6 +32,7 @@ import os + GLAPI = os.path.join(".", os.path.dirname(sys.argv[0]), "glapi/gen") + sys.path.append(GLAPI) + ++from operator import attrgetter + import re + from optparse import OptionParser + import gl_XML +@@ -291,7 +292,7 @@ class ABIPrinter(object): + + # sort entries by their names + self.entries_sorted_by_names = self.entries[:] +- self.entries_sorted_by_names.sort(lambda x, y: cmp(x.name, y.name)) ++ self.entries_sorted_by_names.sort(key=attrgetter('name')) + + self.indent = ' ' * 3 + self.noop_warn = 'noop_warn' +@@ -441,7 +442,7 @@ class ABIPrinter(object): + """Return the string pool for use by stubs.""" + # sort entries by their names + sorted_entries = self.entries[:] +- sorted_entries.sort(lambda x, y: cmp(x.name, y.name)) ++ sorted_entries.sort(key=attrgetter('name')) + + pool = [] + offsets = {} +-- +2.16.4 + diff --git a/baselibs.conf b/baselibs.conf index 7f07edd..f90a933 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -23,7 +23,6 @@ Mesa-devel requires "Mesa-libglapi-devel- = " requires "libOSMesa-devel- = " requires "libgbm-devel- = " - requires "libwayland-egl-devel- = " requires "libglvnd-devel- >= 0.1.0" obsoletes "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" provides "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" @@ -63,12 +62,6 @@ libOSMesa-devel libgbm1 libgbm-devel requires "libgbm1- = " -libwayland-egl-devel - targetarch aarch64 requires "libwayland-egl1- = " - targetarch ppc64 requires "libwayland-egl1- = " - targetarch ppc64le requires "libwayland-egl1- = " - targetarch s390x requires "libwayland-egl1- = " - targetarch x86_64 requires "libwayland-egl1- = " Mesa-libglapi0 Mesa-libglapi-devel requires "Mesa-libglapi0- = " @@ -105,7 +98,6 @@ libvdpau_nouveau libvdpau_r300 libvdpau_r600 libvdpau_radeonsi -libwayland-egl1 Mesa-dri-vc4 Mesa-dri-nouveau Mesa-dri diff --git a/mesa-18.1.7.tar.xz b/mesa-18.1.7.tar.xz deleted file mode 100644 index c5a0690..0000000 --- a/mesa-18.1.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:655e3b32ce3bdddd5e6e8768596e5d4bdef82d0dd37067c324cc4b2daa207306 -size 11136580 diff --git a/mesa-18.1.7.tar.xz.sha1sum b/mesa-18.1.7.tar.xz.sha1sum deleted file mode 100644 index aeb93b6..0000000 --- a/mesa-18.1.7.tar.xz.sha1sum +++ /dev/null @@ -1 +0,0 @@ -8f86e16a1c03665e55bc284c0e4a5b0a953bcadc mesa-18.1.7.tar.xz diff --git a/mesa-18.2.1.tar.xz b/mesa-18.2.1.tar.xz new file mode 100644 index 0000000..4de5920 --- /dev/null +++ b/mesa-18.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9636dc6f3d188abdcca02da97cedd73640d9035224efd5db724187d062c81056 +size 11374476 diff --git a/mesa-18.2.1.tar.xz.sha1sum b/mesa-18.2.1.tar.xz.sha1sum new file mode 100644 index 0000000..ea7256a --- /dev/null +++ b/mesa-18.2.1.tar.xz.sha1sum @@ -0,0 +1 @@ +cfcaf550ab0915033bd27cc7a5968764510dbfc1 mesa-18.2.1.tar.xz diff --git a/u_intel_anv-make-scripts-python-2-3-compat.patch b/u_intel_anv-make-scripts-python-2-3-compat.patch deleted file mode 100644 index 854bf64..0000000 --- a/u_intel_anv-make-scripts-python-2-3-compat.patch +++ /dev/null @@ -1,138 +0,0 @@ -Index: mesa-18.1.0-rc1/src/intel/vulkan/anv_extensions.py -=================================================================== ---- mesa-18.1.0-rc1.orig/src/intel/vulkan/anv_extensions.py -+++ mesa-18.1.0-rc1/src/intel/vulkan/anv_extensions.py -@@ -29,13 +29,15 @@ import copy - import re - import xml.etree.cElementTree as et - -+ - def _bool_to_c_expr(b): - if b is True: -- return 'true'; -+ return 'true' - elif b is False: -- return 'false'; -+ return 'false' - else: -- return b; -+ return b -+ - - class Extension: - def __init__(self, name, ext_version, enable): -@@ -43,11 +45,13 @@ class Extension: - self.ext_version = int(ext_version) - self.enable = _bool_to_c_expr(enable) - -+ - class ApiVersion: - def __init__(self, max_patch_version, enable): - self.max_patch_version = max_patch_version - self.enable = _bool_to_c_expr(enable) - -+ - # Supported API versions. Each one is the maximum patch version for the given - # version. Version come in increasing order and each version is available if - # it's provided "enable" condition is true and all previous versions are -@@ -60,7 +64,7 @@ API_VERSIONS = [ - ApiVersion('1.1.0', 'device->has_syncobj_wait'), - ] - --MAX_API_VERSION = None # Computed later -+MAX_API_VERSION = None # Computed later - - # On Android, we disable all surface and swapchain extensions. Android's Vulkan - # loader implements VK_KHR_surface and VK_KHR_swapchain, and applications -@@ -113,6 +117,7 @@ EXTENSIONS = [ - 'device->has_context_priority'), - ] - -+ - class VkVersion: - def __init__(self, string): - split = string.split('.') -@@ -146,14 +151,59 @@ class VkVersion: - patch = self.patch if self.patch is not None else 0 - return (self.major << 22) | (self.minor << 12) | patch - -- def __cmp__(self, other): -+ def __eq__(self, other): -+ # If only one of them has a patch version, "ignore" it by making -+ # other's patch version match self. -+ if (self.patch is None) != (other.patch is None): -+ other = copy.copy(other) -+ other.patch = self.patch -+ -+ return self.__int_ver() == other.__int_ver() -+ -+ def __ne__(self, other): -+ # If only one of them has a patch version, "ignore" it by making -+ # other's patch version match self. -+ if (self.patch is None) != (other.patch is None): -+ other = copy.copy(other) -+ other.patch = self.patch -+ -+ return self.__int_ver() != other.__int_ver() -+ -+ def __lt__(self, other): -+ # If only one of them has a patch version, "ignore" it by making -+ # other's patch version match self. -+ if (self.patch is None) != (other.patch is None): -+ other = copy.copy(other) -+ other.patch = self.patch -+ -+ return self.__int_ver() < other.__int_ver() -+ -+ def __le__(self, other): -+ # If only one of them has a patch version, "ignore" it by making -+ # other's patch version match self. -+ if (self.patch is None) != (other.patch is None): -+ other = copy.copy(other) -+ other.patch = self.patch -+ -+ return self.__int_ver() <= other.__int_ver() -+ -+ def __ge__(self, other): -+ # If only one of them has a patch version, "ignore" it by making -+ # other's patch version match self. -+ if (self.patch is None) != (other.patch is None): -+ other = copy.copy(other) -+ other.patch = self.patch -+ -+ return self.__int_ver() >= other.__int_ver() -+ -+ def __gt__(self, other): - # If only one of them has a patch version, "ignore" it by making - # other's patch version match self. - if (self.patch is None) != (other.patch is None): - other = copy.copy(other) - other.patch = self.patch - -- return self.__int_ver().__cmp__(other.__int_ver()) -+ return self.__int_ver() > other.__int_ver() - - - MAX_API_VERSION = VkVersion('0.0.0') -Index: mesa-18.1.0-rc1/src/intel/vulkan/anv_entrypoints_gen.py -=================================================================== ---- mesa-18.1.0-rc1.orig/src/intel/vulkan/anv_entrypoints_gen.py -+++ mesa-18.1.0-rc1/src/intel/vulkan/anv_entrypoints_gen.py -@@ -145,7 +145,7 @@ static const struct string_map_entry str - /* Hash table stats: - * size ${len(strmap.sorted_strings)} entries - * collisions entries: --% for i in xrange(10): -+% for i in range(10): - * ${i}${'+' if i == 9 else ' '} ${strmap.collisions[i]} - % endfor - */ -@@ -507,7 +507,7 @@ def get_entrypoints(doc, entrypoints_to_ - assert e.core_version is None - e.extensions.append(ext) - -- return [e for e in entrypoints.itervalues() if e.enabled] -+ return [e for e in entrypoints.values() if e.enabled] - - - def get_entrypoints_defines(doc): diff --git a/u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch b/u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch deleted file mode 100644 index b3d34d3..0000000 --- a/u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 62f6252476505bf556d1ad9e7c58cf7c1c6e510c Mon Sep 17 00:00:00 2001 -From: Stefan Dirsch -Date: Thu, 1 Mar 2018 16:38:37 +0100 -Subject: [PATCH] r600/egd_tables.py: make the script python 2+3 compatible - -Patch by "Tomas Chvatal" with modifications -by "Michal Srb" to not break python 2. - -https://bugzilla.suse.com/show_bug.cgi?id=1082303 - -v2: -- no longer try to encode a unicode -- make use of 'from __future__ import print_function', so semantics - of print statements in python2 are closer to print functions in python3 - -https://lists.freedesktop.org/archives/mesa-dev/2018-February/187056.html - -Signed-off-by: Stefan Dirsch -Reviewed-by: Tomas Chvatal -Reviewed-by: Dylan Baker ---- - src/gallium/drivers/r600/egd_tables.py | 53 +++++++++++++++++----------------- - 1 file changed, 27 insertions(+), 26 deletions(-) - -diff --git a/src/gallium/drivers/r600/egd_tables.py b/src/gallium/drivers/r600/egd_tables.py -index d7b78c7fb1..4796456330 100644 ---- a/src/gallium/drivers/r600/egd_tables.py -+++ b/src/gallium/drivers/r600/egd_tables.py -@@ -1,3 +1,4 @@ -+from __future__ import print_function - - CopyRight = ''' - /* -@@ -60,7 +61,7 @@ class StringTable: - """ - fragments = [ - '"%s\\0" /* %s */' % ( -- te[0].encode('string_escape'), -+ te[0], - ', '.join(str(idx) for idx in te[2]) - ) - for te in self.table -@@ -217,10 +218,10 @@ def write_tables(regs, packets): - strings = StringTable() - strings_offsets = IntTable("int") - -- print '/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */' -- print -- print CopyRight.strip() -- print ''' -+ print('/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */') -+ print('') -+ print(CopyRight.strip()) -+ print(''' - #ifndef EG_TABLES_H - #define EG_TABLES_H - -@@ -242,20 +243,20 @@ struct eg_packet3 { - unsigned name_offset; - unsigned op; - }; --''' -+''') - -- print 'static const struct eg_packet3 packet3_table[] = {' -+ print('static const struct eg_packet3 packet3_table[] = {') - for pkt in packets: -- print '\t{%s, %s},' % (strings.add(pkt[5:]), pkt) -- print '};' -- print -+ print('\t{%s, %s},' % (strings.add(pkt[5:]), pkt)) -+ print('};') -+ print('') - -- print 'static const struct eg_field egd_fields_table[] = {' -+ print('static const struct eg_field egd_fields_table[] = {') - - fields_idx = 0 - for reg in regs: - if len(reg.fields) and reg.own_fields: -- print '\t/* %s */' % (fields_idx) -+ print('\t/* %s */' % (fields_idx)) - - reg.fields_idx = fields_idx - -@@ -266,34 +267,34 @@ struct eg_packet3 { - while value[1] >= len(values_offsets): - values_offsets.append(-1) - values_offsets[value[1]] = strings.add(strip_prefix(value[0])) -- print '\t{%s, %s(~0u), %s, %s},' % ( -+ print('\t{%s, %s(~0u), %s, %s},' % ( - strings.add(field.name), field.s_name, -- len(values_offsets), strings_offsets.add(values_offsets)) -+ len(values_offsets), strings_offsets.add(values_offsets))) - else: -- print '\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name) -+ print('\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name)) - fields_idx += 1 - -- print '};' -- print -+ print('};') -+ print('') - -- print 'static const struct eg_reg egd_reg_table[] = {' -+ print('static const struct eg_reg egd_reg_table[] = {') - for reg in regs: - if len(reg.fields): -- print '\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name, -- len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx) -+ print('\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name, -+ len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx)) - else: -- print '\t{%s, %s},' % (strings.add(reg.name), reg.r_name) -- print '};' -- print -+ print('\t{%s, %s},' % (strings.add(reg.name), reg.r_name)) -+ print('};') -+ print('') - - strings.emit(sys.stdout, "egd_strings") - -- print -+ print('') - - strings_offsets.emit(sys.stdout, "egd_strings_offsets") - -- print -- print '#endif' -+ print('') -+ print('#endif') - - - def main(): --- -2.13.6 - From 2cb7f36b898cbd67f93c0ec5775017fc62996c6444f458153fb046a9aaca06b1 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sun, 7 Oct 2018 09:36:26 +0000 Subject: [PATCH 03/23] Accepting request 640131 from home:iznogood:branches:X11:XOrg New stable release OBS-URL: https://build.opensuse.org/request/show/640131 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=775 --- Mesa-drivers.changes | 18 ++++ Mesa-drivers.spec | 14 ++- Mesa.changes | 18 ++++ Mesa.keyring | 102 ++++++++++++++++++ Mesa.spec | 14 ++- mesa-18.2.1.tar.xz | 3 - mesa-18.2.1.tar.xz.sha1sum | 1 - mesa-18.2.2.tar.xz | 3 + mesa-18.2.2.tar.xz.sig | Bin 0 -> 566 bytes ...-queryDmaBufFormats-queryDmaBufModif.patch | 33 ------ 10 files changed, 153 insertions(+), 53 deletions(-) delete mode 100644 mesa-18.2.1.tar.xz delete mode 100644 mesa-18.2.1.tar.xz.sha1sum create mode 100644 mesa-18.2.2.tar.xz create mode 100644 mesa-18.2.2.tar.xz.sig delete mode 100644 u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index cf06963..7c78927 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Oct 5 19:04:01 UTC 2018 - bjorn.lie@gmail.com + +- Update to 18.2.2 + * Different patches for the DirectX9 and DRI state trackers. + * A patch to implement vkAcquireNextImage2 in the Intel and AMD + vulkan drivers, as well as a patch for adding support for + protected memory properties in GetPhysicalDeviceProperties2() + for the former driver. + * RADV also gets a patch to fix some issues with reflections in + GTA V, and a patch to fix a GPU hang in SteamVR with Vega. + * Finally, there are more fixes for Radeonsi, nvc0, vc4, and + vulkan code. +- Drop usage of sha1sum, use sig and keyring verification instead. + Following this, add key from Juan A. Suarez to keyring. +- Drop u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch + Fixed upstream. + ------------------------------------------------------------------- Fri Sep 21 20:38:47 UTC 2018 - Ondřej Súkup diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 3e69b98..af19b27 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.2.1 +%define _version 18.2.2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -112,7 +112,7 @@ %endif Name: Mesa-drivers -Version: 18.2.1 +Version: 18.2.2 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -123,8 +123,8 @@ URL: http://www.mesa3d.org # Source: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz Source: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz # Source1: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz.sig -# Source1: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz.sig -Source1: %{_name_archive}-%{_version}.tar.xz.sha1sum +Source1: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz.sig +# Source1: %%{_name_archive}-%%{_version}.tar.xz.sha1sum Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 @@ -135,7 +135,6 @@ Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch # currently needed for libglvnd support Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch # Upstream -Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch Patch48: mako_4_radv.patch Patch50: U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch @@ -727,7 +726,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch31 -p1 %endif -%patch47 -p1 %patch48 -p1 %patch50 -p1 %patch51 -p1 @@ -996,8 +994,8 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %files libGLESv3-devel %{_includedir}/GLES3 -#%_libdir/libGLESv3.so -#%_libdir/pkgconfig/glesv3.pc +#%%_libdir/libGLESv3.so +#%%_libdir/pkgconfig/glesv3.pc %files -n libOSMesa8 %{_libdir}/libOSMesa.so.8.0.0 diff --git a/Mesa.changes b/Mesa.changes index cf06963..7c78927 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Oct 5 19:04:01 UTC 2018 - bjorn.lie@gmail.com + +- Update to 18.2.2 + * Different patches for the DirectX9 and DRI state trackers. + * A patch to implement vkAcquireNextImage2 in the Intel and AMD + vulkan drivers, as well as a patch for adding support for + protected memory properties in GetPhysicalDeviceProperties2() + for the former driver. + * RADV also gets a patch to fix some issues with reflections in + GTA V, and a patch to fix a GPU hang in SteamVR with Vega. + * Finally, there are more fixes for Radeonsi, nvc0, vc4, and + vulkan code. +- Drop usage of sha1sum, use sig and keyring verification instead. + Following this, add key from Juan A. Suarez to keyring. +- Drop u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch + Fixed upstream. + ------------------------------------------------------------------- Fri Sep 21 20:38:47 UTC 2018 - Ondřej Súkup diff --git a/Mesa.keyring b/Mesa.keyring index 88815dd..05dfc68 100644 --- a/Mesa.keyring +++ b/Mesa.keyring @@ -5983,3 +5983,105 @@ c+ySywEAhp1VMo7r1mcCy5R97Eamu0ER36n4AUlWanHbNhXhzU0BAMGqQ5bzN1Wy ukC25btsJ0pEFojomfOv9LgvRTFBT7YA =rQnY -----END PGP PUBLIC KEY BLOCK----- + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +7VQeKOrR3qSFObFF0Zde+tGDvy7p +=tfFV +-----END PGP PUBLIC KEY BLOCK----- + diff --git a/Mesa.spec b/Mesa.spec index deff1b0..7bd3f9e 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.2.1 +%define _version 18.2.2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -111,7 +111,7 @@ %endif Name: Mesa -Version: 18.2.1 +Version: 18.2.2 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -122,8 +122,8 @@ URL: http://www.mesa3d.org # Source: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz Source: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz # Source1: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz.sig -# Source1: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz.sig -Source1: %{_name_archive}-%{_version}.tar.xz.sha1sum +Source1: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz.sig +# Source1: %%{_name_archive}-%%{_version}.tar.xz.sha1sum Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 @@ -134,7 +134,6 @@ Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch # currently needed for libglvnd support Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch # Upstream -Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch Patch48: mako_4_radv.patch Patch50: U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch @@ -726,7 +725,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch31 -p1 %endif -%patch47 -p1 %patch48 -p1 %patch50 -p1 %patch51 -p1 @@ -995,8 +993,8 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %files libGLESv3-devel %{_includedir}/GLES3 -#%_libdir/libGLESv3.so -#%_libdir/pkgconfig/glesv3.pc +#%%_libdir/libGLESv3.so +#%%_libdir/pkgconfig/glesv3.pc %files -n libOSMesa8 %{_libdir}/libOSMesa.so.8.0.0 diff --git a/mesa-18.2.1.tar.xz b/mesa-18.2.1.tar.xz deleted file mode 100644 index 4de5920..0000000 --- a/mesa-18.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9636dc6f3d188abdcca02da97cedd73640d9035224efd5db724187d062c81056 -size 11374476 diff --git a/mesa-18.2.1.tar.xz.sha1sum b/mesa-18.2.1.tar.xz.sha1sum deleted file mode 100644 index ea7256a..0000000 --- a/mesa-18.2.1.tar.xz.sha1sum +++ /dev/null @@ -1 +0,0 @@ -cfcaf550ab0915033bd27cc7a5968764510dbfc1 mesa-18.2.1.tar.xz diff --git a/mesa-18.2.2.tar.xz b/mesa-18.2.2.tar.xz new file mode 100644 index 0000000..3a2ce0d --- /dev/null +++ b/mesa-18.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3ba82b12a89d3d9fed2bdd96b4702dbb7ab675034650a8b1b718320daf073c4 +size 11375608 diff --git a/mesa-18.2.2.tar.xz.sig b/mesa-18.2.2.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..36407a98c90a4ada1284aeb76da1256a643779f878e27dd4d8ab27f77545e745 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j*j))b0Ew4E{(UphKLP1rr%RewUKqwsYLE6C+5@(r$898vsjiCvWi{N1R$e1< zT1f2EzquZ@EZ@?ts!;#@*M9t$ET-}!<0S}@_JZ%P zW7gAg(RPt{6`cgO<&VTuXc;> zBD$h-%Y-i4tiYZvDhC5hYq%l_`xT?IRk?g;yE?^2=v9KH0f%>x~|n8NpO2Zk-^J!%eiRCNr0yL ES$Yx~MF0Q* literal 0 HcmV?d00001 diff --git a/u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch b/u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch deleted file mode 100644 index 6aa3789..0000000 --- a/u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch +++ /dev/null @@ -1,33 +0,0 @@ -Author: Michal Srb -Subject: st/dri: don't set queryDmaBufFormats/queryDmaBufModifiers if the driver does not implement it -Patch-mainline: To be upstreamed -References: fdo#104926 - -This is equivalent to commit a65db0ad1c3, but for dri_kms_init_screen. Without -this gbm_dri_is_format_supported always returns false. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104926 ---- - src/gallium/state_trackers/dri/dri2.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c -index 415002d2cd..59740b1301 100644 ---- a/src/gallium/state_trackers/dri/dri2.c -+++ b/src/gallium/state_trackers/dri/dri2.c -@@ -2162,8 +2162,10 @@ dri_kms_init_screen(__DRIscreen * sPriv) - dri2ImageExtension.createImageFromFds = dri2_from_fds; - dri2ImageExtension.createImageFromDmaBufs = dri2_from_dma_bufs; - dri2ImageExtension.createImageFromDmaBufs2 = dri2_from_dma_bufs2; -- dri2ImageExtension.queryDmaBufFormats = dri2_query_dma_buf_formats; -- dri2ImageExtension.queryDmaBufModifiers = dri2_query_dma_buf_modifiers; -+ if (pscreen->query_dmabuf_modifiers) { -+ dri2ImageExtension.queryDmaBufFormats = dri2_query_dma_buf_formats; -+ dri2ImageExtension.queryDmaBufModifiers = dri2_query_dma_buf_modifiers; -+ } - } - - sPriv->extensions = dri_screen_extensions; --- -2.13.6 - From 91f4a178d8aa802d5a868369ac966c91663bf6af951082a61ae8be946741d6eb Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 22 Oct 2018 13:38:22 +0000 Subject: [PATCH 04/23] - Update to 18.2.3 * Different patches for the DirectX9 and DRI state trackers. * Several fixes and workarounds for different games, inlcuding RAGE, Yakuza and The Evil Within, Wolfenstein The Old Blood ARMA 3, or No Mans Sky. * A bunch of fixes for different drivers, including r600, nouveau, radeonsi, anv, radv, virgl, i965, nvc0 or nv50. Worth to mention a fix for GPU hangs in Radeonsi. * State Trackers also get different fixes and corrections. * Finally, fixes for GLSL and NIR are also in this queue. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=776 --- Mesa-drivers.changes | 14 ++++++++++++++ Mesa-drivers.spec | 6 +++--- Mesa.changes | 14 ++++++++++++++ Mesa.spec | 6 +++--- mesa-18.2.2.tar.xz | 3 --- mesa-18.2.2.tar.xz.sig | Bin 566 -> 0 bytes mesa-18.2.3.tar.xz | 3 +++ mesa-18.2.3.tar.xz.sig | Bin 0 -> 566 bytes 8 files changed, 37 insertions(+), 9 deletions(-) delete mode 100644 mesa-18.2.2.tar.xz delete mode 100644 mesa-18.2.2.tar.xz.sig create mode 100644 mesa-18.2.3.tar.xz create mode 100644 mesa-18.2.3.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 7c78927..0dd3644 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Oct 22 13:24:59 UTC 2018 - sndirsch@suse.com + +- Update to 18.2.3 + * Different patches for the DirectX9 and DRI state trackers. + * Several fixes and workarounds for different games, inlcuding + RAGE, Yakuza and The Evil Within, Wolfenstein The Old Blood + ARMA 3, or No Mans Sky. + * A bunch of fixes for different drivers, including r600, + nouveau, radeonsi, anv, radv, virgl, i965, nvc0 or nv50. + Worth to mention a fix for GPU hangs in Radeonsi. + * State Trackers also get different fixes and corrections. + * Finally, fixes for GLSL and NIR are also in this queue. + ------------------------------------------------------------------- Fri Oct 5 19:04:01 UTC 2018 - bjorn.lie@gmail.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index af19b27..ef79bf2 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.2.2 +%define _version 18.2.3 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -112,7 +112,7 @@ %endif Name: Mesa-drivers -Version: 18.2.2 +Version: 18.2.3 Release: 0 Summary: System for rendering 3-D graphics License: MIT diff --git a/Mesa.changes b/Mesa.changes index 7c78927..0dd3644 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Oct 22 13:24:59 UTC 2018 - sndirsch@suse.com + +- Update to 18.2.3 + * Different patches for the DirectX9 and DRI state trackers. + * Several fixes and workarounds for different games, inlcuding + RAGE, Yakuza and The Evil Within, Wolfenstein The Old Blood + ARMA 3, or No Mans Sky. + * A bunch of fixes for different drivers, including r600, + nouveau, radeonsi, anv, radv, virgl, i965, nvc0 or nv50. + Worth to mention a fix for GPU hangs in Radeonsi. + * State Trackers also get different fixes and corrections. + * Finally, fixes for GLSL and NIR are also in this queue. + ------------------------------------------------------------------- Fri Oct 5 19:04:01 UTC 2018 - bjorn.lie@gmail.com diff --git a/Mesa.spec b/Mesa.spec index 7bd3f9e..7177dbf 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.2.2 +%define _version 18.2.3 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -111,7 +111,7 @@ %endif Name: Mesa -Version: 18.2.2 +Version: 18.2.3 Release: 0 Summary: System for rendering 3-D graphics License: MIT diff --git a/mesa-18.2.2.tar.xz b/mesa-18.2.2.tar.xz deleted file mode 100644 index 3a2ce0d..0000000 --- a/mesa-18.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3ba82b12a89d3d9fed2bdd96b4702dbb7ab675034650a8b1b718320daf073c4 -size 11375608 diff --git a/mesa-18.2.2.tar.xz.sig b/mesa-18.2.2.tar.xz.sig deleted file mode 100644 index 36407a98c90a4ada1284aeb76da1256a643779f878e27dd4d8ab27f77545e745..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j*j))b0Ew4E{(UphKLP1rr%RewUKqwsYLE6C+5@(r$898vsjiCvWi{N1R$e1< zT1f2EzquZ@EZ@?ts!;#@*M9t$ET-}!<0S}@_JZ%P zW7gAg(RPt{6`cgO<&VTuXc;> zBD$h-%Y-i4tiYZvDhC5hYq%l_`xT?IRk?g;yE?^2=v9KH0f%>x~|n8NpO2Zk-^J!%eiRCNr0yL ES$Yx~MF0Q* diff --git a/mesa-18.2.3.tar.xz b/mesa-18.2.3.tar.xz new file mode 100644 index 0000000..675c149 --- /dev/null +++ b/mesa-18.2.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2bf83c17e1abdecb1ee81af22652e27e9aa38f963e95e60f34275cc0376304f +size 11376632 diff --git a/mesa-18.2.3.tar.xz.sig b/mesa-18.2.3.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..ec46364c466eb64b28e0af3cdcf35605a1d5d2b18acaa2a6d0dc9068852cafe9 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j*j))2OH6s6*zbTh#sXz&3)~?ToMn^P8E~^?_v0$lUNGq5clc)n1!%Y_5XixwN5;z0Aj( zmh}!wUf}P`L{l&#^`?Qp9<77LaNlB{1RJ@e9h}X=fvr8*0}2p^ EF-_4MeE Date: Fri, 26 Oct 2018 11:17:37 +0000 Subject: [PATCH 05/23] Accepting request 644832 from home:michalsrb:bug1113211:X11:XOrg - n_drirc-disable-rgb10-for-chromium-on-amd.patch * Disallow rgb10 configs for chromium with radeonsi to prevent broken colors in video. (boo#1113211) OBS-URL: https://build.opensuse.org/request/show/644832 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=777 --- Mesa-drivers.changes | 7 +++++++ Mesa-drivers.spec | 2 ++ Mesa.changes | 7 +++++++ Mesa.spec | 2 ++ n_drirc-disable-rgb10-for-chromium-on-amd.patch | 15 +++++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 n_drirc-disable-rgb10-for-chromium-on-amd.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 0dd3644..209361e 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 25 14:29:20 UTC 2018 - msrb@suse.com + +- n_drirc-disable-rgb10-for-chromium-on-amd.patch + * Disallow rgb10 configs for chromium with radeonsi to prevent + broken colors in video. (boo#1113211) + ------------------------------------------------------------------- Mon Oct 22 13:24:59 UTC 2018 - sndirsch@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index ef79bf2..dc234db 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -141,6 +141,7 @@ Patch50: U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch Patch51: U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch Patch52: U_python-Fix-rich-comparisons.patch Patch53: U_python-Use-key-functions-when-sorting-containers.patch +Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -731,6 +732,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch51 -p1 %patch52 -p1 %patch53 -p1 +%patch54 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... diff --git a/Mesa.changes b/Mesa.changes index 0dd3644..209361e 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 25 14:29:20 UTC 2018 - msrb@suse.com + +- n_drirc-disable-rgb10-for-chromium-on-amd.patch + * Disallow rgb10 configs for chromium with radeonsi to prevent + broken colors in video. (boo#1113211) + ------------------------------------------------------------------- Mon Oct 22 13:24:59 UTC 2018 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 7177dbf..57a73f7 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -140,6 +140,7 @@ Patch50: U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch Patch51: U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch Patch52: U_python-Fix-rich-comparisons.patch Patch53: U_python-Use-key-functions-when-sorting-containers.patch +Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -730,6 +731,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch51 -p1 %patch52 -p1 %patch53 -p1 +%patch54 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... diff --git a/n_drirc-disable-rgb10-for-chromium-on-amd.patch b/n_drirc-disable-rgb10-for-chromium-on-amd.patch new file mode 100644 index 0000000..a749c1e --- /dev/null +++ b/n_drirc-disable-rgb10-for-chromium-on-amd.patch @@ -0,0 +1,15 @@ +Index: mesa-18.2.3/src/util/drirc +=================================================================== +--- mesa-18.2.3.orig/src/util/drirc ++++ mesa-18.2.3/src/util/drirc +@@ -330,5 +330,10 @@ TODO: document the other workarounds. + + ++ ++ ++ ++ + + From c529d216a776b779cf75b7f0136bdc4835006f9f9d5adcca64f876dd8c9da463 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 1 Nov 2018 13:44:02 +0000 Subject: [PATCH 06/23] - Update to 18.2.4 * Different fixes for different drivers: freedreno, radeonsi, swr, anv and radv. Also there are fixes for ac, gallium, spirv and blorp. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=778 --- Mesa-drivers.changes | 8 ++++++++ Mesa-drivers.spec | 4 ++-- Mesa.changes | 8 ++++++++ Mesa.spec | 4 ++-- mesa-18.2.3.tar.xz | 3 --- mesa-18.2.3.tar.xz.sig | Bin 566 -> 0 bytes mesa-18.2.4.tar.xz | 3 +++ mesa-18.2.4.tar.xz.sig | Bin 0 -> 566 bytes 8 files changed, 23 insertions(+), 7 deletions(-) delete mode 100644 mesa-18.2.3.tar.xz delete mode 100644 mesa-18.2.3.tar.xz.sig create mode 100644 mesa-18.2.4.tar.xz create mode 100644 mesa-18.2.4.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 209361e..28a235f 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 1 13:15:49 UTC 2018 - sndirsch@suse.com + +- Update to 18.2.4 + * Different fixes for different drivers: freedreno, radeonsi, + swr, anv and radv. Also there are fixes for ac, gallium, + spirv and blorp. + ------------------------------------------------------------------- Thu Oct 25 14:29:20 UTC 2018 - msrb@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index dc234db..4dbe58f 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.2.3 +%define _version 18.2.4 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -112,7 +112,7 @@ %endif Name: Mesa-drivers -Version: 18.2.3 +Version: 18.2.4 Release: 0 Summary: System for rendering 3-D graphics License: MIT diff --git a/Mesa.changes b/Mesa.changes index 209361e..28a235f 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 1 13:15:49 UTC 2018 - sndirsch@suse.com + +- Update to 18.2.4 + * Different fixes for different drivers: freedreno, radeonsi, + swr, anv and radv. Also there are fixes for ac, gallium, + spirv and blorp. + ------------------------------------------------------------------- Thu Oct 25 14:29:20 UTC 2018 - msrb@suse.com diff --git a/Mesa.spec b/Mesa.spec index 57a73f7..0a09ccb 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.2.3 +%define _version 18.2.4 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -111,7 +111,7 @@ %endif Name: Mesa -Version: 18.2.3 +Version: 18.2.4 Release: 0 Summary: System for rendering 3-D graphics License: MIT diff --git a/mesa-18.2.3.tar.xz b/mesa-18.2.3.tar.xz deleted file mode 100644 index 675c149..0000000 --- a/mesa-18.2.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2bf83c17e1abdecb1ee81af22652e27e9aa38f963e95e60f34275cc0376304f -size 11376632 diff --git a/mesa-18.2.3.tar.xz.sig b/mesa-18.2.3.tar.xz.sig deleted file mode 100644 index ec46364c466eb64b28e0af3cdcf35605a1d5d2b18acaa2a6d0dc9068852cafe9..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j*j))2OH6s6*zbTh#sXz&3)~?ToMn^P8E~^?_v0$lUNGq5clc)n1!%Y_5XixwN5;z0Aj( zmh}!wUf}P`L{l&#^`?Qp9<77LaNlB{1RJ@e9h}X=fvr8*0}2p^ EF-_4MeE>>vl*C< zra-lEkBR@6raep?bEpi-rY2q;smN|kF2x<{>0oxGxo%<1zqMle<<;iAFHHp2zE4Wy zpHHR>k-T69LajJPscjt?=Q->TXnEs0^uXHT9Rr?iVGn{|3oq2ozn(|1ixkatT2P5< zK%L{`>Ki{lo<_rKbpfo2x~=TJmXxb)#jf4?{pFz&#T2Vi_G;p$b**3 z4g6d&P8^+!`GC)=j#hQe6tYMj9g(Y1SlX6t-2qWv=<=0ZOM5>Hp4^sbn!n8YG?QA$ zuQ*c1c`;ikcGw`d1-N}`*{_`nd{SlnYYY;!Yc%d2FraLdv?{l~wYa8tb;DKfUOo!B zG^u=Eo=p>^cFT>C;>V5#r&@`VfxWM+e9*%?@#r!Yo%z3FcS6V)!hqm-_gE#-4LFNE zWmrD3iPd(&RTA*qi{u#F(0~sE>Z}DSKC9Ex Date: Thu, 15 Nov 2018 13:19:54 +0000 Subject: [PATCH 07/23] Accepting request 649270 from home:michalsrb:bug1113533:X11:XOrg - n_drisw-Do-not-use-drisw_put_image_shm.patch * Workaround for applications that create GL context twice with different loaders. (boo#1113533) OBS-URL: https://build.opensuse.org/request/show/649270 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=779 --- Mesa.changes | 7 ++++ Mesa.spec | 2 + n_drisw-Do-not-use-drisw_put_image_shm.patch | 44 ++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 n_drisw-Do-not-use-drisw_put_image_shm.patch diff --git a/Mesa.changes b/Mesa.changes index 28a235f..81d60a6 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 13 08:50:56 UTC 2018 - msrb@suse.com + +- n_drisw-Do-not-use-drisw_put_image_shm.patch + * Workaround for applications that create GL context twice with + different loaders. (boo#1113533) + ------------------------------------------------------------------- Thu Nov 1 13:15:49 UTC 2018 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 0a09ccb..25242fe 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -141,6 +141,7 @@ Patch51: U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch Patch52: U_python-Fix-rich-comparisons.patch Patch53: U_python-Use-key-functions-when-sorting-containers.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch +Patch55: n_drisw-Do-not-use-drisw_put_image_shm.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -732,6 +733,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch52 -p1 %patch53 -p1 %patch54 -p1 +%patch55 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... diff --git a/n_drisw-Do-not-use-drisw_put_image_shm.patch b/n_drisw-Do-not-use-drisw_put_image_shm.patch new file mode 100644 index 0000000..eed3f53 --- /dev/null +++ b/n_drisw-Do-not-use-drisw_put_image_shm.patch @@ -0,0 +1,44 @@ +From 44e72286f76d244f6f2acf2cbf7204b6d7377be8 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Tue, 13 Nov 2018 09:31:53 +0100 +Subject: [PATCH] drisw: Do not use drisw_put_image_shm + +The put_image_shm is temporarily disabled to workaround crashes in +applications that create two software-rendering OpenGL contexts, each +time using different version of loader. This caused crashes because the +drisw_lf variable is shared between them. + +https://bugzilla.opensuse.org/show_bug.cgi?id=1113533 +--- + src/gallium/state_trackers/dri/drisw.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/gallium/state_trackers/dri/drisw.c b/src/gallium/state_trackers/dri/drisw.c +index 886f94dc02..62ced60e92 100644 +--- a/src/gallium/state_trackers/dri/drisw.c ++++ b/src/gallium/state_trackers/dri/drisw.c +@@ -446,10 +446,21 @@ drisw_init_screen(__DRIscreen * sPriv) + + sPriv->driverPrivate = (void *)screen; + sPriv->extensions = drisw_screen_extensions; ++ ++ /* The put_image_shm is temporarily disabled to workaround crashes in ++ * applications that create two software-rendering OpenGL contexts, each ++ * time using different version of loader. This caused crashes because the ++ * drisw_lf variable is shared between them. ++ * ++ * https://bugzilla.opensuse.org/show_bug.cgi?id=1113533 ++ * ++ */ ++#if 0 + if (loader->base.version >= 4) { + if (loader->putImageShm) + drisw_lf.put_image_shm = drisw_put_image_shm; + } ++#endif + + if (pipe_loader_sw_probe_dri(&screen->dev, &drisw_lf)) { + dri_init_options(screen); +-- +2.16.4 + From 73e955aa8c82c28300025affed720bc67c461ca2dc99fb5f1366827f09d0a96b Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 15 Nov 2018 15:47:11 +0000 Subject: [PATCH 08/23] - Update to 18.3.0-rc2 * second release candidate for Mesa 18.3.0 - supersedes the following patches: * U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch * U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch * U_python-Fix-rich-comparisons.patch * U_python-Use-key-functions-when-sorting-containers.patch * mako_4_radv.patch - adjusted n_drirc-disable-rgb10-for-chromium-on-amd.patch - /etc/drirc moved to /usr/share/drirc.d/00-mesa-defaults.conf OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=780 --- Mesa-drivers.changes | 21 ++++ Mesa-drivers.spec | 27 ++--- Mesa.changes | 14 +++ Mesa.spec | 25 ++--- ...mark-ftruncate_res-as-MAYBE_UNUSED-i.patch | 39 ------- ...rk-total_length-as-MAYBE_UNUSED-in-g.patch | 40 ------- U_python-Fix-rich-comparisons.patch | 100 ------------------ ...ey-functions-when-sorting-containers.patch | 61 ----------- mako_4_radv.patch | 15 --- mesa-18.2.4.tar.xz | 3 - mesa-18.2.4.tar.xz.sig | Bin 566 -> 0 bytes mesa-18.3.0-rc2.tar.xz | 3 + mesa-18.3.0-rc2.tar.xz.sig | Bin 0 -> 566 bytes ...rc-disable-rgb10-for-chromium-on-amd.patch | 12 +-- 14 files changed, 64 insertions(+), 296 deletions(-) delete mode 100644 U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch delete mode 100644 U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch delete mode 100644 U_python-Fix-rich-comparisons.patch delete mode 100644 U_python-Use-key-functions-when-sorting-containers.patch delete mode 100644 mako_4_radv.patch delete mode 100644 mesa-18.2.4.tar.xz delete mode 100644 mesa-18.2.4.tar.xz.sig create mode 100644 mesa-18.3.0-rc2.tar.xz create mode 100644 mesa-18.3.0-rc2.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 28a235f..b2058f2 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 15 15:19:27 UTC 2018 - sndirsch@suse.com + +- Update to 18.3.0-rc2 + * second release candidate for Mesa 18.3.0 +- supersedes the following patches: + * U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch + * U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch + * U_python-Fix-rich-comparisons.patch + * U_python-Use-key-functions-when-sorting-containers.patch + * mako_4_radv.patch +- adjusted n_drirc-disable-rgb10-for-chromium-on-amd.patch +- /etc/drirc moved to /usr/share/drirc.d/00-mesa-defaults.conf + +------------------------------------------------------------------- +Tue Nov 13 08:50:56 UTC 2018 - msrb@suse.com + +- n_drisw-Do-not-use-drisw_put_image_shm.patch + * Workaround for applications that create GL context twice with + different loaders. (boo#1113533) + ------------------------------------------------------------------- Thu Nov 1 13:15:49 UTC 2018 - sndirsch@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 4dbe58f..bd8258b 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.2.4 +%define _version 18.3.0-rc2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -112,7 +112,7 @@ %endif Name: Mesa-drivers -Version: 18.2.4 +Version: 18.3.0 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -134,14 +134,9 @@ Source7: Mesa.keyring Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch # currently needed for libglvnd support Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch -# Upstream -Patch48: mako_4_radv.patch -Patch50: U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch -Patch51: U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch -Patch52: U_python-Fix-rich-comparisons.patch -Patch53: U_python-Use-key-functions-when-sorting-containers.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch +Patch55: n_drisw-Do-not-use-drisw_put_image_shm.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -727,12 +722,8 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch31 -p1 %endif -%patch48 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 %patch54 -p1 +%patch55 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -840,7 +831,7 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc # not disable from buildling and installing. # in Mesa -rm %{buildroot}/%{_sysconfdir}/drirc +rm -rf %{buildroot}/usr/share/drirc.d # in Mesa-libGL-devel rm -rf %{buildroot}/%{_includedir}/GL @@ -860,6 +851,9 @@ rm %{buildroot}/%{_includedir}/gbm.h rm %{buildroot}/%{_libdir}/libgbm.so* rm %{buildroot}/%{_libdir}/pkgconfig/gbm.pc +# in libEGL-devel +rm -rf %{buildroot}/%{_includedir}/KHR + %else %if 0%{?libglvnd} == 0 # Make a symlink to libGL.so.1.2 for compatibility (bnc#809359, bnc#831306) @@ -932,7 +926,8 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %files %license docs/license.html %doc docs/README* -%config %{_sysconfdir}/drirc +%dir /usr/share/drirc.d +/usr/share/drirc.d/* %files libEGL1 %if 0%{?libglvnd} @@ -1167,7 +1162,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %files -n Mesa-libVulkan-devel %dir %{_includedir}/vulkan -%{_includedir}/vulkan +%{_includedir}/vulkan/* %endif %changelog diff --git a/Mesa.changes b/Mesa.changes index 81d60a6..b2058f2 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Nov 15 15:19:27 UTC 2018 - sndirsch@suse.com + +- Update to 18.3.0-rc2 + * second release candidate for Mesa 18.3.0 +- supersedes the following patches: + * U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch + * U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch + * U_python-Fix-rich-comparisons.patch + * U_python-Use-key-functions-when-sorting-containers.patch + * mako_4_radv.patch +- adjusted n_drirc-disable-rgb10-for-chromium-on-amd.patch +- /etc/drirc moved to /usr/share/drirc.d/00-mesa-defaults.conf + ------------------------------------------------------------------- Tue Nov 13 08:50:56 UTC 2018 - msrb@suse.com diff --git a/Mesa.spec b/Mesa.spec index 25242fe..673fd02 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.2.4 +%define _version 18.3.0-rc2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -111,7 +111,7 @@ %endif Name: Mesa -Version: 18.2.4 +Version: 18.3.0 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -133,13 +133,7 @@ Source7: Mesa.keyring Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch # currently needed for libglvnd support Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch -# Upstream -Patch48: mako_4_radv.patch -Patch50: U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch -Patch51: U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch -Patch52: U_python-Fix-rich-comparisons.patch -Patch53: U_python-Use-key-functions-when-sorting-containers.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch55: n_drisw-Do-not-use-drisw_put_image_shm.patch @@ -727,11 +721,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch31 -p1 %endif -%patch48 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 %patch54 -p1 %patch55 -p1 @@ -841,7 +830,7 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc # not disable from buildling and installing. # in Mesa -rm %{buildroot}/%{_sysconfdir}/drirc +rm -rf %{buildroot}/usr/share/drirc.d # in Mesa-libGL-devel rm -rf %{buildroot}/%{_includedir}/GL @@ -861,6 +850,9 @@ rm %{buildroot}/%{_includedir}/gbm.h rm %{buildroot}/%{_libdir}/libgbm.so* rm %{buildroot}/%{_libdir}/pkgconfig/gbm.pc +# in libEGL-devel +rm -rf %{buildroot}/%{_includedir}/KHR + %else %if 0%{?libglvnd} == 0 # Make a symlink to libGL.so.1.2 for compatibility (bnc#809359, bnc#831306) @@ -933,7 +925,8 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %files %license docs/license.html %doc docs/README* -%config %{_sysconfdir}/drirc +%dir /usr/share/drirc.d +/usr/share/drirc.d/* %files libEGL1 %if 0%{?libglvnd} @@ -1168,7 +1161,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %files -n Mesa-libVulkan-devel %dir %{_includedir}/vulkan -%{_includedir}/vulkan +%{_includedir}/vulkan/* %endif %changelog diff --git a/U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch b/U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch deleted file mode 100644 index 78ed768..0000000 --- a/U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ccdefbb559a60c2560118d253a9eaeffd1e94eb6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= -Date: Sat, 18 Aug 2018 13:16:11 +0200 -Subject: [PATCH] intel: aubinator: mark ftruncate_res as MAYBE_UNUSED in - ensure_phys_mem -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Only used, when asserts are enabled. - -Fixes an unused-variable warning with GCC 8: - ../../../src/intel/tools/aubinator.c: In function 'ensure_phys_mem': - ../../../src/intel/tools/aubinator.c:209:11: warning: unused variable 'ftruncate_res' [-Wunused-variable] - int ftruncate_res = ftruncate(mem_fd, mem_fd_len += 4096); - ^~~~~~~~~~~~~ - -Signed-off-by: Kai Wasserbäch -Reviewed-by: Lionel Landwerlin ---- - src/intel/tools/aubinator.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/intel/tools/aubinator.c b/src/intel/tools/aubinator.c -index 9a3b1d1ef1..66a7db1043 100644 ---- a/src/intel/tools/aubinator.c -+++ b/src/intel/tools/aubinator.c -@@ -206,7 +206,7 @@ ensure_phys_mem(uint64_t phys_addr) - new_mem->phys_addr = phys_addr; - new_mem->fd_offset = mem_fd_len; - -- int ftruncate_res = ftruncate(mem_fd, mem_fd_len += 4096); -+ MAYBE_UNUSED int ftruncate_res = ftruncate(mem_fd, mem_fd_len += 4096); - assert(ftruncate_res == 0); - - new_mem->data = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, --- -2.16.4 - diff --git a/U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch b/U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch deleted file mode 100644 index 4e380fe..0000000 --- a/U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5fab32ddad8b32c4a05517c43623653f8634c4d9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= -Date: Sat, 18 Aug 2018 13:16:15 +0200 -Subject: [PATCH] intel/decoder: mark total_length as MAYBE_UNUSED in - gen_spec_load -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Only used, when asserts are enabled. - -Fixes an unused-variable warning with GCC 8: - ../../../src/intel/common/gen_decoder.c: In function 'gen_spec_load': - ../../../src/intel/common/gen_decoder.c:535:47: warning: variable 'total_length' set but not used [-Wunused-but-set-variable] - uint32_t text_offset = 0, text_length = 0, total_length; - ^~~~~~~~~~~~ - -Signed-off-by: Kai Wasserbäch -Reviewed-by: Lionel Landwerlin ---- - src/intel/common/gen_decoder.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/gen_decoder.c -index ec0a486b10..c14c23aad1 100644 ---- a/src/intel/common/gen_decoder.c -+++ b/src/intel/common/gen_decoder.c -@@ -532,7 +532,8 @@ gen_spec_load(const struct gen_device_info *devinfo) - struct parser_context ctx; - void *buf; - uint8_t *text_data = NULL; -- uint32_t text_offset = 0, text_length = 0, total_length; -+ uint32_t text_offset = 0, text_length = 0; -+ MAYBE_UNUSED uint32_t total_length; - uint32_t gen_10 = devinfo_to_gen(devinfo); - - for (int i = 0; i < ARRAY_SIZE(genxml_files_table); i++) { --- -2.16.4 - diff --git a/U_python-Fix-rich-comparisons.patch b/U_python-Fix-rich-comparisons.patch deleted file mode 100644 index 0132dd4..0000000 --- a/U_python-Fix-rich-comparisons.patch +++ /dev/null @@ -1,100 +0,0 @@ -From e1b88aee680bbdadd283b4a26db74672bb130df5 Mon Sep 17 00:00:00 2001 -From: Mathieu Bridon -Date: Tue, 17 Jul 2018 22:57:39 +0200 -Subject: [PATCH] python: Fix rich comparisons - -Python 3 doesn't call objects __cmp__() methods any more to compare -them. Instead, it requires implementing the rich comparison methods -explicitly: __eq__(), __ne(), __lt__(), __le__(), __gt__() and __ge__(). - -Fortunately Python 2 also supports those. - -This commit only implements the comparison methods which are actually -used by the build scripts. - -Signed-off-by: Mathieu Bridon -Reviewed-by: Dylan Baker ---- - src/amd/vulkan/radv_extensions.py | 5 +++-- - src/intel/vulkan/anv_extensions.py | 5 +++-- - src/mapi/mapi_abi.py | 15 +++++++-------- - 3 files changed, 13 insertions(+), 12 deletions(-) - -diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py -index 15d29becfd..8b5eee867a 100644 ---- a/src/amd/vulkan/radv_extensions.py -+++ b/src/amd/vulkan/radv_extensions.py -@@ -147,14 +147,15 @@ class VkVersion: - patch = self.patch if self.patch is not None else 0 - return (self.major << 22) | (self.minor << 12) | patch - -- def __cmp__(self, other): -+ def __gt__(self, other): - # If only one of them has a patch version, "ignore" it by making - # other's patch version match self. - if (self.patch is None) != (other.patch is None): - other = copy.copy(other) - other.patch = self.patch - -- return self.__int_ver().__cmp__(other.__int_ver()) -+ return self.__int_ver() > other.__int_ver() -+ - - MAX_API_VERSION = VkVersion(MAX_API_VERSION) - -diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py -index cffc3e700c..9a65aed1c4 100644 ---- a/src/intel/vulkan/anv_extensions.py -+++ b/src/intel/vulkan/anv_extensions.py -@@ -160,14 +160,15 @@ class VkVersion: - patch = self.patch if self.patch is not None else 0 - return (self.major << 22) | (self.minor << 12) | patch - -- def __cmp__(self, other): -+ def __gt__(self, other): - # If only one of them has a patch version, "ignore" it by making - # other's patch version match self. - if (self.patch is None) != (other.patch is None): - other = copy.copy(other) - other.patch = self.patch - -- return self.__int_ver().__cmp__(other.__int_ver()) -+ return self.__int_ver() > other.__int_ver() -+ - - - MAX_API_VERSION = VkVersion('0.0.0') -diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py -index be1d15d922..e4ce2b6caf 100644 ---- a/src/mapi/mapi_abi.py -+++ b/src/mapi/mapi_abi.py -@@ -121,19 +121,18 @@ class ABIEntry(object): - def __str__(self): - return self.c_prototype() - -- def __cmp__(self, other): -+ def __lt__(self, other): - # compare slot, alias, and then name -- res = cmp(self.slot, other.slot) -- if not res: -+ if self.slot == other.slot: - if not self.alias: -- res = -1 -+ return True - elif not other.alias: -- res = 1 -+ return False - -- if not res: -- res = cmp(self.name, other.name) -+ return self.name < other.name -+ -+ return self.slot < other.slot - -- return res - - def abi_parse_xml(xml): - """Parse a GLAPI XML file for ABI entries.""" --- -2.16.4 - diff --git a/U_python-Use-key-functions-when-sorting-containers.patch b/U_python-Use-key-functions-when-sorting-containers.patch deleted file mode 100644 index ce33f30..0000000 --- a/U_python-Use-key-functions-when-sorting-containers.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 8d3ff6244c7cc5a8399afcf0d1d98d7fd8148452 Mon Sep 17 00:00:00 2001 -From: Mathieu Bridon -Date: Thu, 9 Aug 2018 10:27:23 +0200 -Subject: [PATCH] python: Use key-functions when sorting containers - -In Python 2, the traditional way to sort containers was to use a -comparison function (which returned either -1, 0 or 1 when passed two -objects) and pass that as the "cmp" argument to the container's sort() -method. - -Python 2.4 introduced key-functions, which instead only operate on a -given item, and return a sorting key for this item. - -In general, this runs faster, because the cmp-function has to get run -multiple times for each item of the container. - -Python 3 removed the cmp-function, enforcing usage of key-functions -instead. - -This change makes the script compatible with Python 2 and Python 3. - -Signed-off-by: Mathieu Bridon -Reviewed-by: Eric Engestrom -Reviewed-by: Dylan Baker ---- - src/mapi/mapi_abi.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py -index e4ce2b6caf..d4c48ec430 100644 ---- a/src/mapi/mapi_abi.py -+++ b/src/mapi/mapi_abi.py -@@ -32,6 +32,7 @@ import os - GLAPI = os.path.join(".", os.path.dirname(sys.argv[0]), "glapi/gen") - sys.path.append(GLAPI) - -+from operator import attrgetter - import re - from optparse import OptionParser - import gl_XML -@@ -291,7 +292,7 @@ class ABIPrinter(object): - - # sort entries by their names - self.entries_sorted_by_names = self.entries[:] -- self.entries_sorted_by_names.sort(lambda x, y: cmp(x.name, y.name)) -+ self.entries_sorted_by_names.sort(key=attrgetter('name')) - - self.indent = ' ' * 3 - self.noop_warn = 'noop_warn' -@@ -441,7 +442,7 @@ class ABIPrinter(object): - """Return the string pool for use by stubs.""" - # sort entries by their names - sorted_entries = self.entries[:] -- sorted_entries.sort(lambda x, y: cmp(x.name, y.name)) -+ sorted_entries.sort(key=attrgetter('name')) - - pool = [] - offsets = {} --- -2.16.4 - diff --git a/mako_4_radv.patch b/mako_4_radv.patch deleted file mode 100644 index ac37124..0000000 --- a/mako_4_radv.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: mesa-18.1.2/m4/ax_check_python_mako_module.m4 -=================================================================== ---- mesa-18.1.2.orig/m4/ax_check_python_mako_module.m4 -+++ mesa-18.1.2/m4/ax_check_python_mako_module.m4 -@@ -48,8 +48,8 @@ try: - except ImportError as err: - sys.exit(err) - else: -- ver_req = map(int, '$1'.split('.')) -- ver_act = map(int, mako.__version__.split('.')) -+ ver_req = list(map(int, '$1'.split('.'))) -+ ver_act = list(map(int, mako.__version__.split('.'))) - sys.exit(int(ver_req > ver_act)) - " | $PYTHON2 - - diff --git a/mesa-18.2.4.tar.xz b/mesa-18.2.4.tar.xz deleted file mode 100644 index ae02d61..0000000 --- a/mesa-18.2.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:621d1aebb57876d5b6a5d2dcf4eb7e0620e650c6fe5cf3655c65e243adc9cb4e -size 11377556 diff --git a/mesa-18.2.4.tar.xz.sig b/mesa-18.2.4.tar.xz.sig deleted file mode 100644 index 97f65bd5e82d625bf4dee4f26d9fb4272fb67d7a63b53933f01a5e269b9f87a3..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j*j))>>vl*C< zra-lEkBR@6raep?bEpi-rY2q;smN|kF2x<{>0oxGxo%<1zqMle<<;iAFHHp2zE4Wy zpHHR>k-T69LajJPscjt?=Q->TXnEs0^uXHT9Rr?iVGn{|3oq2ozn(|1ixkatT2P5< zK%L{`>Ki{lo<_rKbpfo2x~=TJmXxb)#jf4?{pFz&#T2Vi_G;p$b**3 z4g6d&P8^+!`GC)=j#hQe6tYMj9g(Y1SlX6t-2qWv=<=0ZOM5>Hp4^sbn!n8YG?QA$ zuQ*c1c`;ikcGw`d1-N}`*{_`nd{SlnYYY;!Yc%d2FraLdv?{l~wYa8tb;DKfUOo!B zG^u=Eo=p>^cFT>C;>V5#r&@`VfxWM+e9*%?@#r!Yo%z3FcS6V)!hqm-_gE#-4LFNE zWmrD3iPd(&RTA*qi{u#F(0~sE>Z}DSKC9Exq!j-0$b&2&j1Pu5bdrv zuq^9I4R<0B{xdV)YAN5;*yag9bpbnnMtEa_=FW?m$TK9%o^=e!@CV1tD!MFTv zoIe+?Wb#m=DV@8*24*`&Ki9jTcEmR&&hs|QIY*DD>(ntSav4UG0Br5XwnX-Ss~Es% zNLL$8XB6K(%?ZaT$DQn;Gs7#zb4|jq%P?JVmE>!Ar`h+oBbiu7K@c0^x|wN`el%6M zWExfWAGE%r{%K!JC!FtBH!()rFb)-73OGoDS&)t?3{XH}Mt?_H5fl0z8-bU36b9ln zw--GAkguXT!D+_J50xX~&#ar1i4iO&yU7@9azQxr0vg zED|xlP)}#I@|d@m9^1FhWirhjX~FgNcr~F_Yz@jaS!JLQ%*F}Tr4Ecw&)t78-cWci zM~&LnuO|I$`qpn!sxywhMAlrCA_%Zzmnj6{1+6JhBk!Aue;@qK@KVW}FQmhcjke=Q zEQ*K+V=l-(;g^=NyB8x(s+?A|&#LpWRKqW;(R=yF&80ZF)rd&M7ICF`r -