From fd17a96af0629adba9005e2451b94fc5de7b13cd20e2098a1f65ef3ec180c5d6 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 30 Jan 2018 14:44:55 +0000 Subject: [PATCH 1/7] - Require Mesa-dri-32bit and Mesa-gallium-32bit by Mesa-32bit. It mirrors the requirement of the normal packages. (bnc#1078261) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=688 --- Mesa.changes | 6 ++++++ baselibs.conf | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/Mesa.changes b/Mesa.changes index d7bb2fb..ce2b237 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 30 14:42:52 UTC 2018 - msrb@suse.com + +- Require Mesa-dri-32bit and Mesa-gallium-32bit by Mesa-32bit. It + mirrors the requirement of the normal packages. (bnc#1078261) + ------------------------------------------------------------------- Mon Jan 29 10:43:04 UTC 2018 - msrb@suse.com diff --git a/baselibs.conf b/baselibs.conf index 9c0a562..cfb0492 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -9,6 +9,13 @@ Mesa provides "Mesa-libIndirectGL1- = " obsoletes "Mesa-libIndirectGL1- < " requires "libglvnd- >= 0.1.0" + + # This dependency on Mesa-dri and Mesa-gallium is here to make sure users that + # do not install recommends on their system still get working Mesa. It is + # ignored in obs when Mesa is installed as build dependency. + requires "Mesa-dri- = " + requires "Mesa-gallium- = " + Mesa-devel #We need Mesa-!, do not put requires -Mesa-. requires "Mesa- = " From cd418330989816653637ae2f362fc9b410b2302e019b5657b7f568870caef20d Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 30 Jan 2018 15:05:46 +0000 Subject: [PATCH 2/7] Remove comment duplicated from the spec file. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=689 --- baselibs.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index cfb0492..9d24653 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -9,10 +9,6 @@ Mesa provides "Mesa-libIndirectGL1- = " obsoletes "Mesa-libIndirectGL1- < " requires "libglvnd- >= 0.1.0" - - # This dependency on Mesa-dri and Mesa-gallium is here to make sure users that - # do not install recommends on their system still get working Mesa. It is - # ignored in obs when Mesa is installed as build dependency. requires "Mesa-dri- = " requires "Mesa-gallium- = " From ca77b51af704f9f47050be03b6a02d7fe3cfb6ddc90c23f9de0ab55d5816a9b2 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 30 Jan 2018 15:06:18 +0000 Subject: [PATCH 3/7] Forgot pre_checkin.sh. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=690 --- Mesa-drivers.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index d7bb2fb..ce2b237 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 30 14:42:52 UTC 2018 - msrb@suse.com + +- Require Mesa-dri-32bit and Mesa-gallium-32bit by Mesa-32bit. It + mirrors the requirement of the normal packages. (bnc#1078261) + ------------------------------------------------------------------- Mon Jan 29 10:43:04 UTC 2018 - msrb@suse.com From ffbbabedd90bcfcef0fe118e56189f1c224c6edfc39795dba10fbae78422fe0e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 31 Jan 2018 16:37:49 +0000 Subject: [PATCH 4/7] Accepting request 571475 from home:michalsrb:branches:X11:XOrg - Remove dependency on clang-devel-static. (bnc#1065464) * It was removed, clang-devel now again provides everything necessary as shared libraries. OBS-URL: https://build.opensuse.org/request/show/571475 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=691 --- Mesa-drivers.changes | 7 +++++++ Mesa-drivers.spec | 1 - Mesa.changes | 7 +++++++ Mesa.spec | 1 - 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index ce2b237..13033bf 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 31 14:58:07 UTC 2018 - msrb@suse.com + +- Remove dependency on clang-devel-static. (bnc#1065464) + * It was removed, clang-devel now again provides everything + necessary as shared libraries. + ------------------------------------------------------------------- Tue Jan 30 14:42:52 UTC 2018 - msrb@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index cf99676..1ad5655 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -228,7 +228,6 @@ BuildRequires: ncurses-devel %if 0%{with_opencl} BuildRequires: clang-devel -BuildRequires: clang-devel-static BuildRequires: libclc %endif diff --git a/Mesa.changes b/Mesa.changes index ce2b237..13033bf 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 31 14:58:07 UTC 2018 - msrb@suse.com + +- Remove dependency on clang-devel-static. (bnc#1065464) + * It was removed, clang-devel now again provides everything + necessary as shared libraries. + ------------------------------------------------------------------- Tue Jan 30 14:42:52 UTC 2018 - msrb@suse.com diff --git a/Mesa.spec b/Mesa.spec index 42e16b7..3285e90 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -227,7 +227,6 @@ BuildRequires: ncurses-devel %if 0%{with_opencl} BuildRequires: clang-devel -BuildRequires: clang-devel-static BuildRequires: libclc %endif From 3b3af5d1da222d8775bc3ee157346226ffadcdea4608e971c167b9a08a401342 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 2 Feb 2018 14:05:09 +0000 Subject: [PATCH 5/7] - Update to 18.0.0-rc3 * includes significant improvements for OpenGL and Vulkan support and performance. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=692 --- Mesa-drivers.changes | 7 ++++ Mesa-drivers.spec | 6 +-- Mesa.changes | 7 ++++ Mesa.spec | 6 +-- U_intel-Add-more-Coffee-Lake-PCI-IDs.patch | 45 --------------------- mesa-17.3.3.tar.xz | 3 -- mesa-17.3.3.tar.xz.sig | Bin 119 -> 0 bytes mesa-18.0.0-rc3.tar.xz | 3 ++ mesa-18.0.0-rc3.tar.xz.sig | Bin 0 -> 566 bytes 9 files changed, 21 insertions(+), 56 deletions(-) delete mode 100644 U_intel-Add-more-Coffee-Lake-PCI-IDs.patch delete mode 100644 mesa-17.3.3.tar.xz delete mode 100644 mesa-17.3.3.tar.xz.sig create mode 100644 mesa-18.0.0-rc3.tar.xz create mode 100644 mesa-18.0.0-rc3.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 13033bf..95369d1 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 2 13:52:41 UTC 2018 - sndirsch@suse.com + +- Update to 18.0.0-rc3 + * includes significant improvements for OpenGL and Vulkan support + and performance. + ------------------------------------------------------------------- Wed Jan 31 14:58:07 UTC 2018 - msrb@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 1ad5655..2cfd251 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -43,7 +43,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 17.3.3 +%define _version 18.0.0-rc3 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -108,7 +108,7 @@ %endif Name: Mesa-drivers -Version: 17.3.3 +Version: 18.0.0 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -141,7 +141,6 @@ Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch Patch32: archlinux_glvnd-fix-gl-dot-pc.patch # Upstream Patch43: u_mesa-python3-only.patch -Patch44: U_intel-Add-more-Coffee-Lake-PCI-IDs.patch Patch45: n_Disable-AMDGPU-GFX9-Vega-on-LLVM-lessthan-6.0.0.patch BuildRequires: autoconf >= 2.60 @@ -750,7 +749,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %endif %patch43 -p1 -%patch44 -p1 %patch45 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when diff --git a/Mesa.changes b/Mesa.changes index 13033bf..95369d1 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 2 13:52:41 UTC 2018 - sndirsch@suse.com + +- Update to 18.0.0-rc3 + * includes significant improvements for OpenGL and Vulkan support + and performance. + ------------------------------------------------------------------- Wed Jan 31 14:58:07 UTC 2018 - msrb@suse.com diff --git a/Mesa.spec b/Mesa.spec index 3285e90..62cf8e6 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 17.3.3 +%define _version 18.0.0-rc3 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -107,7 +107,7 @@ %endif Name: Mesa -Version: 17.3.3 +Version: 18.0.0 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -140,7 +140,6 @@ Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch Patch32: archlinux_glvnd-fix-gl-dot-pc.patch # Upstream Patch43: u_mesa-python3-only.patch -Patch44: U_intel-Add-more-Coffee-Lake-PCI-IDs.patch Patch45: n_Disable-AMDGPU-GFX9-Vega-on-LLVM-lessthan-6.0.0.patch BuildRequires: autoconf >= 2.60 @@ -749,7 +748,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %endif %patch43 -p1 -%patch44 -p1 %patch45 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when diff --git a/U_intel-Add-more-Coffee-Lake-PCI-IDs.patch b/U_intel-Add-more-Coffee-Lake-PCI-IDs.patch deleted file mode 100644 index eecb47e..0000000 --- a/U_intel-Add-more-Coffee-Lake-PCI-IDs.patch +++ /dev/null @@ -1,45 +0,0 @@ -From fe668b5c155aee4443dde0748065241e09293302 Mon Sep 17 00:00:00 2001 -From: Anuj Phogat -Date: Fri, 5 Jan 2018 09:17:36 -0800 -Subject: [PATCH] intel: Add more Coffee Lake PCI IDs - -More Coffee Lake PCI IDs have been added to the spec. - -Signed-off-by: Anuj Phogat -Reviewed-by: Rodrigo Vivi ---- - include/pci_ids/i965_pci_ids.h | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h -index 0dd01a4343..9616f7de21 100644 ---- a/include/pci_ids/i965_pci_ids.h -+++ b/include/pci_ids/i965_pci_ids.h -@@ -167,15 +167,23 @@ CHIPSET(0x3184, glk, "Intel(R) HD Graphics (Geminilake)") - CHIPSET(0x3185, glk_2x6, "Intel(R) HD Graphics (Geminilake 2x6)") - CHIPSET(0x3E90, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)") - CHIPSET(0x3E93, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)") -+CHIPSET(0x3E99, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)") -+CHIPSET(0x3EA1, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)") -+CHIPSET(0x3EA4, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)") - CHIPSET(0x3E91, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") - CHIPSET(0x3E92, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") - CHIPSET(0x3E96, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") -+CHIPSET(0x3E9A, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") - CHIPSET(0x3E9B, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") - CHIPSET(0x3E94, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") -+CHIPSET(0x3EA0, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") -+CHIPSET(0x3EA3, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") -+CHIPSET(0x3EA9, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") -+CHIPSET(0x3EA2, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)") -+CHIPSET(0x3EA5, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)") - CHIPSET(0x3EA6, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)") - CHIPSET(0x3EA7, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)") - CHIPSET(0x3EA8, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)") --CHIPSET(0x3EA5, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)") - CHIPSET(0x5A49, cnl_2x8, "Intel(R) HD Graphics (Cannonlake 2x8 GT0.5)") - CHIPSET(0x5A4A, cnl_2x8, "Intel(R) HD Graphics (Cannonlake 2x8 GT0.5)") - CHIPSET(0x5A41, cnl_3x8, "Intel(R) HD Graphics (Cannonlake 3x8 GT1)") --- -2.13.6 - diff --git a/mesa-17.3.3.tar.xz b/mesa-17.3.3.tar.xz deleted file mode 100644 index 8cd3497..0000000 --- a/mesa-17.3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41bac5de0ef6adc1f41a1ec0f80c19e361298ce02fa81b5f9ba4fdca33a9379b -size 10637708 diff --git a/mesa-17.3.3.tar.xz.sig b/mesa-17.3.3.tar.xz.sig deleted file mode 100644 index 139bb458c6df1af7dc7232e291628f5e3565d07738173532f20ace44e5ef091b..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEHV2~A4WSL@ddFARKPi9JRc}8w)YwDakRckvdQ&gf*00S4N08GR~jFI7J z&5Wcp$EQoU4f}Vyb?%S!c>OMhEnLda=idpgr3ddnW%wU|Van;)i@zVgEYFyJ^!Ck( Vy!^@ien;q!j-0$OhdjQ|P>5bdrv zuq^9I4RG5J|7NBtIio8l`@-IN1Zlz?MKoc+#v+lu6ZcCH1{vq#&SI%Mf{<9F% zD?j(R%VG9@8yca%73^;~hA|FfVJyke(=L%MJGvVGm6+^M&qTXC}|44_6bM zM$Lr0qUw*|8R!-1SLluJfH6XU&$I>M1E1u4 Date: Fri, 2 Feb 2018 18:52:39 +0000 Subject: [PATCH 6/7] - supersedes U_intel-Add-more-Coffee-Lake-PCI-IDs.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=693 --- Mesa.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/Mesa.changes b/Mesa.changes index 95369d1..1386186 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -4,6 +4,7 @@ Fri Feb 2 13:52:41 UTC 2018 - sndirsch@suse.com - Update to 18.0.0-rc3 * includes significant improvements for OpenGL and Vulkan support and performance. +- supersedes U_intel-Add-more-Coffee-Lake-PCI-IDs.patch ------------------------------------------------------------------- Wed Jan 31 14:58:07 UTC 2018 - msrb@suse.com From d276e8c42d20c427de8fd755cfdf3b6c633246c8d7999b4e76f278e5a10aa137 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 2 Feb 2018 18:52:59 +0000 Subject: [PATCH 7/7] - supersedes U_intel-Add-more-Coffee-Lake-PCI-IDs.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=694 --- Mesa-drivers.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 95369d1..1386186 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -4,6 +4,7 @@ Fri Feb 2 13:52:41 UTC 2018 - sndirsch@suse.com - Update to 18.0.0-rc3 * includes significant improvements for OpenGL and Vulkan support and performance. +- supersedes U_intel-Add-more-Coffee-Lake-PCI-IDs.patch ------------------------------------------------------------------- Wed Jan 31 14:58:07 UTC 2018 - msrb@suse.com