Browse Source

mesa: update to 10.0.4

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8317 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 11 years ago
parent
commit
2a5dce3d77
1 changed files with 23 additions and 9 deletions
  1. 23 9
      m/mesa/mesa-vl.spec

+ 23 - 9
m/mesa/mesa-vl.spec

@@ -9,13 +9,16 @@
 %endif
 %define dri_drivers --with-dri-drivers=%{base_drivers}%{?ix86_drivers}%{?amd64_drivers}
 
+%ifarch %{ix86} x86_64
+%define with_opencl 0
+%endif
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 Summary: Mesa graphics libraries
 Summary(ja): Mesa グラフィックスライブラリ
 Name: mesa
-Version: 9.2.2
+Version: 10.0.4
 Release: 1%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
@@ -24,11 +27,13 @@ URL: http://www.mesa3d.org
 Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/MesaLib-%{version}.tar.bz2
 Source3: make-git-snapshot.sh
 
-Patch1: nv50-fix-build.patch
+Patch1: mesa-10.0-nv50-fix-build.patch
 Patch15: mesa-9.2-hardware-float.patch
-Patch16: mesa-9.2-no-useless-vdpau.patch
 Patch20: mesa-9.2-evergreen-big-endian.patch
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=73512
+Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
 BuildRequires: flex, bison
@@ -46,6 +51,9 @@ BuildRequires: libXi-devel
 BuildRequires: libXmu-devel
 BuildRequires: libudev-devel
 BuildRequires: llvm-devel >= 3.3
+%if 0%{?with_opencl}
+BuildRequires: clang-devel >= 3.3
+%endif
 BuildRequires: libxml2-python
 BuildRequires: libvdpau-devel
 BuildRequires: elfutils-libelf-devel
@@ -352,9 +360,12 @@ Mesa shared glapi
 %patch1 -p1 -b .nv50rtti
 
 %patch15 -p1 -b .hwfloat
-%patch16 -p1 -b .vdpau
 %patch20 -p1 -b .egbe
 
+%if 0%{?with_opencl}
+%patch99 -p1 -b .icd
+%endif
+
 
 %build
 
@@ -495,7 +506,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/drirc
 %dir %{_libdir}/dri
 %{_libdir}/dri/*_dri.so
-%{_libdir}/libdricore*.so*
+#%{_libdir}/libdricore*.so*
 
 %files vdpau-drivers
 %defattr(-,root,root,-)
@@ -581,8 +592,8 @@ rm -rf $RPM_BUILD_ROOT
 %files libxatracker
 %defattr(-,root,root,-)
 %doc docs/COPYING
-%{_libdir}/libxatracker.so.1
-%{_libdir}/libxatracker.so.1.*
+%{_libdir}/libxatracker.so.2
+%{_libdir}/libxatracker.so.2.*
 
 %files libxatracker-devel
 %defattr(-,root,root,-)
@@ -651,8 +662,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n compat32-%{name}-libxatracker
 %defattr(-,root,root,-)
-%{_libdir}/libxatracker.so.1
-%{_libdir}/libxatracker.so.1.*
+%{_libdir}/libxatracker.so.2
+%{_libdir}/libxatracker.so.2.*
 
 %files -n compat32-%{name}-libglapi
 %{_libdir}/libglapi.so.0
@@ -666,6 +677,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Mar 24 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 10.0.4-1
+- update to 10.0.4
+
 * Mon Oct 28 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 9.2.2-1
 - update to 9.2.2
 - add BR: libvdpau-devel, elfutils-libelf-devel, zlib-devel