From cc4d38bc1b2b9ecabba84fe55cdad8b9caba925c8a2f28d2e21ed2ededf7fc1f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 22 Aug 2020 20:49:44 +0000 Subject: [PATCH] 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- = "