From 67797062aab01c911b29ecbcd7d12494ca5a4176cc01785484b194aef816a05f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 15 Jun 2020 12:29:08 +0000 Subject: [PATCH] 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- = "