Hello community,
here is the log from the commit of package Mesa for openSUSE:Factory checked in
at 2018-09-18 11:37:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/Mesa (Old)
and /work/SRC/openSUSE:Factory/.Mesa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa"
Tue Sep 18 11:37:23 2018 rev:335 rq:635013 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/Mesa/Mesa-drivers.changes 2018-09-11
17:12:55.751814331 +0200
+++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa-drivers.changes 2018-09-18
11:37:27.408288048 +0200
@@ -1,0 +2,95 @@
+Tue Sep 11 13:28:26 UTC 2018 - sndir...@suse.com
+
+- get rid of libwayland-egl1/libwayland-egl-devel completely; also
+ for older Leap versions
+
+-------------------------------------------------------------------
+Mon Sep 10 13:29:24 UTC 2018 - sndir...@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 ...
+
+-------------------------------------------------------------------
Mesa.changes: same change
Old:
----
mesa-18.1.7.tar.xz
mesa-18.1.7.tar.xz.sha1sum
u_intel_anv-make-scripts-python-2-3-compat.patch
u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch
New:
----
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
mesa-18.2.0.tar.xz
mesa-18.2.0.tar.xz.sha1sum
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Mesa-drivers.spec ++++++
--- /var/tmp/diff_new_pack.nrAMv7/_old 2018-09-18 11:37:51.696262304 +0200
+++ /var/tmp/diff_new_pack.nrAMv7/_new 2018-09-18 11:37:51.696262304 +0200
@@ -42,7 +42,7 @@
%define glamor 1
%define _name_archive mesa
-%define _version 18.1.7
+%define _version 18.2.0
%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.0
Release: 0
Summary: System for rendering 3-D graphics
License: MIT
@@ -135,11 +135,14 @@
# 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(xdamage)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xshmfence)
BuildRequires: pkgconfig(xvmc)
BuildRequires: pkgconfig(xxf86vm)
@@ -274,9 +278,6 @@
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 @@
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 @@
%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_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 @@
%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 @@
%{_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*
++++++ Mesa.spec ++++++
--- /var/tmp/diff_new_pack.nrAMv7/_old 2018-09-18 11:37:51.712262287 +0200
+++ /var/tmp/diff_new_pack.nrAMv7/_new 2018-09-18 11:37:51.712262287 +0200
@@ -41,7 +41,7 @@
%define glamor 1
%define _name_archive mesa
-%define _version 18.1.7
+%define _version 18.2.0
%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.0
Release: 0
Summary: System for rendering 3-D graphics
License: MIT
@@ -134,11 +134,14 @@
# 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(xdamage)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xshmfence)
BuildRequires: pkgconfig(xvmc)
BuildRequires: pkgconfig(xxf86vm)
@@ -273,9 +277,6 @@
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 @@
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 @@
%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_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 @@
%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 @@
%{_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*
++++++ U_intel-aubinator-mark-ftruncate_res-as-MAYBE_UNUSED-i.patch ++++++
>From ccdefbb559a60c2560118d253a9eaeffd1e94eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= <k...@dev.carbon-project.org>
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 <k...@dev.carbon-project.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
---
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
++++++ U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch ++++++
>From 5fab32ddad8b32c4a05517c43623653f8634c4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= <k...@dev.carbon-project.org>
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 <k...@dev.carbon-project.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
---
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
++++++ U_python-Fix-rich-comparisons.patch ++++++
>From e1b88aee680bbdadd283b4a26db74672bb130df5 Mon Sep 17 00:00:00 2001
From: Mathieu Bridon <boche...@daitauha.fr>
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 <boche...@daitauha.fr>
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
---
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
++++++ U_python-Use-key-functions-when-sorting-containers.patch ++++++
>From 8d3ff6244c7cc5a8399afcf0d1d98d7fd8148452 Mon Sep 17 00:00:00 2001
From: Mathieu Bridon <boche...@daitauha.fr>
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 <boche...@daitauha.fr>
Reviewed-by: Eric Engestrom <eric.engest...@intel.com>
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
---
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
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.nrAMv7/_old 2018-09-18 11:37:51.792262202 +0200
+++ /var/tmp/diff_new_pack.nrAMv7/_new 2018-09-18 11:37:51.792262202 +0200
@@ -23,7 +23,6 @@
requires "Mesa-libglapi-devel-<targettype> = <version>"
requires "libOSMesa-devel-<targettype> = <version>"
requires "libgbm-devel-<targettype> = <version>"
- requires "libwayland-egl-devel-<targettype> = <version>"
requires "libglvnd-devel-<targettype> >= 0.1.0"
obsoletes "XFree86-Mesa-devel-<targettype>
xorg-x11-Mesa-devel-<targettype>"
provides "XFree86-Mesa-devel-<targettype>
xorg-x11-Mesa-devel-<targettype>"
@@ -63,12 +62,6 @@
libgbm1
libgbm-devel
requires "libgbm1-<targettype> = <version>"
-libwayland-egl-devel
- targetarch aarch64 requires "libwayland-egl1-<targettype> = <version>"
- targetarch ppc64 requires "libwayland-egl1-<targettype> = <version>"
- targetarch ppc64le requires "libwayland-egl1-<targettype> = <version>"
- targetarch s390x requires "libwayland-egl1-<targettype> = <version>"
- targetarch x86_64 requires "libwayland-egl1-<targettype> = <version>"
Mesa-libglapi0
Mesa-libglapi-devel
requires "Mesa-libglapi0-<targettype> = <version>"
@@ -105,7 +98,6 @@
libvdpau_r300
libvdpau_r600
libvdpau_radeonsi
-libwayland-egl1
Mesa-dri-vc4
Mesa-dri-nouveau
Mesa-dri
++++++ mesa-18.1.7.tar.xz -> mesa-18.2.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/Mesa/mesa-18.1.7.tar.xz
/work/SRC/openSUSE:Factory/.Mesa.new/mesa-18.2.0.tar.xz differ: char 25, line 1
++++++ mesa-18.1.7.tar.xz.sha1sum -> mesa-18.2.0.tar.xz.sha1sum ++++++
--- /work/SRC/openSUSE:Factory/Mesa/mesa-18.1.7.tar.xz.sha1sum 2018-09-11
17:13:00.223807406 +0200
+++ /work/SRC/openSUSE:Factory/.Mesa.new/mesa-18.2.0.tar.xz.sha1sum
2018-09-18 11:37:51.008263033 +0200
@@ -1 +1 @@
-8f86e16a1c03665e55bc284c0e4a5b0a953bcadc mesa-18.1.7.tar.xz
+73723d9f3815487f474d84eb91a5cd17edfb63d4 mesa-18.2.0.tar.xz
