From 19d5acbf45e290c18266a964c33aa7953a88eb50a4c0fad2b2e32c402b38e571 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 23 Feb 2015 16:04:26 +0000 Subject: [PATCH 1/2] - specfile/baselibs.conf: Manually provide d3d library (bnc#918294) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=429 --- Mesa.changes | 5 +++++ Mesa.spec | 6 ++++++ baselibs.conf | 1 + 3 files changed, 12 insertions(+) diff --git a/Mesa.changes b/Mesa.changes index 602f4e9..da79be7 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 23 15:28:29 UTC 2015 - sndirsch@suse.com + +- specfile/baselibs.conf: Manually provide d3d library (bnc#918294) + ------------------------------------------------------------------- Tue Feb 10 12:30:49 UTC 2015 - zaitor@opensuse.org diff --git a/Mesa.spec b/Mesa.spec index 393129b..0078210 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -405,6 +405,12 @@ implementation of Mesa. %package libd3d Summary: Mesa Direct3D9 state tracker Group: System/Libraries +# Manually provide d3d library (bnc#918294) +%ifarch x86_64 s390x ppc64le aarch64 +Provides: d3dadapter9.so.1()(64bit) +%else +Provides: d3dadapter9.so.1 +%endif %description libd3d Mesa Direct3D9 state tracker diff --git a/baselibs.conf b/baselibs.conf index 80ef4b2..e1c1b85 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -51,6 +51,7 @@ Mesa-libglapi0 Mesa-libglapi-devel requires "Mesa-libglapi0- = " Mesa-libd3d + provides "d3dadapter9.so.1" Mesa-libd3d-devel requires "Mesa-libd3d- = " libXvMC_nouveau From 47259b11b86abfca18216cf884c36c95cc42a74b62d4b34dd7618303843ebc0f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 24 Feb 2015 16:11:56 +0000 Subject: [PATCH 2/2] Accepting request 287560 from home:tobijk:X11:XOrg - Fix file permissions for the Gallium Nine files OBS-URL: https://build.opensuse.org/request/show/287560 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=430 --- Mesa.changes | 5 +++++ Mesa.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Mesa.changes b/Mesa.changes index da79be7..c60e6aa 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 24 16:08:49 UTC 2015 - tobias.johannes.klausmann@mni.thm.de + +- Fix file permissions for the Gallium Nine files + ------------------------------------------------------------------- Mon Feb 23 15:28:29 UTC 2015 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 0078210..5b451ab 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -855,11 +855,13 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \ %if 0%{?with_nine} %files libd3d +%defattr(-,root,root) %dir %{_libdir}/d3d/ %{_libdir}/d3d/*.so.* #%{_sysconfdir}/OpenCL/vendors/mesa.icd %files libd3d-devel +%defattr(-,root,root) %{_libdir}/pkgconfig/d3d.pc %{_includedir}/d3dadapter/ %{_libdir}/d3d/*.so