From cc4d38bc1b2b9ecabba84fe55cdad8b9caba925c8a2f28d2e21ed2ededf7fc1f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 22 Aug 2020 20:49:44 +0000 Subject: [PATCH 1/2] Accepting request 824684 from home:dimstar:Factory This should address the issues reported for Staging:B https://build.opensuse.org/package/view_file/home:repo-checker/reports/openSUSE:Factory:Staging:B - baselibs.conf: + Require Mesa-KHR-devel instead of Mesa-KHR-devel-: KHR-devel consists only of header files there is thus no - flavor being generated. + Do not require Mesa-libGLESv1_CM1 and Mesa-libGLESv2-2 from their respective -32bit devel packages: with libglvnd defined to 0, the native packages are being generated, but are empty. For baselibs, this trick does not work and empty packages are being skipped. So we drop the dependency (with a note in the .spec to enable the deps when changing the defines). OBS-URL: https://build.opensuse.org/request/show/824684 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=982 --- Mesa-drivers.changes | 16 +++++++++++++++- Mesa-drivers.spec | 1 + Mesa.changes | 16 +++++++++++++++- Mesa.spec | 1 + baselibs.conf | 23 ++++++++++++++++------- 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 23cc7f4..7e50134 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Aug 6 11:51:25 UTC 2020 - Dominique Leuenberger + +- baselibs.conf: + + Require Mesa-KHR-devel instead of Mesa-KHR-devel-: + KHR-devel consists only of header files there is thus no + - flavor being generated. + + Do not require Mesa-libGLESv1_CM1 and Mesa-libGLESv2-2 from + their respective -32bit devel packages: with libglvnd defined + to 0, the native packages are being generated, but are empty. + For baselibs, this trick does not work and empty packages are + being skipped. So we drop the dependency (with a note in the + .spec to enable the deps when changing the defines). + ------------------------------------------------------------------- Thu Jul 23 12:24:37 UTC 2020 - Stefan Dirsch @@ -10,7 +24,7 @@ Fri Jul 10 08:43:49 UTC 2020 - Stefan Dirsch - update to 20.1.3 * third bugfix release for the 20.1 branch - * lots of updates to our testing infrastructure + * lots of updates to our testing infrastructure ------------------------------------------------------------------- Wed Jul 1 12:46:33 UTC 2020 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 4ba7972..36b39fc 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -38,6 +38,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the Mesa.spec! ##### %define drivers 1 +# when changing libglvnd to 1, ensure to enable the dependencies in baselibs.conf %define libglvnd 0 %if 0%{?suse_version} >= 1330 diff --git a/Mesa.changes b/Mesa.changes index 23cc7f4..7e50134 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Aug 6 11:51:25 UTC 2020 - Dominique Leuenberger + +- baselibs.conf: + + Require Mesa-KHR-devel instead of Mesa-KHR-devel-: + KHR-devel consists only of header files there is thus no + - flavor being generated. + + Do not require Mesa-libGLESv1_CM1 and Mesa-libGLESv2-2 from + their respective -32bit devel packages: with libglvnd defined + to 0, the native packages are being generated, but are empty. + For baselibs, this trick does not work and empty packages are + being skipped. So we drop the dependency (with a note in the + .spec to enable the deps when changing the defines). + ------------------------------------------------------------------- Thu Jul 23 12:24:37 UTC 2020 - Stefan Dirsch @@ -10,7 +24,7 @@ Fri Jul 10 08:43:49 UTC 2020 - Stefan Dirsch - update to 20.1.3 * third bugfix release for the 20.1 branch - * lots of updates to our testing infrastructure + * lots of updates to our testing infrastructure ------------------------------------------------------------------- Wed Jul 1 12:46:33 UTC 2020 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 0ed87b9..6250b46 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -37,6 +37,7 @@ %endif %define drivers 0 +# when changing libglvnd to 1, ensure to enable the dependencies in baselibs.conf %define libglvnd 0 %if 0%{?suse_version} >= 1330 diff --git a/baselibs.conf b/baselibs.conf index 07f377d..1135e75 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -33,32 +33,41 @@ Mesa-libEGL1 requires "libglvnd- >= 0.1.0" Mesa-libEGL-devel requires "Mesa-libEGL1- = " - requires "Mesa-KHR-devel- = " + # Mesa-KHR-devel contains only header files, so no - variant + requires "Mesa-KHR-devel = " requires "libglvnd-devel- >= 0.1.0" Mesa-libGL1 requires "Mesa- = " requires "libglvnd- >= 0.1.0" Mesa-libGL-devel requires "Mesa-libGL1- = " - requires "Mesa-KHR-devel- = " + # Mesa-KHR-devel contains only header files, so no - variant + requires "Mesa-KHR-devel = " requires "libglvnd-devel- >= 0.1.0" Mesa-libGLESv1_CM1 requires "libglvnd- >= 0.1.0" Mesa-libGLESv1_CM-devel requires "Mesa-libEGL-devel- = " - requires "Mesa-libGLESv1_CM1- = " - requires "Mesa-KHR-devel- = " + # Mesa-libGLESv1_CM1 is empty, unless libglvnd would be defined to 1 + # empty packages are skipped by baselibs generation, so we can't require it + #requires "Mesa-libGLESv1_CM1- = " + # Mesa-KHR-devel contains only header files, so no - variant + requires "Mesa-KHR-devel = " requires "libglvnd-devel- >= 0.1.0" Mesa-libGLESv2-2 requires "libglvnd- >= 0.1.0" Mesa-libGLESv2-devel requires "Mesa-libEGL-devel- = " - requires "Mesa-libGLESv2-2- = " - requires "Mesa-KHR-devel- = " + # Mesa-libGLESv2-2 is empty, unless libglvnd would be defined to 1 + # empty packages are skipped by baselibs generation, so we can't require it + #requires "Mesa-libGLESv2-2- = " + # Mesa-KHR-devel contains only header files, so no - variant + requires "Mesa-KHR-devel = " requires "libglvnd-devel- >= 0.1.0" Mesa-libGLESv3-devel requires "Mesa-libEGL-devel- = " - requires "Mesa-KHR-devel- = " + # Mesa-KHR-devel contains only header files, so no - variant + requires "Mesa-KHR-devel = " libOSMesa8 obsoletes "libOSMesa9- < " provides "libOSMesa9- = " From 39d3bee392e0f07488f9e9b30b73467799fceb52290980e1982fc889911bb5c5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sun, 23 Aug 2020 18:36:19 +0000 Subject: [PATCH 2/2] - update to 20.1.6 * sixth bugfix release for the 20.1 branch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=983 --- Mesa-drivers.changes | 6 ++++++ Mesa-drivers.spec | 4 ++-- Mesa.changes | 6 ++++++ Mesa.spec | 4 ++-- mesa-20.1.4.tar.xz | 3 --- mesa-20.1.4.tar.xz.sig | Bin 329 -> 0 bytes mesa-20.1.6.tar.xz | 3 +++ mesa-20.1.6.tar.xz.sig | Bin 0 -> 329 bytes 8 files changed, 19 insertions(+), 7 deletions(-) delete mode 100644 mesa-20.1.4.tar.xz delete mode 100644 mesa-20.1.4.tar.xz.sig create mode 100644 mesa-20.1.6.tar.xz create mode 100644 mesa-20.1.6.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 7e50134..93af539 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Aug 23 18:08:13 UTC 2020 - Stefan Dirsch + +- update to 20.1.6 + * sixth bugfix release for the 20.1 branch + ------------------------------------------------------------------- Thu Aug 6 11:51:25 UTC 2020 - Dominique Leuenberger diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 36b39fc..46467b1 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -47,7 +47,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 20.1.4 +%define _version 20.1.6 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -115,7 +115,7 @@ %endif Name: Mesa-drivers -Version: 20.1.4 +Version: 20.1.6 Release: 0 Summary: System for rendering 3-D graphics License: MIT diff --git a/Mesa.changes b/Mesa.changes index 7e50134..93af539 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Aug 23 18:08:13 UTC 2020 - Stefan Dirsch + +- update to 20.1.6 + * sixth bugfix release for the 20.1 branch + ------------------------------------------------------------------- Thu Aug 6 11:51:25 UTC 2020 - Dominique Leuenberger diff --git a/Mesa.spec b/Mesa.spec index 6250b46..3baec2f 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -46,7 +46,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 20.1.4 +%define _version 20.1.6 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -114,7 +114,7 @@ %endif Name: Mesa -Version: 20.1.4 +Version: 20.1.6 Release: 0 Summary: System for rendering 3-D graphics License: MIT diff --git a/mesa-20.1.4.tar.xz b/mesa-20.1.4.tar.xz deleted file mode 100644 index 1514375..0000000 --- a/mesa-20.1.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6800271c2be2a0447510eb4e9b67edd9521859a4d565310617c4b359eb6799fe -size 12758452 diff --git a/mesa-20.1.4.tar.xz.sig b/mesa-20.1.4.tar.xz.sig deleted file mode 100644 index eddd165b7b2d616262d955d84068e360028a32a1d94595c664840892536c4dcb..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmV-P0k-~$0Y(G>0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0$&)YsS+Gza%p2g zWo~C>b98cVZ7ySI0162ZjgB#|!z3uCzl{g~PSX$jYn^hoY-`15EDv!#$Els+E20F0 z%AmJP88O^5i`E|zqRDU<%|n5{3^C#T?z(Fn1F+48 z$Q{FdOuK$eeLnV^Wp|%n=r8K9Qpz%T=L3K%jugoKYJHY$F02}S##6~2eD6Ep$(rk> zXeB;z1_VgOCI8_?)lFFAQa(F88Ic4cISQv0q<^=3{cOhv=%>38CNhPZ2LsUAb<9o8 b`NKbvh0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0$)9t5)vF`a%p2g zWo~C>b98cVZ7ySI0162ZjgB#|!z3uC^UnwXq&9`awX=JlOHs&(WWYLSr!^nCrBB|*sshiy)|L%Vb9xW zF6Ne0*hC7CbH_^4)MeORJAp>a@}%Oe%(A-S3!-H;vLJc z$m~_kj=mxj+K{!({jN3?1U&vmJdLW!vt6vhz_ETG$OHMnv-Jz4k=hpf{M|doD(Uk{ zo`#w~HOlCL`xGI}kO%yrg@VqW_A)3yy6g