rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

Accepting request 824684 from home:dimstar:Factory

Browse Source 
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-<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).

OBS-URL: https://build.opensuse.org/request/show/824684
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=982
This commit is contained in:
Stefan Dirsch 2020-08-22 20:49:44 +00:00 committed by Git OBS Bridge
parent 4980ae9e89
commit cc4d38bc1b
5 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Mesa-drivers.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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 +24,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>

1
Mesa-drivers.spec
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

16
Mesa.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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 +24,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>

1
Mesa.spec
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

23
baselibs.conf
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>"