From beb3df72d48b53f2af96533f42a4d74806cbaf778dea2392e3f408f40f7fd363 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 2 Dec 2015 15:16:15 +0000 Subject: [PATCH 1/2] Accepting request 347132 from home:boombatower:branches:X11:XOrg Add Mesa-libOpenCL. OBS-URL: https://build.opensuse.org/request/show/347132 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=486 --- Mesa.changes | 5 +++++ Mesa.spec | 46 ++++++++++++++++++++++++++++++++++++++++++---- baselibs.conf | 1 + 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index 30058f0..c31b1c7 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 1 07:57:16 UTC 2015 - jimmy@boombatower.com + +- Add Mesa-libOpenCL. + ------------------------------------------------------------------- Sun Nov 22 11:05:34 UTC 2015 - zaitor@opensuse.org diff --git a/Mesa.spec b/Mesa.spec index 10f3467..e8019c3 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -19,6 +19,7 @@ %define glamor 1 %define _name_archive mesa %define _version 11.0.6 +%define with_opencl 0 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x %define gallium_loader 1 %else @@ -35,6 +36,10 @@ %endif %ifarch %ix86 x86_64 %define with_nine 1 +%if 0%{gallium_loader} && 0%{?suse_version} > 1310 +# llvm >= 3.7 not provided for <= 13.1 +%define with_opencl 1 +%endif %endif Name: Mesa Version: 11.0.6 @@ -124,6 +129,11 @@ BuildRequires: ncurses-devel %endif #!BuildIgnore: python +%if 0%{with_opencl} +BuildRequires: libclc +BuildRequires: llvm-clang-devel +%endif + %description Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.* To the extent that Mesa utilizes the OpenGL command @@ -510,6 +520,15 @@ Supplements: xf86-video-ati %description -n libvdpau_radeonsi This package contains the VDPAU state tracker for radeonsi. +%if 0%{with_opencl} +%package libOpenCL +Summary: Mesa OpenCL implementation +Group: System/Libraries + +%description libOpenCL +This package contains the Mesa OpenCL implementation or GalliumCompute. +%endif + %prep %setup -q -n %{_name_archive}-%{_version} -b4 # remove some docs @@ -558,7 +577,10 @@ autoreconf -fvi --enable-xa \ --enable-gallium-llvm \ --with-dri-drivers=i915,i965,nouveau,r200,radeon \ +%if 0%{with_opencl} + --enable-opencl \ --enable-opencl-icd \ +%endif --enable-llvm-shared-libs \ --enable-r600-llvm-compiler \ --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga \ @@ -694,15 +716,22 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \ %postun libd3d -p /sbin/ldconfig %endif +%if 0%{with_opencl} +%post libOpenCL -p /sbin/ldconfig + +%postun libOpenCL -p /sbin/ldconfig +%endif + %files %defattr(-,root,root) %doc docs/README* docs/COPYING %config %{_sysconfdir}/drirc %{_libdir}/dri/ -#%if %gallium_loader -#%dir %_libdir/gallium-pipe/ -#%_libdir/gallium-pipe/pipe_*.so -#%endif +%if 0%{with_opencl} +# only built with opencl +%dir %{_libdir}/gallium-pipe/ +%{_libdir}/gallium-pipe/pipe_*.so +%endif %files -n Mesa-libEGL1 %defattr(-,root,root) @@ -879,4 +908,13 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \ %{_libdir}/d3d/*.so %endif +%if 0%{with_opencl} +%files libOpenCL +%defattr(-,root,root) +%dir %{_sysconfdir}/OpenCL +%dir %{_sysconfdir}/OpenCL/vendors +%{_sysconfdir}/OpenCL/vendors/mesa.icd +%{_libdir}/libMesaOpenCL.so* +%endif + %changelog diff --git a/baselibs.conf b/baselibs.conf index e1c1b85..e9cc3e7 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -60,3 +60,4 @@ libvdpau_nouveau libvdpau_r300 libvdpau_r600 libvdpau_radeonsi +Mesa-libOpenCL From 6962c88bc43f97444da6472640f56edff3d28d066ef1902042c5951c38770993 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 10 Dec 2015 11:41:24 +0000 Subject: [PATCH 2/2] Accepting request 348176 from home:mimi_vx:branches:X11:XOrg - Update to version 11.0.7 + bugfixes release for bugs found since 11.0.6 fdo#90348 - Spilling failure of b96 merged value fdo#92363 - [BSW/BDW] ogles1conform Gets test fails fdo#92438 - Segfault in pushbuf_kref when running the android emulator (qemu) on nv50 fdo#93110 - [NVE4] textureSize() and textureQueryLevels() uses a texture bound during the previous draw call fdo#93126> - wrongly claim supporting GL_EXT_texture_rg + plus fixes for r600g,llvmpipe,i955,egl,gles2 OBS-URL: https://build.opensuse.org/request/show/348176 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=488 --- Mesa.changes | 14 ++++++++++++++ Mesa.spec | 4 ++-- mesa-11.0.6.tar.xz | 3 --- mesa-11.0.6.tar.xz.sig | Bin 543 -> 0 bytes mesa-11.0.7.tar.xz | 3 +++ mesa-11.0.7.tar.xz.sig | Bin 0 -> 543 bytes 6 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 mesa-11.0.6.tar.xz delete mode 100644 mesa-11.0.6.tar.xz.sig create mode 100644 mesa-11.0.7.tar.xz create mode 100644 mesa-11.0.7.tar.xz.sig diff --git a/Mesa.changes b/Mesa.changes index c31b1c7..b058b41 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Dec 9 19:15:39 UTC 2015 - mimi.vx@gmail.com + +- Update to version 11.0.7 + + bugfixes release for bugs found since 11.0.6 + fdo#90348 - Spilling failure of b96 merged value + fdo#92363 - [BSW/BDW] ogles1conform Gets test fails + fdo#92438 - Segfault in pushbuf_kref when running the android + emulator (qemu) on nv50 + fdo#93110 - [NVE4] textureSize() and textureQueryLevels() uses a texture + bound during the previous draw call + fdo#93126> - wrongly claim supporting GL_EXT_texture_rg + + plus fixes for r600g,llvmpipe,i955,egl,gles2 + ------------------------------------------------------------------- Tue Dec 1 07:57:16 UTC 2015 - jimmy@boombatower.com diff --git a/Mesa.spec b/Mesa.spec index e8019c3..ccd1cf1 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -18,7 +18,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 11.0.6 +%define _version 11.0.7 %define with_opencl 0 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x %define gallium_loader 1 @@ -42,7 +42,7 @@ %endif %endif Name: Mesa -Version: 11.0.6 +Version: 11.0.7 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT diff --git a/mesa-11.0.6.tar.xz b/mesa-11.0.6.tar.xz deleted file mode 100644 index 0d8ac45..0000000 --- a/mesa-11.0.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760 -size 7272972 diff --git a/mesa-11.0.6.tar.xz.sig b/mesa-11.0.6.tar.xz.sig deleted file mode 100644 index 61a5bf3eeb9f25d91a93b48e0e6ed3bab49988cc02c8f0ed9b10f7138e74fb84..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SEvF1p-!3W5@ss2@vhBH?S=0NeuxD5B(BmXp6Jx*@HCNOikov zjSEue%|oHzYz*RZ!~2a=paZ~CzL!|Decn(^_<*s zJe&o`cVkARk|)j-aKG?^X?93=TcBCH)yDWFacDt`6dk9bsfrG+A|NfjL-;m0V4Hv= z?E>io%av&Zody-=bFZm)bTPgGN0L_S^|K;A$FqM!5RD|Yfk84oJkk`>LY-a-$+KEz zr*nqwx~hL2NWa_OMIMjh?o7>1Qa@_^3ffQ)bJpyqe1#$dzz7KlbTO|)3u4t43ZoM# zsSr`{5GhrE?R7sHDL&Rdl_C(;c&GgYW=}+!UdvMqX4Cx3m#!m}QU>C2h(=9AZD)A%o@GJ`#h-p~ z1Dgbjjp?}yd*a+RXU#2A_aDo|9rtTn|7`cJ8FUG;;fiMFocDtvoi!lc%b0B3G2!u4Zx1Mm;ngk}QbFL#a>?g~0uBHG diff --git a/mesa-11.0.7.tar.xz b/mesa-11.0.7.tar.xz new file mode 100644 index 0000000..433823a --- /dev/null +++ b/mesa-11.0.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7e90a332ede6c8fd08eff90786a3fd1605a4e62ebf3a9b514047838194538cb +size 7279276 diff --git a/mesa-11.0.7.tar.xz.sig b/mesa-11.0.7.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..fbfe6d8be2b4eeea059a41e9a29e4a8fc6937c37e63299be0c2867b955844485 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0SEvF1p-!RQKbM12@vhBH?S=0Neu}Q5CDZYrtuIE#!OVoDF{In zTsDX+%i(}dg}v3;NCZ)f#vdRM%D`Ha%C{Od0w<%Wo#*-=UDbdeXPA5U)d8SW0*|2n zVegDFJMJ`jiF9uuS~#xP$_x+;B zQ^f0_QQayww>x}al9~8?srX@+!alZ$Gq>;oOK|B(2VrO9Kk4(EY}l-?+TUoN>$;AI zvQ*MgkX%Q_I+pED1s{QMo%sf?In2;+xjhFR36fds5aDf?V#zp9W