diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 35d6e9e..18038f2 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 + +- 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..fca9a45 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 @@ -728,10 +729,11 @@ 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 %patch58 -p1 diff --git a/Mesa.changes b/Mesa.changes index 35d6e9e..18038f2 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 + +- 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..5b2f399 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 @@ -727,10 +728,11 @@ 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 %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 244b124..0000000 Binary files a/mesa-19.2.1.tar.xz.sig and /dev/null differ 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 0000000..49deb8f Binary files /dev/null and b/mesa-19.2.2.tar.xz.sig differ 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