From e595e9fd26143309b670b1b09f1bc7721505e85bd2d1f91f0fdb433bb111d375 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 3 Jun 2020 10:30:17 +0000 Subject: [PATCH 1/6] - baselibs.conf: added pkgconfig files to 32bit devel packages (boo#1172302) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=961 --- Mesa-drivers.changes | 6 ++++++ Mesa.changes | 6 ++++++ baselibs.conf | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 71fd498..8ff4b34 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 3 10:28:03 UTC 2020 - Stefan Dirsch + +- baselibs.conf: added pkgconfig files to 32bit devel packages + (boo#1172302) + ------------------------------------------------------------------- Tue May 19 19:22:02 UTC 2020 - Martin Liška diff --git a/Mesa.changes b/Mesa.changes index 71fd498..8ff4b34 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 3 10:28:03 UTC 2020 - Stefan Dirsch + +- baselibs.conf: added pkgconfig files to 32bit devel packages + (boo#1172302) + ------------------------------------------------------------------- Tue May 19 19:22:02 UTC 2020 - Martin Liška diff --git a/baselibs.conf b/baselibs.conf index 07f377d..c676b77 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -13,6 +13,9 @@ Mesa requires "Mesa-gallium- = " Mesa-devel + # Include this special README file so dummy Mesa- gets + # build and other arch packages can supplement it. + +/usr/share/doc/packages/Mesa/README.package.* #We need Mesa-!, do not put requires -Mesa-. requires "Mesa- = " requires "Mesa-libEGL-devel- = " @@ -35,6 +38,7 @@ Mesa-libEGL-devel requires "Mesa-libEGL1- = " requires "Mesa-KHR-devel- = " requires "libglvnd-devel- >= 0.1.0" + +/usr/lib*/pkgconfig/egl.pc Mesa-libGL1 requires "Mesa- = " requires "libglvnd- >= 0.1.0" @@ -42,6 +46,8 @@ Mesa-libGL-devel requires "Mesa-libGL1- = " requires "Mesa-KHR-devel- = " requires "libglvnd-devel- >= 0.1.0" + +/usr/lib*/pkgconfig/gl.pc + Mesa-libGLESv1_CM1 requires "libglvnd- >= 0.1.0" Mesa-libGLESv1_CM-devel @@ -56,6 +62,7 @@ Mesa-libGLESv2-devel requires "Mesa-libGLESv2-2- = " requires "Mesa-KHR-devel- = " requires "libglvnd-devel- >= 0.1.0" + +/usr/lib/pkgconfig/glesv2.pc Mesa-libGLESv3-devel requires "Mesa-libEGL-devel- = " requires "Mesa-KHR-devel- = " From 10f764d0bfed9be9fc8feb2b407cd1b5b713facc4171d00870e62b6153182867 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 3 Jun 2020 14:28:40 +0000 Subject: [PATCH 2/6] - update to 20.1.0 * first release for the 20.1 branch * One already known issue is that Unreal Engine 4 has a bug in its usage of glDrawRangeElements() causing it to be called with a number of vertices in place of the `end` parameter, that was recently revealed. This is an annoying bug that we haven't worked around yet. For more details: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2917 - supersedes U_add-lifetime-dse-fix.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=962 --- Mesa-drivers.changes | 13 ++++++++ Mesa-drivers.spec | 8 ++--- Mesa.changes | 13 ++++++++ Mesa.keyring | 56 +++++++++++++++++++++++++++++++++++ Mesa.spec | 8 ++--- U_add-lifetime-dse-fix.patch | 46 ---------------------------- mesa-20.0.7.tar.xz | 3 -- mesa-20.0.7.tar.xz.sig | Bin 119 -> 0 bytes mesa-20.1.0.tar.xz | 3 ++ mesa-20.1.0.tar.xz.asc | 6 ++++ 10 files changed, 97 insertions(+), 59 deletions(-) delete mode 100644 U_add-lifetime-dse-fix.patch delete mode 100644 mesa-20.0.7.tar.xz delete mode 100644 mesa-20.0.7.tar.xz.sig create mode 100644 mesa-20.1.0.tar.xz create mode 100644 mesa-20.1.0.tar.xz.asc diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 8ff4b34..7e136f5 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jun 3 10:43:06 UTC 2020 - Stefan Dirsch + +- update to 20.1.0 + * first release for the 20.1 branch + * One already known issue is that Unreal Engine 4 has a bug in + its usage of glDrawRangeElements() causing it to be called + with a number of vertices in place of the `end` parameter, + that was recently revealed. This is an annoying bug that we + haven't worked around yet. For more details: + https://gitlab.freedesktop.org/mesa/mesa/-/issues/2917 +- supersedes U_add-lifetime-dse-fix.patch + ------------------------------------------------------------------- Wed Jun 3 10:28:03 UTC 2020 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 26c1f0b..de98748 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -46,7 +46,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 20.0.7 +%define _version 20.1.0 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -114,7 +114,7 @@ %endif Name: Mesa-drivers -Version: 20.0.7 +Version: 20.1.0 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -122,14 +122,13 @@ Group: System/Libraries URL: http://www.mesa3d.org #Git-Clone: git://anongit.freedesktop.org/mesa/mesa Source: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz -Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.sig +Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.asc Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring Patch2: n_add-Mesa-headers-again.patch -Patch3: U_add-lifetime-dse-fix.patch # never to be upstreamed Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch @@ -737,7 +736,6 @@ programs against the XA state tracker. rm -rf docs/README.{VMS,WIN32,OS2} %patch2 -p1 -%patch3 -p1 %patch54 -p1 %patch58 -p1 diff --git a/Mesa.changes b/Mesa.changes index 8ff4b34..7e136f5 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jun 3 10:43:06 UTC 2020 - Stefan Dirsch + +- update to 20.1.0 + * first release for the 20.1 branch + * One already known issue is that Unreal Engine 4 has a bug in + its usage of glDrawRangeElements() causing it to be called + with a number of vertices in place of the `end` parameter, + that was recently revealed. This is an annoying bug that we + haven't worked around yet. For more details: + https://gitlab.freedesktop.org/mesa/mesa/-/issues/2917 +- supersedes U_add-lifetime-dse-fix.patch + ------------------------------------------------------------------- Wed Jun 3 10:28:03 UTC 2020 - Stefan Dirsch diff --git a/Mesa.keyring b/Mesa.keyring index 4adf4a6..9d2bf57 100644 --- a/Mesa.keyring +++ b/Mesa.keyring @@ -6103,3 +6103,59 @@ xcpz2ss3mMU5+YnY69T1EBemZIMcE17wPo7ROvT8x1fG2fnPwHqJieQFCMGKLW29 5peUY2OiHdLgaepbqWrB2Xxy+BY+ =rSFv -----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=/3PQ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/Mesa.spec b/Mesa.spec index 66631c5..fbab85a 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -45,7 +45,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 20.0.7 +%define _version 20.1.0 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -113,7 +113,7 @@ %endif Name: Mesa -Version: 20.0.7 +Version: 20.1.0 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -121,14 +121,13 @@ Group: System/Libraries URL: http://www.mesa3d.org #Git-Clone: git://anongit.freedesktop.org/mesa/mesa Source: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz -Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.sig +Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.asc Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring Patch2: n_add-Mesa-headers-again.patch -Patch3: U_add-lifetime-dse-fix.patch # never to be upstreamed Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch @@ -736,7 +735,6 @@ programs against the XA state tracker. rm -rf docs/README.{VMS,WIN32,OS2} %patch2 -p1 -%patch3 -p1 %patch54 -p1 %patch58 -p1 diff --git a/U_add-lifetime-dse-fix.patch b/U_add-lifetime-dse-fix.patch deleted file mode 100644 index ae8f4dd..0000000 --- a/U_add-lifetime-dse-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9a72afaea7bf69f07623cae1af99f71be64688ba Mon Sep 17 00:00:00 2001 -From: Danylo Piliaiev -Date: Tue, 19 May 2020 20:35:49 +0300 -Subject: [PATCH] meson: Disable GCC's dead store elimination for memory - zeroing custom new - -Some classes use custom new operator which zeroes memory, however gcc does -aggressive dead-store elimination which threats all writes to the memory -before the constructor as "dead stores". - -For now we disable this optimization. - -The new operators in question are declared via: - DECLARE_RZALLOC_CXX_OPERATORS - DECLARE_LINEAR_ZALLOC_CXX_OPERATORS - -The issue was found with lto builds, however there is no guarantee that -it didn't happen with ordinary ones. - -CC: -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2977 -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1358 -Signed-off-by: Danylo Piliaiev ---- - meson.build | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/meson.build b/meson.build -index 1a207842c55..3d4ea165c99 100644 ---- a/meson.build -+++ b/meson.build -@@ -980,6 +980,11 @@ else - '-fno-math-errno', - '-fno-trapping-math', - '-Qunused-arguments', -+ # Some classes use custom new operator which zeroes memory, however -+ # gcc does aggressive dead-store elimination which threats all writes -+ # to the memory before the constructor as "dead stores". -+ # For now we disable this optimization. -+ '-flifetime-dse=1', - ] - # MinGW chokes on format specifiers and I can't get it all working - if not (cc.get_id() == 'gcc' and host_machine.system() == 'windows') --- -2.26.2 - diff --git a/mesa-20.0.7.tar.xz b/mesa-20.0.7.tar.xz deleted file mode 100644 index 3b9fdd9..0000000 --- a/mesa-20.0.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe6e258fe772c3cd2ac01741bf7408058c3ac02d66acff9a6e669bd72e3ea178 -size 12308160 diff --git a/mesa-20.0.7.tar.xz.sig b/mesa-20.0.7.tar.xz.sig deleted file mode 100644 index c411d7284b9d449bcfd2fd752ae9e3319c008a2fee4dc3f8a8fc391f3ca86f88..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7r6t}l>4Feaa08C`feMW{0 z_a{&PS8{?ui0R5InQ3Kj*GTX6(utnZzxmmfKc~-3xyA5LbA=P@u1Gb`2%$$RcfG8q VcWR_~{xZ{3nOG%pUigGDGXUE=G&2AI diff --git a/mesa-20.1.0.tar.xz b/mesa-20.1.0.tar.xz new file mode 100644 index 0000000..26c8696 --- /dev/null +++ b/mesa-20.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2109055d7660514fc4c1bcd861bcba9db00c026119ae222720111732dba27c83 +size 12661712 diff --git a/mesa-20.1.0.tar.xz.asc b/mesa-20.1.0.tar.xz.asc new file mode 100644 index 0000000..cac34fd --- /dev/null +++ b/mesa-20.1.0.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQ4vpH8xyVct8TrURgWoPC7DdhhbQUCXteufgAKCRAWoPC7Ddhh +beP8AKC7U9mksMEVdN1HL4MY6BoaXqTHHACeOn2Kd6qcZ3/eviVTNTnrJe5ATCY= +=xG3A +-----END PGP SIGNATURE----- From f3e1fdcf0427aa8428d2aef22f7a8b62ddb69cd5e1b3707b96d014405a182180 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 3 Jun 2020 16:14:19 +0000 Subject: [PATCH 3/6] back to upstream signature (meanwhile updated with the correct key) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=963 --- Mesa-drivers.spec | 2 +- Mesa.spec | 2 +- mesa-20.1.0.tar.xz.asc | 6 ------ mesa-20.1.0.tar.xz.sig | Bin 0 -> 329 bytes 4 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 mesa-20.1.0.tar.xz.asc create mode 100644 mesa-20.1.0.tar.xz.sig diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index de98748..a34eaea 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -122,7 +122,7 @@ Group: System/Libraries URL: http://www.mesa3d.org #Git-Clone: git://anongit.freedesktop.org/mesa/mesa Source: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz -Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.asc +Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.sig Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 diff --git a/Mesa.spec b/Mesa.spec index fbab85a..ce1b7bd 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -121,7 +121,7 @@ Group: System/Libraries URL: http://www.mesa3d.org #Git-Clone: git://anongit.freedesktop.org/mesa/mesa Source: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz -Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.asc +Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.sig Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 diff --git a/mesa-20.1.0.tar.xz.asc b/mesa-20.1.0.tar.xz.asc deleted file mode 100644 index cac34fd..0000000 --- a/mesa-20.1.0.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQQ4vpH8xyVct8TrURgWoPC7DdhhbQUCXteufgAKCRAWoPC7Ddhh -beP8AKC7U9mksMEVdN1HL4MY6BoaXqTHHACeOn2Kd6qcZ3/eviVTNTnrJe5ATCY= -=xG3A ------END PGP SIGNATURE----- diff --git a/mesa-20.1.0.tar.xz.sig b/mesa-20.1.0.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..42c04547797ad2ac5aa70405b23601cea5e1fed8a1eafa0cd1cada2a5b62ebcb GIT binary patch literal 329 zcmV-P0k-~$0Y(G>0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0$$g()e;b98cVZ7ySI0162ZjgB#|!z3uCJDmsrcKj-lYh8h^($=At7l;*$5IKkmMMNVr zBTW`8$QQy0%8-L0>?FRv0B|6M`%^Jotx0yO2P{aH#p^G!YeelO%<_!SdMhiU+V=qC z5U>StE)$Y%vbMYZhLY~+&Hy_^Q{Aj(4R4(1%sE=pn(d)Qf=c^ef(u3fK_pOSbU(T-WM3t@kl>b_D8=fYHH%wg!pAF3PiRYar=(Nnn;b2|RM*{OU28X+>ITAhvr b!mo^Tm*kxtt6_3f$^r`|3Z5~RVHf Date: Mon, 15 Jun 2020 12:29:08 +0000 Subject: [PATCH 4/6] Reverted baselibs.conf changes needed for Wine 32bit development, since these caused regressions. (boo#1172302) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=964 --- Mesa-drivers.changes | 6 ------ Mesa.changes | 6 ------ Mesa.spec | 2 ++ baselibs.conf | 14 +++++++------- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 7e136f5..1127cdb 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -11,12 +11,6 @@ Wed Jun 3 10:43:06 UTC 2020 - Stefan Dirsch https://gitlab.freedesktop.org/mesa/mesa/-/issues/2917 - supersedes U_add-lifetime-dse-fix.patch -------------------------------------------------------------------- -Wed Jun 3 10:28:03 UTC 2020 - Stefan Dirsch - -- baselibs.conf: added pkgconfig files to 32bit devel packages - (boo#1172302) - ------------------------------------------------------------------- Tue May 19 19:22:02 UTC 2020 - Martin Liška diff --git a/Mesa.changes b/Mesa.changes index 7e136f5..1127cdb 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -11,12 +11,6 @@ Wed Jun 3 10:43:06 UTC 2020 - Stefan Dirsch https://gitlab.freedesktop.org/mesa/mesa/-/issues/2917 - supersedes U_add-lifetime-dse-fix.patch -------------------------------------------------------------------- -Wed Jun 3 10:28:03 UTC 2020 - Stefan Dirsch - -- baselibs.conf: added pkgconfig files to 32bit devel packages - (boo#1172302) - ------------------------------------------------------------------- Tue May 19 19:22:02 UTC 2020 - Martin Liška diff --git a/Mesa.spec b/Mesa.spec index ce1b7bd..06b45a2 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -919,6 +919,8 @@ done %if !%{drivers} # Use dummy README file that can be included in both Mesa and Mesa-32bit. This way Mesa-32bit will be build (otherwise it would be skipped as empty) and it can be used by the other *-32bit packages. echo "The \"Mesa\" package does not have the ability to render, but is supplemented by \"Mesa-dri\" and \"Mesa-gallium\" which contain the drivers for rendering" > docs/README.package.%{_arch} +echo "The -32bit version of Mesa-libGLESv2-2 on x86-64 is just a dummy package, so it can be required by other packages" > docs/README.Mesa-libGLESv2-2 +echo "The -32bit version of Mesa-KHR-devel on x86-64 is just a dummy package, so it can be required by other packages" > docs/README.Mesa-KHR-devel %endif %post -p /sbin/ldconfig diff --git a/baselibs.conf b/baselibs.conf index c676b77..8d042d6 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -13,9 +13,6 @@ Mesa requires "Mesa-gallium- = " Mesa-devel - # Include this special README file so dummy Mesa- gets - # build and other arch packages can supplement it. - +/usr/share/doc/packages/Mesa/README.package.* #We need Mesa-!, do not put requires -Mesa-. requires "Mesa- = " requires "Mesa-libEGL-devel- = " @@ -38,7 +35,6 @@ Mesa-libEGL-devel requires "Mesa-libEGL1- = " requires "Mesa-KHR-devel- = " requires "libglvnd-devel- >= 0.1.0" - +/usr/lib*/pkgconfig/egl.pc Mesa-libGL1 requires "Mesa- = " requires "libglvnd- >= 0.1.0" @@ -46,8 +42,6 @@ Mesa-libGL-devel requires "Mesa-libGL1- = " requires "Mesa-KHR-devel- = " requires "libglvnd-devel- >= 0.1.0" - +/usr/lib*/pkgconfig/gl.pc - Mesa-libGLESv1_CM1 requires "libglvnd- >= 0.1.0" Mesa-libGLESv1_CM-devel @@ -56,16 +50,22 @@ Mesa-libGLESv1_CM-devel requires "Mesa-KHR-devel- = " requires "libglvnd-devel- >= 0.1.0" Mesa-libGLESv2-2 + # Include this special README file so dummy package + # gets build and other arch packages can require it. + +/usr/share/doc/packages/Mesa/README.Mesa-libGLESv2-2 requires "libglvnd- >= 0.1.0" Mesa-libGLESv2-devel requires "Mesa-libEGL-devel- = " requires "Mesa-libGLESv2-2- = " requires "Mesa-KHR-devel- = " requires "libglvnd-devel- >= 0.1.0" - +/usr/lib/pkgconfig/glesv2.pc Mesa-libGLESv3-devel requires "Mesa-libEGL-devel- = " requires "Mesa-KHR-devel- = " +Mesa-KHR-devel + # Include this special README file so dummy package + # gets build and other arch packages can require it. + +/usr/share/doc/packages/Mesa/README.Mesa-KHR-devel libOSMesa8 obsoletes "libOSMesa9- < " provides "libOSMesa9- = " From 270637e8e74bd68abc4bd443de198fb934ba8e74566c34181f8c0359b97b31b7 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 15 Jun 2020 13:04:13 +0000 Subject: [PATCH 5/6] - update to 20.1.1 * first bugfix release for the 20.1 branch * fixes issue affecting Unreal Engine 4 games on i965 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=965 --- Mesa-drivers.changes | 7 +++++++ Mesa-drivers.spec | 4 ++-- Mesa.changes | 7 +++++++ Mesa.spec | 6 ++---- mesa-20.1.0.tar.xz | 3 --- mesa-20.1.0.tar.xz.sig | Bin 329 -> 0 bytes mesa-20.1.1.tar.xz | 3 +++ mesa-20.1.1.tar.xz.sig | Bin 0 -> 329 bytes 8 files changed, 21 insertions(+), 9 deletions(-) delete mode 100644 mesa-20.1.0.tar.xz delete mode 100644 mesa-20.1.0.tar.xz.sig create mode 100644 mesa-20.1.1.tar.xz create mode 100644 mesa-20.1.1.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 1127cdb..9973358 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 15 12:31:13 UTC 2020 - Stefan Dirsch + +- update to 20.1.1 + * first bugfix release for the 20.1 branch + * fixes issue affecting Unreal Engine 4 games on i965 + ------------------------------------------------------------------- Wed Jun 3 10:43:06 UTC 2020 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index a34eaea..d3ab874 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -46,7 +46,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 20.1.0 +%define _version 20.1.1 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -114,7 +114,7 @@ %endif Name: Mesa-drivers -Version: 20.1.0 +Version: 20.1.1 Release: 0 Summary: System for rendering 3-D graphics License: MIT diff --git a/Mesa.changes b/Mesa.changes index 1127cdb..9973358 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 15 12:31:13 UTC 2020 - Stefan Dirsch + +- update to 20.1.1 + * first bugfix release for the 20.1 branch + * fixes issue affecting Unreal Engine 4 games on i965 + ------------------------------------------------------------------- Wed Jun 3 10:43:06 UTC 2020 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 06b45a2..29007f4 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -45,7 +45,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 20.1.0 +%define _version 20.1.1 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -113,7 +113,7 @@ %endif Name: Mesa -Version: 20.1.0 +Version: 20.1.1 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -919,8 +919,6 @@ done %if !%{drivers} # Use dummy README file that can be included in both Mesa and Mesa-32bit. This way Mesa-32bit will be build (otherwise it would be skipped as empty) and it can be used by the other *-32bit packages. echo "The \"Mesa\" package does not have the ability to render, but is supplemented by \"Mesa-dri\" and \"Mesa-gallium\" which contain the drivers for rendering" > docs/README.package.%{_arch} -echo "The -32bit version of Mesa-libGLESv2-2 on x86-64 is just a dummy package, so it can be required by other packages" > docs/README.Mesa-libGLESv2-2 -echo "The -32bit version of Mesa-KHR-devel on x86-64 is just a dummy package, so it can be required by other packages" > docs/README.Mesa-KHR-devel %endif %post -p /sbin/ldconfig diff --git a/mesa-20.1.0.tar.xz b/mesa-20.1.0.tar.xz deleted file mode 100644 index 26c8696..0000000 --- a/mesa-20.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2109055d7660514fc4c1bcd861bcba9db00c026119ae222720111732dba27c83 -size 12661712 diff --git a/mesa-20.1.0.tar.xz.sig b/mesa-20.1.0.tar.xz.sig deleted file mode 100644 index 42c04547797ad2ac5aa70405b23601cea5e1fed8a1eafa0cd1cada2a5b62ebcb..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmV-P0k-~$0Y(G>0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0$$g()e;b98cVZ7ySI0162ZjgB#|!z3uCJDmsrcKj-lYh8h^($=At7l;*$5IKkmMMNVr zBTW`8$QQy0%8-L0>?FRv0B|6M`%^Jotx0yO2P{aH#p^G!YeelO%<_!SdMhiU+V=qC z5U>StE)$Y%vbMYZhLY~+&Hy_^Q{Aj(4R4(1%sE=pn(d)Qf=c^ef(u3fK_pOSbU(T-WM3t@kl>b_D8=fYHH%wg!pAF3PiRYar=(Nnn;b2|RM*{OU28X+>ITAhvr b!mo^Tm*kxtt6_3f$^r`|3Z5~RVHf0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0$$-G9}*m8a%p2g zWo~C>b98cVZ7ySI0162ZjgB#|!z3uCl;H>eN-2E2vQHb)ilpfr!dmwk%>I<>c$bZo zVwcBbHR+w*#H;ven9c0QmizB{ja*6U_KYa>KgE1zC^3%!_1c}io}SsLuH3v_d2a17E_d*IHB|^gmRC6c5(_w95g1Fl;OTx13-5=`QjI zoPQOi{P8YU3P3F}^0RlVH>Fe3H%Xj&5eCzXvc>tFQ!$N%vpNGn8Op&8+zAt^SELI! z3$)PMhq-h3Z=$}4gmNvjC(|N6AYH|{6ps;IcS^ULj8U&~z-F2`p=hGBZuZtlzyCl3 bF53zJ1@B Date: Mon, 15 Jun 2020 15:57:21 +0000 Subject: [PATCH 6/6] removed changes in baselibs.conf, which got it accidently ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=966 --- baselibs.conf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 8d042d6..07f377d 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -50,9 +50,6 @@ Mesa-libGLESv1_CM-devel requires "Mesa-KHR-devel- = " requires "libglvnd-devel- >= 0.1.0" Mesa-libGLESv2-2 - # Include this special README file so dummy package - # gets build and other arch packages can require it. - +/usr/share/doc/packages/Mesa/README.Mesa-libGLESv2-2 requires "libglvnd- >= 0.1.0" Mesa-libGLESv2-devel requires "Mesa-libEGL-devel- = " @@ -62,10 +59,6 @@ Mesa-libGLESv2-devel Mesa-libGLESv3-devel requires "Mesa-libEGL-devel- = " requires "Mesa-KHR-devel- = " -Mesa-KHR-devel - # Include this special README file so dummy package - # gets build and other arch packages can require it. - +/usr/share/doc/packages/Mesa/README.Mesa-KHR-devel libOSMesa8 obsoletes "libOSMesa9- < " provides "libOSMesa9- = "