- enabled build of Direct3D 9 (Gallium3D Nine) state tracker (bnc#910109)

- removed obsolete patch u_be_assert_include.patch, addressed by
  upstream commit 2a13ff9 "gallium/util: add missing u_debug include"
  (bnc#910109)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=420
This commit is contained in:
2015-01-27 11:52:02 +00:00
committed by Git OBS Bridge
parent 6b6a7b8e89
commit 7282903c65
3 changed files with 46 additions and 29 deletions

View File

@@ -33,6 +33,9 @@
%define vdpau_nouveau 0
%define vdpau_radeon 0
%endif
%ifarch %ix86 x86_64
%define with_nine 1
%endif
Name: Mesa
Version: 10.4.3
Release: 0
@@ -51,7 +54,6 @@ Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
Patch13: u_mesa-8.0.1-fix-16bpp.patch
# Patch from Fedora, use shmget when available, under llvmpipe
Patch15: u_mesa-8.0-llvmpipe-shmget.patch
Patch18: u_be_assert_include.patch
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: bison
@@ -477,6 +479,23 @@ Supplements: xf86-video-ati
%description -n libvdpau_radeonsi
This package contains the VDPAU state tracker for radeonsi.
%if 0%{?with_nine}
%package libd3d
Summary: Mesa Direct3D9 state tracker
Group: System/Libraries
%description libd3d
Mesa Direct3D9 state tracker
%package libd3d-devel
Summary: Mesa Direct3D9 state tracker development package
Group: System/Libraries
Requires: mesa-d3d%{?_isa} = %{version}-%{release}
%description libd3d-devel
Mesa Direct3D9 state tracker development package
%endif
%prep
%setup -q -n %{name}-%{_version} -b4
# remove some docs
@@ -488,7 +507,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
#%patch15 -p1
#%patch13 -p1
###
%patch18 -p1
%build
%if 0%{?suse_version} >= 1310
@@ -508,6 +526,7 @@ autoreconf -fvi
--enable-texture-float \
--enable-osmesa \
--enable-dri3 \
%{?with_nine:--enable-nine} \
%if %{glamor}
--enable-gbm \
--enable-glx-tls \
@@ -651,6 +670,11 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
%postun -n libwayland-egl1 -p /sbin/ldconfig
%endif
%if 0%{?with_nine}
%post libd3d -p /sbin/ldconfig
%postun libd3d -p /sbin/ldconfig
%endif
%files
%defattr(-,root,root)
%doc docs/README* docs/COPYING
@@ -822,4 +846,16 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
%defattr(-,root,root)
%doc docs/*.html
%if 0%{?with_nine}
%files libd3d
%dir %{_libdir}/d3d/
%{_libdir}/d3d/*.so.*
#%{_sysconfdir}/OpenCL/vendors/mesa.icd
%files libd3d-devel
%{_libdir}/pkgconfig/d3d.pc
%{_includedir}/d3dadapter/
%{_libdir}/d3d/*.so
%endif
%changelog