Accepting request 828816 from X11:XOrg

- update to 20.1.6
  * sixth bugfix release for the 20.1 branch 

- baselibs.conf:
  + Require Mesa-KHR-devel instead of Mesa-KHR-devel-<targettype>:
    KHR-devel consists only of header files there is thus no
    -<targettype> 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).

  * lots of updates to our testing infrastructure

OBS-URL: https://build.opensuse.org/request/show/828816
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=389
This commit is contained in:
Dominique Leuenberger 2020-08-25 07:32:08 +00:00 committed by Git OBS Bridge
commit f8e740d415
9 changed files with 67 additions and 16 deletions

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Sun Aug 23 18:08:13 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- update to 20.1.6
* sixth bugfix release for the 20.1 branch
-------------------------------------------------------------------
Thu Aug 6 11:51:25 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- baselibs.conf:
+ Require Mesa-KHR-devel instead of Mesa-KHR-devel-<targettype>:
KHR-devel consists only of header files there is thus no
-<targettype> 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 <sndirsch@suse.com>
@ -10,7 +30,7 @@ Fri Jul 10 08:43:49 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com>

View File

@ -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
@ -46,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
@ -114,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

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Sun Aug 23 18:08:13 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- update to 20.1.6
* sixth bugfix release for the 20.1 branch
-------------------------------------------------------------------
Thu Aug 6 11:51:25 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- baselibs.conf:
+ Require Mesa-KHR-devel instead of Mesa-KHR-devel-<targettype>:
KHR-devel consists only of header files there is thus no
-<targettype> 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 <sndirsch@suse.com>
@ -10,7 +30,7 @@ Fri Jul 10 08:43:49 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com>

View File

@ -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
@ -45,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
@ -113,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

View File

@ -33,32 +33,41 @@ Mesa-libEGL1
requires "libglvnd-<targettype> >= 0.1.0"
Mesa-libEGL-devel
requires "Mesa-libEGL1-<targettype> = <version>"
requires "Mesa-KHR-devel-<targettype> = <version>"
# Mesa-KHR-devel contains only header files, so no -<targettype> variant
requires "Mesa-KHR-devel = <version>"
requires "libglvnd-devel-<targettype> >= 0.1.0"
Mesa-libGL1
requires "Mesa-<targettype> = <version>"
requires "libglvnd-<targettype> >= 0.1.0"
Mesa-libGL-devel
requires "Mesa-libGL1-<targettype> = <version>"
requires "Mesa-KHR-devel-<targettype> = <version>"
# Mesa-KHR-devel contains only header files, so no -<targettype> variant
requires "Mesa-KHR-devel = <version>"
requires "libglvnd-devel-<targettype> >= 0.1.0"
Mesa-libGLESv1_CM1
requires "libglvnd-<targettype> >= 0.1.0"
Mesa-libGLESv1_CM-devel
requires "Mesa-libEGL-devel-<targettype> = <version>"
requires "Mesa-libGLESv1_CM1-<targettype> = <version>"
requires "Mesa-KHR-devel-<targettype> = <version>"
# 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-<targettype> = <version>"
# Mesa-KHR-devel contains only header files, so no -<targettype> variant
requires "Mesa-KHR-devel = <version>"
requires "libglvnd-devel-<targettype> >= 0.1.0"
Mesa-libGLESv2-2
requires "libglvnd-<targettype> >= 0.1.0"
Mesa-libGLESv2-devel
requires "Mesa-libEGL-devel-<targettype> = <version>"
requires "Mesa-libGLESv2-2-<targettype> = <version>"
requires "Mesa-KHR-devel-<targettype> = <version>"
# 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-<targettype> = <version>"
# Mesa-KHR-devel contains only header files, so no -<targettype> variant
requires "Mesa-KHR-devel = <version>"
requires "libglvnd-devel-<targettype> >= 0.1.0"
Mesa-libGLESv3-devel
requires "Mesa-libEGL-devel-<targettype> = <version>"
requires "Mesa-KHR-devel-<targettype> = <version>"
# Mesa-KHR-devel contains only header files, so no -<targettype> variant
requires "Mesa-KHR-devel = <version>"
libOSMesa8
obsoletes "libOSMesa9-<targettype> < <version>"
provides "libOSMesa9-<targettype> = <version>"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6800271c2be2a0447510eb4e9b67edd9521859a4d565310617c4b359eb6799fe
size 12758452

Binary file not shown.

3
mesa-20.1.6.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:23bed40114b03ad640c95bfe72cc879ed2f941d0d481b77b5204a1fc567fa93c
size 12805724

BIN
mesa-20.1.6.tar.xz.sig Normal file

Binary file not shown.