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 97f65bd..0000000 Binary files a/mesa-18.2.4.tar.xz.sig and /dev/null differ diff --git a/mesa-18.3.0-rc2.tar.xz b/mesa-18.3.0-rc2.tar.xz new file mode 100644 index 0000000..829921b --- /dev/null +++ b/mesa-18.3.0-rc2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6fe79ce3aaabc7b7b52f83d01dae746e2d8c9665c121ac2adee8f4b7397bc64 +size 11862200 diff --git a/mesa-18.3.0-rc2.tar.xz.sig b/mesa-18.3.0-rc2.tar.xz.sig new file mode 100644 index 0000000..ebc3fe1 Binary files /dev/null and b/mesa-18.3.0-rc2.tar.xz.sig differ diff --git a/n_drirc-disable-rgb10-for-chromium-on-amd.patch b/n_drirc-disable-rgb10-for-chromium-on-amd.patch index a749c1e..f837ea3 100644 --- a/n_drirc-disable-rgb10-for-chromium-on-amd.patch +++ b/n_drirc-disable-rgb10-for-chromium-on-amd.patch @@ -1,10 +1,10 @@ -Index: mesa-18.2.3/src/util/drirc +Index: mesa-18.3.0-rc2/src/util/00-mesa-defaults.conf =================================================================== ---- mesa-18.2.3.orig/src/util/drirc -+++ mesa-18.2.3/src/util/drirc -@@ -330,5 +330,10 @@ TODO: document the other workarounds. - -