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

Reverted baselibs.conf changes needed for Wine 32bit development, since these

Browse Source 
caused regressions. (boo#1172302)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=964
This commit is contained in:
Stefan Dirsch 2020-06-15 12:29:08 +00:00 committed by Git OBS Bridge
parent f3e1fdcf04
commit 67797062aa
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mesa-drivers.changes
View File

@ -11,12 +11,6 @@ Wed Jun 3 10:43:06 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
https://gitlab.freedesktop.org/mesa/mesa/-/issues/2917 https://gitlab.freedesktop.org/mesa/mesa/-/issues/2917
- supersedes U_add-lifetime-dse-fix.patch - supersedes U_add-lifetime-dse-fix.patch
-------------------------------------------------------------------
Wed Jun 3 10:28:03 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- baselibs.conf: added pkgconfig files to 32bit devel packages
(boo#1172302)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 19 19:22:02 UTC 2020 - Martin Liška <mliska@suse.cz> Tue May 19 19:22:02 UTC 2020 - Martin Liška <mliska@suse.cz>

6
Mesa.changes
View File

@ -11,12 +11,6 @@ Wed Jun 3 10:43:06 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
https://gitlab.freedesktop.org/mesa/mesa/-/issues/2917 https://gitlab.freedesktop.org/mesa/mesa/-/issues/2917
- supersedes U_add-lifetime-dse-fix.patch - supersedes U_add-lifetime-dse-fix.patch
-------------------------------------------------------------------
Wed Jun 3 10:28:03 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- baselibs.conf: added pkgconfig files to 32bit devel packages
(boo#1172302)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 19 19:22:02 UTC 2020 - Martin Liška <mliska@suse.cz> Tue May 19 19:22:02 UTC 2020 - Martin Liška <mliska@suse.cz>

2
Mesa.spec
View File

@ -919,6 +919,8 @@ done
%if !%{drivers} %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. # 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 \"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 %endif
%post -p /sbin/ldconfig %post -p /sbin/ldconfig

14
baselibs.conf
View File

@ -13,9 +13,6 @@ Mesa
requires "Mesa-gallium-<targettype> = <version>" requires "Mesa-gallium-<targettype> = <version>"
Mesa-devel Mesa-devel
# Include this special README file so dummy Mesa-<targettype> gets
# build and other arch packages can supplement it.
+/usr/share/doc/packages/Mesa/README.package.*
#We need Mesa-<targettype>!, do not put requires -Mesa-<targettype>. #We need Mesa-<targettype>!, do not put requires -Mesa-<targettype>.
requires "Mesa-<targettype> = <version>" requires "Mesa-<targettype> = <version>"
requires "Mesa-libEGL-devel-<targettype> = <version>" requires "Mesa-libEGL-devel-<targettype> = <version>"
@ -38,7 +35,6 @@ Mesa-libEGL-devel
requires "Mesa-libEGL1-<targettype> = <version>" requires "Mesa-libEGL1-<targettype> = <version>"
requires "Mesa-KHR-devel-<targettype> = <version>" requires "Mesa-KHR-devel-<targettype> = <version>"
requires "libglvnd-devel-<targettype> >= 0.1.0" requires "libglvnd-devel-<targettype> >= 0.1.0"
+/usr/lib*/pkgconfig/egl.pc
Mesa-libGL1 Mesa-libGL1
requires "Mesa-<targettype> = <version>" requires "Mesa-<targettype> = <version>"
requires "libglvnd-<targettype> >= 0.1.0" requires "libglvnd-<targettype> >= 0.1.0"
@ -46,8 +42,6 @@ Mesa-libGL-devel
requires "Mesa-libGL1-<targettype> = <version>" requires "Mesa-libGL1-<targettype> = <version>"
requires "Mesa-KHR-devel-<targettype> = <version>" requires "Mesa-KHR-devel-<targettype> = <version>"
requires "libglvnd-devel-<targettype> >= 0.1.0" requires "libglvnd-devel-<targettype> >= 0.1.0"
+/usr/lib*/pkgconfig/gl.pc
Mesa-libGLESv1_CM1 Mesa-libGLESv1_CM1
requires "libglvnd-<targettype> >= 0.1.0" requires "libglvnd-<targettype> >= 0.1.0"
Mesa-libGLESv1_CM-devel Mesa-libGLESv1_CM-devel
@ -56,16 +50,22 @@ Mesa-libGLESv1_CM-devel
requires "Mesa-KHR-devel-<targettype> = <version>" requires "Mesa-KHR-devel-<targettype> = <version>"
requires "libglvnd-devel-<targettype> >= 0.1.0" requires "libglvnd-devel-<targettype> >= 0.1.0"
Mesa-libGLESv2-2 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-<targettype> >= 0.1.0" requires "libglvnd-<targettype> >= 0.1.0"
Mesa-libGLESv2-devel Mesa-libGLESv2-devel
requires "Mesa-libEGL-devel-<targettype> = <version>" requires "Mesa-libEGL-devel-<targettype> = <version>"
requires "Mesa-libGLESv2-2-<targettype> = <version>" requires "Mesa-libGLESv2-2-<targettype> = <version>"
requires "Mesa-KHR-devel-<targettype> = <version>" requires "Mesa-KHR-devel-<targettype> = <version>"
requires "libglvnd-devel-<targettype> >= 0.1.0" requires "libglvnd-devel-<targettype> >= 0.1.0"
+/usr/lib/pkgconfig/glesv2.pc
Mesa-libGLESv3-devel Mesa-libGLESv3-devel
requires "Mesa-libEGL-devel-<targettype> = <version>" requires "Mesa-libEGL-devel-<targettype> = <version>"
requires "Mesa-KHR-devel-<targettype> = <version>" requires "Mesa-KHR-devel-<targettype> = <version>"
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 libOSMesa8
obsoletes "libOSMesa9-<targettype> < <version>" obsoletes "libOSMesa9-<targettype> < <version>"
provides "libOSMesa9-<targettype> = <version>" provides "libOSMesa9-<targettype> = <version>"