Attachment 847217 Details for Bug 887628 – opencl.patch

[patch] opencl.patch

opencl.patch (text/plain), 3.09 KB, created by Igor Gnatenko on 2014-01-08 15:50:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Gnatenko

Created: 2014-01-08 15:50:58 UTC

Size: 3.09 KB

patch

obsolete

>diff --git a/mesa.spec b/mesa.spec
>index 39602ab..bc9d3d1 100644
>--- a/mesa.spec
>+++ b/mesa.spec
>@@ -39,6 +39,7 @@
> %ifarch %{ix86} x86_64
> %define platform_drivers ,i915,i965
> %define with_vmware 1
>+%define with_opencl 1
> %endif
> %ifarch ppc
> %define platform_drivers ,swrast
>@@ -49,7 +50,7 @@
> 
> %define _default_patch_fuzz 2
> 
>-%define gitdate 20131220
>+%define gitdate 20140108
> #% define snapshot 
> 
> Summary: Mesa graphics libraries
>@@ -104,6 +105,9 @@ BuildRequires: gettext
> BuildRequires: mesa-private-llvm-devel
> %else
> BuildRequires: llvm-devel >= 3.0
>+%if %{?with_opencl}
>+BuildRequires: clang-devel >= 3.0
>+%endif
> %endif
> %endif
> BuildRequires: elfutils-libelf-devel
>@@ -119,6 +123,9 @@ BuildRequires: mesa-libGL-devel
> BuildRequires: libvdpau-devel
> %endif
> BuildRequires: zlib-devel
>+%if %{?with_opencl}
>+BuildRequires: libclc-devel llvm-static opencl-filesystem
>+%endif
> 
> %description
> Mesa
>@@ -284,6 +291,25 @@ Group: System Environment/Libraries
> %description libglapi
> Mesa shared glapi
> 
>+
>+%if %{?with_opencl}
>+%package libOpenCL
>+Summary: Mesa OpenCL runtime library
>+Requires: ocl-icd
>+Provides: opencl
>+
>+%description libOpenCL
>+Mesa OpenCL runtime library.
>+
>+%package libOpenCL-devel
>+Summary: Mesa OpenCL development package
>+Requires: mesa-libOpenCL%{?_isa} %{version}-%{release}
>+Provides: opencl-devel
>+
>+%description libOpenCL-devel
>+Mesa OpenCL development package.
>+%endif
>+
> %prep
> #setup -q -n Mesa-%{version}%{?snapshot}
> %setup -q -n mesa-%{gitdate}
>@@ -330,7 +356,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
> #
> # We do say 'catch' in the clover and d3d1x state trackers, but we're not
> # building those yet.
>-export CXXFLAGS="$RPM_OPT_FLAGS -fno-rtti -fno-exceptions"
>+export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_opencl:-fno-rtti -fno-exceptions}"
> %ifarch %{ix86}
> # i do not have words for how much the assembly dispatch code infuriates me
> %define asm_flags --disable-asm
>@@ -350,7 +376,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-rtti -fno-exceptions"
>     --with-egl-platforms=x11,drm%{?with_wayland:,wayland} \
>     --enable-shared-glapi \
>     --enable-gbm \
>-    --disable-opencl \
>+    %{?with_opencl:--enable-opencl --enable-opencl-icd --with-clang-libdir=/usr/lib} %{!?with_opencl:--disable-opencl} \
>     --enable-glx-tls \
>     --enable-texture-float=yes \
>     %{?with_llvm:--enable-gallium-llvm} \
>@@ -424,6 +450,10 @@ rm -rf $RPM_BUILD_ROOT
> %post libxatracker -p /sbin/ldconfig
> %postun libxatracker -p /sbin/ldconfig
> %endif
>+%if %{?with_opencl}
>+%post libOpenCL -p /sbin/ldconfig
>+%postun libOpenCL -p /sbin/ldconfig
>+%endif
> 
> %files libGL
> %defattr(-,root,root,-)
>@@ -596,7 +626,21 @@ rm -rf $RPM_BUILD_ROOT
> %endif
> %endif
> 
>+%if %{?with_opencl}
>+%files libOpenCL
>+%{_libdir}/libMesaOpenCL.so.*
>+%{_sysconfdir}/OpenCL/vendors/mesa.icd
>+
>+%files libOpenCL-devel
>+%{_libdir}/libMesaOpenCL.so
>+%{_libdir}/gallium-pipe/
>+%endif
>+
> %changelog
>+* Wed Jan 08 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.0.1-1.20140108
>+- Fixes from 10.0 git branch
>+- Enable openCL
>+
> * Fri Dec 20 2013 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.0.1-1.20131220
> - 10.0.1 upstream release
>

Actions: View | Diff

Attachments on bug 887628: 847217