From b961348b3b5761ec916803625d44cd63116260c954290d965d0ce5f85b8b846e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 25 Oct 2019 20:12:51 +0000 Subject: [PATCH 1/2] - Update to version 19.2.2 * assortment of fixes in this release, notably a bunch of work to get Solaris and illumos working with mesa, as well as more work fixing issues in the migration of package-config and headers being handled by libglvnd instead of mesa when mesa is built with support for glvnd. There's bunch of other changes here, with radv and intel leading the pack, otherwise just a few things here and there. - n_add-Mesa-headers-again.patch * add Mesa headers again despite of building it against libglvnd; those headers turned out not to be usable; in addition packaging headers with libglvnd make dependancies problematic ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=890 --- Mesa-drivers.changes | 16 ++++++++++++++++ Mesa-drivers.spec | 6 ++++-- Mesa.changes | 16 ++++++++++++++++ Mesa.spec | 6 ++++-- mesa-19.2.1.tar.xz | 3 --- mesa-19.2.1.tar.xz.sig | Bin 119 -> 0 bytes mesa-19.2.2.tar.xz | 3 +++ mesa-19.2.2.tar.xz.sig | Bin 0 -> 119 bytes n_add-Mesa-headers-again.patch | 19 +++++++++++++++++++ 9 files changed, 62 insertions(+), 7 deletions(-) delete mode 100644 mesa-19.2.1.tar.xz delete mode 100644 mesa-19.2.1.tar.xz.sig create mode 100644 mesa-19.2.2.tar.xz create mode 100644 mesa-19.2.2.tar.xz.sig create mode 100644 n_add-Mesa-headers-again.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 35d6e9e..6cd602c 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Oct 25 19:35:23 UTC 2019 - Stefan Dirsch + +- Update to version 19.2.2 + * assortment of fixes in this release, notably a bunch of work + to get Solaris and illumos working with mesa, as well as more + work fixing issues in the migration of package-config and + headers being handled by libglvnd instead of mesa when mesa + is built with support for glvnd. + There's bunch of other changes here, with radv and intel + leading the pack, otherwise just a few things here and there. +- n_add-Mesa-headers-again.patch + * add Mesa headers again despite of building it against libglvnd; + those headers turned out not to be usable; in addition packaging + headers with libglvnd make dependancies problematic ... + ------------------------------------------------------------------- Mon Oct 14 10:23:51 UTC 2019 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 4835a51..864327d 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 19.2.1 +%define _version 19.2.2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -110,7 +110,7 @@ %endif Name: Mesa-drivers -Version: 19.2.1 +Version: 19.2.2 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -125,6 +125,7 @@ Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring Patch1: n_opencl_dep_libclang.patch +Patch2: n_add-Mesa-headers-again.patch # never to be upstreamed Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch @@ -732,6 +733,7 @@ if test $(llvm-config --version | cut -d "." -f1) -ge 9; then %patch1 -p1 fi %endif +%patch2 -p1 %patch54 -p1 %patch58 -p1 diff --git a/Mesa.changes b/Mesa.changes index 35d6e9e..6cd602c 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Oct 25 19:35:23 UTC 2019 - Stefan Dirsch + +- Update to version 19.2.2 + * assortment of fixes in this release, notably a bunch of work + to get Solaris and illumos working with mesa, as well as more + work fixing issues in the migration of package-config and + headers being handled by libglvnd instead of mesa when mesa + is built with support for glvnd. + There's bunch of other changes here, with radv and intel + leading the pack, otherwise just a few things here and there. +- n_add-Mesa-headers-again.patch + * add Mesa headers again despite of building it against libglvnd; + those headers turned out not to be usable; in addition packaging + headers with libglvnd make dependancies problematic ... + ------------------------------------------------------------------- Mon Oct 14 10:23:51 UTC 2019 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index afa574d..6355d46 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 19.2.1 +%define _version 19.2.2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -109,7 +109,7 @@ %endif Name: Mesa -Version: 19.2.1 +Version: 19.2.2 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -124,6 +124,7 @@ Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring Patch1: n_opencl_dep_libclang.patch +Patch2: n_add-Mesa-headers-again.patch # never to be upstreamed Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch @@ -731,6 +732,7 @@ if test $(llvm-config --version | cut -d "." -f1) -ge 9; then %patch1 -p1 fi %endif +%patch2 -p1 %patch54 -p1 %patch58 -p1 diff --git a/mesa-19.2.1.tar.xz b/mesa-19.2.1.tar.xz deleted file mode 100644 index 865cc74..0000000 --- a/mesa-19.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4cc53ca1a8d12c6ff0e5ea44a5213c05c88447ab50d7e28bb350cd29199f01e9 -size 11468492 diff --git a/mesa-19.2.1.tar.xz.sig b/mesa-19.2.1.tar.xz.sig deleted file mode 100644 index 244b1248eaafdd7f342e463f7f1b7726ec23523b6e16ee9196c336238dce6f4a..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7r6gyAoIRh7`08HdwF2i4e z*UQiCs}RUE5#ADdpJ#W&Gyb!JCk=BAHoQA}tYy;vUyKax$Knod_sz06eZ0TCOuVvJ Vch|$UK}%n3Y;69qdBMx0TmaqNIG_Lk diff --git a/mesa-19.2.2.tar.xz b/mesa-19.2.2.tar.xz new file mode 100644 index 0000000..43f8f29 --- /dev/null +++ b/mesa-19.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e4f0e2678bfcf3b94f533078b514f37943378a4a8604e477c888ec8a2904394 +size 11456352 diff --git a/mesa-19.2.2.tar.xz.sig b/mesa-19.2.2.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..49deb8f3f9a794a9d71bfd2b7a011e42dbd0290403a28131e493a13fcc66d030 GIT binary patch literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7r6ua@FGy@l>08FIbh2fvc z<4WF^J*#r%UaXJs=t*a4IB4 literal 0 HcmV?d00001 diff --git a/n_add-Mesa-headers-again.patch b/n_add-Mesa-headers-again.patch new file mode 100644 index 0000000..1499e01 --- /dev/null +++ b/n_add-Mesa-headers-again.patch @@ -0,0 +1,19 @@ +diff -u -r mesa-19.2.2.orig/include/meson.build mesa-19.2.2/include/meson.build +--- mesa-19.2.2.orig/include/meson.build 2019-10-25 21:55:51.441084000 +0200 ++++ mesa-19.2.2/include/meson.build 2019-10-25 21:58:07.781272000 +0200 +@@ -22,7 +22,6 @@ + inc_d3d9 = include_directories('D3D9') + inc_haikugl = include_directories('HaikuGL') + +-if not glvnd_has_headers_and_pc_files + if with_gles1 or with_gles2 or with_opengl or with_egl + install_headers('KHR/khrplatform.h', subdir : 'KHR') + endif +@@ -78,7 +77,6 @@ + subdir : 'EGL', + ) + endif +-endif + + # Non-upstream headers + if with_egl From 8e8c121fa35e47953a87d49f3ea5947c2ad5c5da41f34bfbe1f0e575c15f15c9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 1 Nov 2019 19:00:41 +0000 Subject: [PATCH 2/2] Accepting request 744798 from home:aaronpuchert:branches:X11:XOrg - Use %pkg_vcmp macro instead of llvm-config to detect LLVM 9. OBS-URL: https://build.opensuse.org/request/show/744798 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=891 --- Mesa-drivers.changes | 5 +++++ Mesa-drivers.spec | 4 ++-- Mesa.changes | 5 +++++ Mesa.spec | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 6cd602c..18038f2 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 1 17:07:44 UTC 2019 - Aaron Puchert + +- Use %pkg_vcmp macro instead of llvm-config to detect LLVM 9. + ------------------------------------------------------------------- Fri Oct 25 19:35:23 UTC 2019 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 864327d..fca9a45 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -729,9 +729,9 @@ programs against the XA state tracker. rm -rf docs/README.{VMS,WIN32,OS2} %if 0%{with_llvm} -if test $(llvm-config --version | cut -d "." -f1) -ge 9; then +%if %{pkg_vcmp llvm-devel >= 9.0} %patch1 -p1 -fi +%endif %endif %patch2 -p1 %patch54 -p1 diff --git a/Mesa.changes b/Mesa.changes index 6cd602c..18038f2 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 1 17:07:44 UTC 2019 - Aaron Puchert + +- Use %pkg_vcmp macro instead of llvm-config to detect LLVM 9. + ------------------------------------------------------------------- Fri Oct 25 19:35:23 UTC 2019 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 6355d46..5b2f399 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -728,9 +728,9 @@ programs against the XA state tracker. rm -rf docs/README.{VMS,WIN32,OS2} %if 0%{with_llvm} -if test $(llvm-config --version | cut -d "." -f1) -ge 9; then +%if %{pkg_vcmp llvm-devel >= 9.0} %patch1 -p1 -fi +%endif %endif %patch2 -p1 %patch54 -p1