summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2014-12-14 21:15:35 +0300
committerIgor Gnatenko <i.gnatenko.brain@gmail.com>2014-12-14 22:01:32 +0300
commitdc2fc7918e7ba9fc5ded9f59e0b5d3725414ece6 (patch)
tree253bafa7afc5a9d05725e375b478d2e34777f64a
parentb1ffe56bdc881f5b600654ebbf15e0d4ab58a76e (diff)
downloadmesa-dc2fc7918e7ba9fc5ded9f59e0b5d3725414ece6.tar.gz
mesa-dc2fc7918e7ba9fc5ded9f59e0b5d3725414ece6.tar.xz
mesa-dc2fc7918e7ba9fc5ded9f59e0b5d3725414ece6.zip
Enable Nine state-tracker (Direct3D9 API)
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com> (cherry picked from commit 0e23b6030763c92f251af4427cdfaac02816c934) Conflicts: mesa.spec
-rw-r--r--mesa.spec34
1 files changed, 34 insertions, 0 deletions
diff --git a/mesa.spec b/mesa.spec
index e84737b..5e5ed87 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -18,6 +18,7 @@
# llvm support for ppc64le is supposed to come in llvm-3.5
%ifnarch s390 ppc ppc64le
%define with_llvm 1
+%define with_nine 1
%endif
%define min_wayland_version 1.0
@@ -329,6 +330,21 @@ Requires: mesa-libOpenCL%{?_isa} = %{version}-%{release}
Mesa OpenCL development package.
%endif
+%if 0%{?with_nine}
+%package libd3d
+Summary: Mesa Direct3D9 state tracker
+
+%description libd3d
+Mesa Direct3D9 state tracker
+
+%package libd3d-devel
+Summary: Mesa Direct3D9 state tracker development package
+Requires: mesa-d3d%{?_isa} = %{version}-%{release}
+
+%description libd3d-devel
+Mesa Direct3D9 state tracker development package
+%endif
+
%prep
#setup -q -n Mesa-%{version}%{?snapshot}
%setup -q -n mesa-%{git}
@@ -400,6 +416,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope
--enable-dri \
%if %{with_hardware}
%{?with_xa:--enable-xa} \
+ %{?with_nine:--enable-nine} \
--with-gallium-drivers=%{?with_vmware:svga,}%{?with_radeonsi:radeonsi,}%{?with_llvm:swrast,r600,}%{?with_freedreno:freedreno,}r300,nouveau \
%else
--with-gallium-drivers=%{?with_llvm:swrast} \
@@ -473,6 +490,10 @@ rm -rf $RPM_BUILD_ROOT
%post libOpenCL -p /sbin/ldconfig
%postun libOpenCL -p /sbin/ldconfig
%endif
+%if 0%{?with_nine}
+%post libd3d -p /sbin/ldconfig
+%postun libd3d -p /sbin/ldconfig
+%endif
%files libGL
%defattr(-,root,root,-)
@@ -675,11 +696,24 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libMesaOpenCL.so
%endif
+%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
+
# Generate changelog using:
# git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)"
%changelog
* Sun Dec 14 2014 Igor Gnatenko 10.5.0-0.devel.5.git29c7cf2
- Enable VA state-tracker
+- Enable Nine state-tracker (Direct3D9 API)
* Thu Dec 11 2014 Adam Jackson <ajax@redhat.com> 10.5.0-0.devel.4
- Restore hardware drivers on ppc64{,le}