Attachment 2924 Details for Bug 7717 – mesa patch to get opencl and radeonsi glamor

[patch] mesa patch to get opencl and radeonsi glamor

mesa.spec.patch (text/plain), 3.93 KB, created by Joseph Wang on 2012-10-05 14:44:50 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Wang

Created: 2012-10-05 14:44:50 CEST

Size: 3.93 KB

patch

obsolete

>18,20c18,19
>< %define git 20121003
>< %define git_libclc 20120908
>< %define git_branch 9.1
>---
>> %define git 20120907
>> %define git_branch 9.0
>22,23d20
>< %define with_opencl 1
>< %define with_glamor 1
>29,30c26,27
>< %define version			9.1.0
>< %define rel			1.1
>---
>> %define version			9.0.0
>> %define rel			1
>90a88
>> 
>162,165d159
>< %if %{with_opencl}
>< Source1:        libclc-%{git_libclc}.tar.bz2
>< Source4:        make-libclc-snapshot.sh
>< %endif
>177c171
>< #Patch001: 0001-Fix-undefined-symbols-in-libOSMesa-and-libglapi.patch
>---
>> Patch001: 0001-Fix-undefined-symbols-in-libOSMesa-and-libglapi.patch
>186,187c180,181
>< #Patch202: 0202-radeon-llvm-Cleanup-makefile.patch
>< #Patch203: 0203-radeon-llvm-Remove-R600InstrInfo.td-from-TD_FILES.patch
>---
>> Patch202: 0202-radeon-llvm-Cleanup-makefile.patch
>> Patch203: 0203-radeon-llvm-Remove-R600InstrInfo.td-from-TD_FILES.patch
>201,202d194
>< # Patch
>< Patch202: radeon.llvm.register.once.patch
>389,418d380
>< %if %{with_opencl}
>< %package        opencl
>< Summary:        Mesa library for OpenCL
>< Group:          System/Libraries
>< 
>< %package        opencl-devel
>< Summary:        Mesa library for OpenCL
>< Group:          System/Libraries
>< 
>< %package        opencl-driver-nouveau
>< Summary:        OpenCL plugin for nouveau driver
>< Group:		System/Libraries
>< 
>< %package        opencl-driver-r300
>< Summary:        OpenCL plugin for r300 driver
>< Group:		System/Libraries
>< 
>< %package        opencl-driver-r600
>< Summary:        OpenCL plugin for r600 driver
>< Group:		System/Libraries
>< 
>< %package        opencl-driver-radeonsi
>< Summary:        OpenCL plugin for radeonsi driver
>< Group:		System/Libraries
>< 
>< %package        opencl-driver-swrast
>< Summary:        OpenCL plugin for swrast driver
>< Group:		System/Libraries
>< %endif     
>< 
>560,583d521
>< %if %{with_opencl}
>< %description    opencl
>< Mesa library for OpenCL
>< 
>< %description    opencl-devel
>< Mesa library for OpenCL
>< 
>< %description    opencl-driver-nouveau
>< OpenCL plugin for nouveau driver
>< 
>< %description    opencl-driver-r300
>< OpenCL plugin for r300 driver
>< 
>< %description    opencl-driver-r600
>< OpenCL plugin for r600 driver
>< 
>< %description    opencl-driver-radeonsi
>< OpenCL plugin for radeonsi driver
>< 
>< %description    opencl-driver-swrast
>< OpenCL plugin for swrast driver
>< %endif     
>< 
>< 
>587,590d524
>< %if %{with_opencl}
>< %setup -q  -b 1 -T -n libclc-%{git_libclc}
>< %endif
>< 
>605,608d538
>< %if %{with_opencl}
>< (cd %{_builddir}/libclc-%{git_libclc} && ./configure.py && %make )
>< %endif
>< 
>619,624d548
>< %if %{with_glamor}
><                 --enable-gbm \
><                 --enable-shared-glapi \
><                 --enable-glx-tls \
>< 		--with-egl-platforms=x11,drm \
>< %endif 
>640c564
>< 		--with-gallium-drivers=nouveau,r300,r600,radeonsi,swrast \
>---
>> 		--with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
>649,654d572
>< %if %{with_opencl}
><                 --enable-opencl \
><                 --with-libclc-path=%{_libdir}/clc \
><                 --with-clang-libdir=%{_prefix}/lib \
><                 --enable-r600-llvm-compiler
>< %endif          
>683,691d600
>< %if %{with_opencl}
>< pushd %{_builddir}/libclc-%{git_libclc}
>< cp -r generic/include %{buildroot}%{_prefix}
>< mkdir -p %{buildroot}%{_libdir}/clc
>< cp -r r600-- %{buildroot}%{_libdir}/clc
>< popd
>< 
>< %endif
>< 
>793,820d701
>< %if %{with_opencl}
>< %files opencl
>< %defattr(-,root,root)
>< %{_libdir}/libOpenCL.so.1
>< %{_libdir}/libOpenCL.so.1.*
>< %{_includedir}/clc
>< %{_libdir}/clc
>< 
>< %files opencl-devel
>< %defattr(-,root,root)
>< %{_libdir}/libOpenCL.so
>< 
>< %files opencl-driver-nouveau
>< %{_libdir}/opencl/pipe_nouveau.so
>< 
>< %files opencl-driver-r300
>< %{_libdir}/opencl/pipe_r300.so
>< 
>< %files opencl-driver-r600
>< %{_libdir}/opencl/pipe_r600.so
>< 
>< %files opencl-driver-radeonsi
>< %{_libdir}/opencl/pipe_radeonsi.so
>< 
>< %files opencl-driver-swrast
>< %{_libdir}/opencl/pipe_swrast.so
>< %endif
>< 
>891,892d771
>< * Fri Sep 07 2012 joequant <joequant> 9.0.0-0.git20120907.1.1.mga3
>< - add opencl

18,20c18,19
< %define git 20121003
< %define git_libclc 20120908
< %define git_branch 9.1
---
> %define git 20120907
> %define git_branch 9.0
22,23d20
< %define with_opencl 1
< %define with_glamor 1
29,30c26,27
< %define version			9.1.0
< %define rel			1.1
---
> %define version			9.0.0
> %define rel			1
90a88
> 
162,165d159
< %if %{with_opencl}
< Source1:        libclc-%{git_libclc}.tar.bz2
< Source4:        make-libclc-snapshot.sh
< %endif
177c171
< #Patch001: 0001-Fix-undefined-symbols-in-libOSMesa-and-libglapi.patch
---
> Patch001: 0001-Fix-undefined-symbols-in-libOSMesa-and-libglapi.patch
186,187c180,181
< #Patch202: 0202-radeon-llvm-Cleanup-makefile.patch
< #Patch203: 0203-radeon-llvm-Remove-R600InstrInfo.td-from-TD_FILES.patch
---
> Patch202: 0202-radeon-llvm-Cleanup-makefile.patch
> Patch203: 0203-radeon-llvm-Remove-R600InstrInfo.td-from-TD_FILES.patch
201,202d194
< # Patch
< Patch202: radeon.llvm.register.once.patch
389,418d380
< %if %{with_opencl}
< %package        opencl
< Summary:        Mesa library for OpenCL
< Group:          System/Libraries
< 
< %package        opencl-devel
< Summary:        Mesa library for OpenCL
< Group:          System/Libraries
< 
< %package        opencl-driver-nouveau
< Summary:        OpenCL plugin for nouveau driver
< Group:		System/Libraries
< 
< %package        opencl-driver-r300
< Summary:        OpenCL plugin for r300 driver
< Group:		System/Libraries
< 
< %package        opencl-driver-r600
< Summary:        OpenCL plugin for r600 driver
< Group:		System/Libraries
< 
< %package        opencl-driver-radeonsi
< Summary:        OpenCL plugin for radeonsi driver
< Group:		System/Libraries
< 
< %package        opencl-driver-swrast
< Summary:        OpenCL plugin for swrast driver
< Group:		System/Libraries
< %endif     
< 
560,583d521
< %if %{with_opencl}
< %description    opencl
< Mesa library for OpenCL
< 
< %description    opencl-devel
< Mesa library for OpenCL
< 
< %description    opencl-driver-nouveau
< OpenCL plugin for nouveau driver
< 
< %description    opencl-driver-r300
< OpenCL plugin for r300 driver
< 
< %description    opencl-driver-r600
< OpenCL plugin for r600 driver
< 
< %description    opencl-driver-radeonsi
< OpenCL plugin for radeonsi driver
< 
< %description    opencl-driver-swrast
< OpenCL plugin for swrast driver
< %endif     
< 
< 
587,590d524
< %if %{with_opencl}
< %setup -q  -b 1 -T -n libclc-%{git_libclc}
< %endif
< 
605,608d538
< %if %{with_opencl}
< (cd %{_builddir}/libclc-%{git_libclc} && ./configure.py && %make )
< %endif
< 
619,624d548
< %if %{with_glamor}
<                 --enable-gbm \
<                 --enable-shared-glapi \
<                 --enable-glx-tls \
< 		--with-egl-platforms=x11,drm \
< %endif 
640c564
< 		--with-gallium-drivers=nouveau,r300,r600,radeonsi,swrast \
---
> 		--with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
649,654d572
< %if %{with_opencl}
<                 --enable-opencl \
<                 --with-libclc-path=%{_libdir}/clc \
<                 --with-clang-libdir=%{_prefix}/lib \
<                 --enable-r600-llvm-compiler
< %endif          
683,691d600
< %if %{with_opencl}
< pushd %{_builddir}/libclc-%{git_libclc}
< cp -r generic/include %{buildroot}%{_prefix}
< mkdir -p %{buildroot}%{_libdir}/clc
< cp -r r600-- %{buildroot}%{_libdir}/clc
< popd
< 
< %endif
< 
793,820d701
< %if %{with_opencl}
< %files opencl
< %defattr(-,root,root)
< %{_libdir}/libOpenCL.so.1
< %{_libdir}/libOpenCL.so.1.*
< %{_includedir}/clc
< %{_libdir}/clc
< 
< %files opencl-devel
< %defattr(-,root,root)
< %{_libdir}/libOpenCL.so
< 
< %files opencl-driver-nouveau
< %{_libdir}/opencl/pipe_nouveau.so
< 
< %files opencl-driver-r300
< %{_libdir}/opencl/pipe_r300.so
< 
< %files opencl-driver-r600
< %{_libdir}/opencl/pipe_r600.so
< 
< %files opencl-driver-radeonsi
< %{_libdir}/opencl/pipe_radeonsi.so
< 
< %files opencl-driver-swrast
< %{_libdir}/opencl/pipe_swrast.so
< %endif
< 
891,892d771
< * Fri Sep 07 2012 joequant <joequant> 9.0.0-0.git20120907.1.1.mga3
< - add opencl

Actions: View | Diff

Attachments on bug 7717: 2922 | 2923 | 2924 | 2925 | 2926 | 2927