From 1bc38551dbbdcc4b3370c2e88cf97d2c978ebc63722f29b78cdd0076d198bcef Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 8 Jun 2016 02:40:52 +0000 Subject: [PATCH 01/11] Accepting request 400597 from home:tobijk:X11:XOrg - Update to version 12.0.0-rc2: - New features: + OpenGL 4.3 on nvc0, radeonsi, i965 (Gen8+) + OpenGL ES 3.1 on nvc0, radeonsi + GL_ARB_ES3_1_compatibility on nvc0, radeonsi + GL_ARB_compute_shader on nvc0, radeonsi, softpipe + GL_ARB_cull_distance on i965/gen6+, nv50, nvc0, llvmpipe, softpipe + GL_ARB_framebuffer_no_attachments on nvc0, r600, radeonsi, softpipe + GL_ARB_internalformat_query2 on all drivers + GL_ARB_query_buffer_object on i965/hsw+ + GL_ARB_robust_buffer_access_behavior on i965, nvc0, radeonsi + GL_ARB_shader_atomic_counters on radeonsi, softpipe + GL_ARB_shader_atomic_counter_ops on nvc0, radeonsi, softpipe + GL_ARB_shader_image_load_store on nvc0, radeonsi, softpipe + GL_ARB_shader_image_size on nvc0, radeonsi, softpipe + GL_ARB_shader_storage_buffer_objects on radeonsi, softpipe + GL_ATI_fragment_shader on all Gallium drivers + GL_EXT_base_instance on all drivers that support GL_ARB_base_instance + GL_EXT_clip_cull_distance on all drivers that support GL_ARB_cull_distance + GL_KHR_robustness on i965 + GL_OES_copy_image on i965 (Baytrail and Gen8+) + GL_OES_draw_buffers_indexed and GL_EXT_draw_buffers_indexed on all drivers that support GL_ARB_draw_buffers_blend +GL_OES_gpu_shader5 and GL_EXT_gpu_shader5 on all drivers that support GL_ARB_gpu_shader5 +GL_OES_sample_shading on i965, nvc0, r600, radeonsi +GL_OES_sample_variables on i965, nvc0, r600, radeonsi +GL_OES_shader_image_atomic on all drivers that support GL_ARB_shader_image_load_store +GL_OES_shader_io_blocks on i965, nvc0, radeonsi OBS-URL: https://build.opensuse.org/request/show/400597 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=520 --- Mesa.changes | 46 ++++++++++++ Mesa.spec | 62 +++++++++++++--- ...related-and-Wayland-CFLAGS-to-VULKAN.patch | 37 ++++++++++ U_gallivm-disable-avx512-features.patch | 48 ------------ baselibs.conf | 3 + mesa-11.2.2.tar.xz | 3 - mesa-11.2.2.tar.xz.sig | Bin 543 -> 0 bytes mesa-12.0.0-rc2.tar.xz | 3 + mesa-12.0.0-rc2.tar.xz.sig | Bin 0 -> 543 bytes ...ds-glXGetFBConfigs-fix-screen-bounds.patch | 69 ------------------ 10 files changed, 139 insertions(+), 132 deletions(-) create mode 100644 U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch delete mode 100644 U_gallivm-disable-avx512-features.patch delete mode 100644 mesa-11.2.2.tar.xz delete mode 100644 mesa-11.2.2.tar.xz.sig create mode 100644 mesa-12.0.0-rc2.tar.xz create mode 100644 mesa-12.0.0-rc2.tar.xz.sig delete mode 100644 u_glxcmds-glXGetFBConfigs-fix-screen-bounds.patch diff --git a/Mesa.changes b/Mesa.changes index d23c3c3..bcb0d11 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Tue Jun 7 23:25:31 UTC 2016 - tobias.johannes.klausmann@mni.thm.de + +- Update to version 12.0.0-rc2: +- New features: + + OpenGL 4.3 on nvc0, radeonsi, i965 (Gen8+) + + OpenGL ES 3.1 on nvc0, radeonsi + + GL_ARB_ES3_1_compatibility on nvc0, radeonsi + + GL_ARB_compute_shader on nvc0, radeonsi, softpipe + + GL_ARB_cull_distance on i965/gen6+, nv50, nvc0, llvmpipe, softpipe + + GL_ARB_framebuffer_no_attachments on nvc0, r600, radeonsi, softpipe + + GL_ARB_internalformat_query2 on all drivers + + GL_ARB_query_buffer_object on i965/hsw+ + + GL_ARB_robust_buffer_access_behavior on i965, nvc0, radeonsi + + GL_ARB_shader_atomic_counters on radeonsi, softpipe + + GL_ARB_shader_atomic_counter_ops on nvc0, radeonsi, softpipe + + GL_ARB_shader_image_load_store on nvc0, radeonsi, softpipe + + GL_ARB_shader_image_size on nvc0, radeonsi, softpipe + + GL_ARB_shader_storage_buffer_objects on radeonsi, softpipe + + GL_ATI_fragment_shader on all Gallium drivers + + GL_EXT_base_instance on all drivers that support GL_ARB_base_instance + + GL_EXT_clip_cull_distance on all drivers that support GL_ARB_cull_distance + + GL_KHR_robustness on i965 + + GL_OES_copy_image on i965 (Baytrail and Gen8+) + + GL_OES_draw_buffers_indexed and GL_EXT_draw_buffers_indexed on all drivers + that support GL_ARB_draw_buffers_blend + +GL_OES_gpu_shader5 and GL_EXT_gpu_shader5 on all drivers that support + GL_ARB_gpu_shader5 + +GL_OES_sample_shading on i965, nvc0, r600, radeonsi + +GL_OES_sample_variables on i965, nvc0, r600, radeonsi + +GL_OES_shader_image_atomic on all drivers that support + GL_ARB_shader_image_load_store + +GL_OES_shader_io_blocks on i965, nvc0, radeonsi + +GL_OES_shader_multisample_interpolation on i965, nvc0, r600, radeonsi + + GL_OES_texture_border_clamp and GL_EXT_texture_border_clamp on all drivers + that support +GL_ARB_texture_border_clamp + + GL_OES_texture_buffer and GL_EXT_texture_buffer on i965, nvc0, radeonsi + + EGL_KHR_reusable_sync on all drivers + + GL_ARB_stencil_texture8 and GL_OES_stencil_texture8 on i965/gen8+ +- Enable build of the Intel Vulkan driver (anv): + + Introduce new packages: libVulkan and libVulkan-devel +- Remove upstreamed patches: + + u_glxcmds-glXGetFBConfigs-fix-screen-bounds.patch + + U_gallivm-disable-avx512-features.patch +- drop docs/COPYING: No GPL licensed code in Mesa resident (upstream change) + ------------------------------------------------------------------- Wed Jun 1 14:48:38 UTC 2016 - eich@suse.com diff --git a/Mesa.spec b/Mesa.spec index 5dce398..ac94898 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -18,7 +18,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 11.2.2 +%define _version 12.0.0-rc2 %define with_opencl 0 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x %define gallium_loader 1 @@ -40,9 +40,11 @@ # llvm >= 3.7 not provided for <= 13.1 %define with_opencl 1 %endif +%define with_vulkan 1 %endif + Name: Mesa -Version: 11.2.2 +Version: 12.0.0~rc2 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT @@ -67,10 +69,10 @@ Patch15: u_mesa-8.0-llvmpipe-shmget.patch Patch17: u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch # never to be upstreamed Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch -# Already upstream +# never to be upstreamed Patch21: n_Define-GLAPIVAR-separate-from-GLAPI.patch -Patch22: u_glxcmds-glXGetFBConfigs-fix-screen-bounds.patch -Patch23: U_gallivm-disable-avx512-features.patch +# Build fix for intel vulkan (to be upstreamed) +Patch30: U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -452,6 +454,23 @@ Requires: %{name}-libd3d = %{version} Mesa Direct3D9 state tracker development package %endif +%if 0%{with_vulkan} +%package libVulkan +Summary: Mesas Vulkan implementation +Group: System/Libraries + +%description libVulkan +This package contains the Vulkan parts for Mesa. + +%package libVulkan-devel +Summary: Mesas Vulkan development files +Group: System/Libraries +Requires: %{name}-libvulkan = %{version} + +%description libVulkan-devel +This package contains the development files for Mesas Vulkan implementation. +%endif + %package -n libxatracker2 Version: 1.0.0 Release: 0 @@ -564,8 +583,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch17 -p1 %patch18 -p1 %patch21 -p1 -%patch22 -p1 -%patch23 -p1 +%patch30 -p1 %build %if 0%{?suse_version} >= 1310 @@ -574,9 +592,7 @@ egl_platforms=x11,drm,wayland egl_platforms=x11,drm %endif autoreconf -fvi -### --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga \ -### --with-gallium-drivers=r300,r600,nouveau,swrast,svga \ -### --with-gallium-drivers=r300,nouveau,swrast,svga \ + %configure --enable-gles1 \ --enable-gles2 \ --enable-dri \ @@ -600,12 +616,14 @@ autoreconf -fvi --enable-xa \ --enable-gallium-llvm \ --with-dri-drivers=i915,i965,nouveau,r200,radeon \ +%if 0%{with_vulkan} + --with-vulkan-drivers=intel \ +%endif %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 \ --enable-vdpau \ --enable-va \ @@ -750,9 +768,15 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \ %postun libva -p /sbin/ldconfig +%if 0%{with_vulkan} +%post libVulkan -p /sbin/ldconfig + +%postun libVulkan -p /sbin/ldconfig +%endif + %files %defattr(-,root,root) -%doc docs/README* docs/COPYING +%doc docs/README* %config %{_sysconfdir}/drirc %dir %{_libdir}/dri %if 0%{?suse_version} < 1315 @@ -956,4 +980,18 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \ %{_libdir}/dri/*_drv_video.so %endif +%if 0%{with_vulkan} +%files libVulkan +%defattr(-,root,root) +%dir %{_sysconfdir}/vulkan +%dir %{_sysconfdir}/vulkan/icd.d +%{_sysconfdir}/vulkan/icd.d/intel_icd.json +%{_libdir}/libvulkan*.so + +%files libVulkan-devel +%defattr(-,root,root) +%dir %_includedir/vulkan +%_includedir/vulkan +%endif + %changelog diff --git a/U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch b/U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch new file mode 100644 index 0000000..1985c11 --- /dev/null +++ b/U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch @@ -0,0 +1,37 @@ +From patchwork Fri Jun 3 23:22:40 2016 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [Mesa-dev] anv: add the X related and Wayland CFLAGS to + VULKAN_ENTRYPOINT_CPPFLAGS +From: Emil Velikov +X-Patchwork-Id: 91607 +Message-Id: <1464996160-23417-1-git-send-email-emil.l.velikov@gmail.com> +To: mesa-dev@lists.freedesktop.org +Cc: emil.l.velikov@gmail.com, Emil Velikov +Date: Sat, 4 Jun 2016 00:22:40 +0100 + +From: Emil Velikov + +Otherwise we might fail to find the headers in some scenarios. + +Cc: Tobias Klausmann +Reported-by: Tobias Klausmann +Signed-off-by: Emil Velikov +--- + src/intel/vulkan/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am +index 37c2986..3294fa4 100644 +--- a/src/intel/vulkan/Makefile.am ++++ b/src/intel/vulkan/Makefile.am +@@ -125,6 +125,8 @@ nodist_EXTRA_libvulkan_intel_la_SOURCES = dummy.cpp + libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES) + + VULKAN_ENTRYPOINT_CPPFLAGS = \ ++ $(XCB_DRI3_CFLAGS) \ ++ $(WAYLAND_CFLAGS) \ + -DVK_USE_PLATFORM_XCB_KHR \ + -DVK_USE_PLATFORM_WAYLAND_KHR + diff --git a/U_gallivm-disable-avx512-features.patch b/U_gallivm-disable-avx512-features.patch deleted file mode 100644 index a461b17..0000000 --- a/U_gallivm-disable-avx512-features.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Roland Scheidegger -Date: Sun May 8 00:40:07 2016 +0200 -Subject: [PATCH]gallivm: disable avx512 features -Patch-mainline: Upstream -Git-repo: git://anongit.freedesktop.org/git/mesa/mesa -Git-commit: 8b66e2647d5e36e318177a460e6e586d6ca8c36b -References: bsc#980557 -Signed-off-by: Egbert Eich - -We don't target this yet, and some llvm versions incorrectly enable it based -on cpu string, causing crashes. -(Albeit this is a losing battle, it is pretty much guaranteed when the next -new feature comes along llvm will mistakenly enable it on some future cpu, -thus we would have to proactively disable all new features as llvm adds them.) - -This should fix https://bugs.freedesktop.org/show_bug.cgi?id=94291 (untested) - -Tested-by: Timo Aaltonen -Reviewed-by: Jose Fonseca ---- - src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index bb08892..42a53ec 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -571,6 +571,18 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, - MAttrs.push_back(util_cpu_caps.has_avx ? "+avx" : "-avx"); - MAttrs.push_back(util_cpu_caps.has_f16c ? "+f16c" : "-f16c"); - MAttrs.push_back(util_cpu_caps.has_avx2 ? "+avx2" : "-avx2"); -+ /* disable avx512 and all subvariants */ -+#if HAVE_LLVM >= 0x0304 -+ MAttrs.push_back("-avx512cd"); -+ MAttrs.push_back("-avx512er"); -+ MAttrs.push_back("-avx512f"); -+ MAttrs.push_back("-avx512pf"); -+#endif -+#if HAVE_LLVM >= 0x0305 -+ MAttrs.push_back("-avx512bw"); -+ MAttrs.push_back("-avx512dq"); -+ MAttrs.push_back("-avx512vl"); -+#endif - #endif - - #if defined(PIPE_ARCH_PPC) diff --git a/baselibs.conf b/baselibs.conf index e9cc3e7..e55c347 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -54,6 +54,9 @@ Mesa-libd3d provides "d3dadapter9.so.1" Mesa-libd3d-devel requires "Mesa-libd3d- = " +Mesa-libVulkan +Mesa-libVulkan-devel + requires "Mesa-libVulkan- = " libXvMC_nouveau libXvMC_r600 libvdpau_nouveau diff --git a/mesa-11.2.2.tar.xz b/mesa-11.2.2.tar.xz deleted file mode 100644 index 7add1b1..0000000 --- a/mesa-11.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4 -size 7860932 diff --git a/mesa-11.2.2.tar.xz.sig b/mesa-11.2.2.tar.xz.sig deleted file mode 100644 index c65d98d9c4abeccebd321fb31160053200977d0e0139d1d4782936d196be0e95..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SEvF1p-$vj$!}`2@vhBH?S=0NeyaP5C2Aj$~!Ot#$xZY9Vr5g zQLVau66rKLUe)+x&l&~Y0pN?HCKvK_3;*@5hsG~C(d4V#jTo-0yZ%Z~n+!_12q<<$ z9v|d<4b{~uoxyRg;@EXMr3UjO!&mdk^ANjXDwW!pQTAH?sTPD<(Nw4 zC&xa7RVH-B`)wJv!to)1fb-w(EjR10*a*KLpmHyDLZH=BpTr6}o~6&**+7bVmo@VM zU_g{KtsGcsN;}nLnj2u^-zH!EbIr`Su^^qrvD7#{jwpE^8CU&JYCdw0w|A0WVOX`i zgkI$Z+DtmylZhRv&l;|pGoS@+;}=*xqg%jD#_yR7&?o8jUo^vML{G!LDIIk{toTzEn%_y*24cO@@?9z)llCAPOOrDx|S0KPRH7%X?m hd~aP(D4%eB?+kbTP9ZtZCHAb#8Jlxq&GHU%rcQ9G0Ga>* diff --git a/mesa-12.0.0-rc2.tar.xz b/mesa-12.0.0-rc2.tar.xz new file mode 100644 index 0000000..79ec387 --- /dev/null +++ b/mesa-12.0.0-rc2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fea2e873e8baf92cefa58695d4e719bcddb279c601077f0e7fafaed1259fbc0 +size 8550332 diff --git a/mesa-12.0.0-rc2.tar.xz.sig b/mesa-12.0.0-rc2.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..4d40b2649d659d116c69ba5b7da74083f1dd4e01d33f6bc07484c6c4674a13db GIT binary patch literal 543 zcmV+)0^t3L0vrSY0SEvF1p-%Awxj?G2@vhBH?S=0Ne!mi5C3N(@C~*GQF4W|F?;6z zzTK%cBXJ*R$^L&4%!UHxmV+nfRiO5{0wOK9fuZYdqOy+mY^mc)G4d;%2!5g{>;13d zKj;}C6#UW~qSP@O*iwL5Ad4=e^~@(V>v88LmZE6fiKBIL;bw zKj4THfF`nuXHr5|3xhu9a<6r`xZR9p{D@lP2;>V2Qxa5XP{2ioGW|*Tohs@}KA>Lnm0-^vJGA}x)Hb!hyzRK++ z(pY(z38Ios9X1vj+5B%y#V+qQ61gjL`;XH_cdw3bLV@ z`->s8?m7j40{aY2@jTUW2~DSMBO9H~kG5k)B1_h&uYV{zwyh_7qzv>HlyES)MIeYy hb);c -Date: Tue May 17 08:22:42 2016 +0200 -Subject: glxcmds: glXGetFBConfigs, fix screen bounds -Patch-mainline: Not yet -Git-repo: git://anongit.freedesktop.org/git/mesa/mesa -Git-commit: 6aaa258229ec09f84ca51a728e125009ecee2d16 -References: boo#980382 - -Bounds of screen are 0 (inclusive) and ScreenCount(dpy) (exclusive). -The upper bound was too high: ScreenCount(dpy) (inclusive). - -This causes a crash invoked by java3d which passes down an invalid -screen: -6 0x00007f0e5198ba70 in () at /lib64/libc.so.6 -7 0x00007f0e14531e14 in glXGetFBConfigs (dpy=, screen=1, nelements=nelements@entry=0x7f0dab3c522c) at glxcmds.c:1660 -8 0x00007f0e14532f7f in glXChooseFBConfig (dpy=, screen=, attribList=0x7f0dab3c54e0, nitems=0x7f0dab3c535c) at glxcmds.c:1611 -9 0x00007f0e1478d29b in find_S_FBConfigs () at /usr/lib64/libj3dcore-ogl.so -10 0x00007f0e1478d3dc in find_S_S_FBConfigs () at /usr/lib64/libj3dcore-ogl.so -11 0x00007f0e1478d567 in find_AA_S_S_FBConfigs () at /usr/lib64/libj3dcore-ogl.so -12 0x00007f0e1478d728 in find_DB_AA_S_S_FBConfigs () at /usr/lib64/libj3dcore-ogl.so -13 0x00007f0e1478d97c in Java_javax_media_j3d_X11NativeConfigTemplate3D_chooseOglVisual () at /usr/lib64/libj3dcore-ogl.so - -While ScreenCount(dpy) is actually 1: -(gdb) p dpy->nscreens -$2 = 1 -screen=1 is passed to glXGetFBConfigs. - -Easily reproducible by: - #include - - #include - #include - - int main() - { - unsigned a; - int n; - Display *d = XOpenDisplay(":0"); - GLXFBConfig *cfg; - - for (a = 0; a <= ScreenCount(d); a++) - cfg = glXGetFBConfigs(d, a, &n); - - XCloseDisplay(d); - - return 0; - } - -Fix this typo in glXGetFBConfigs. - -Signed-off-by: Jiri Slaby -Cc: -Signed-off-by: Egbert Eich ---- - src/glx/glxcmds.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c -index 63f4921..46bc214 100644 ---- a/src/glx/glxcmds.c -+++ b/src/glx/glxcmds.c -@@ -1657,7 +1657,7 @@ glXGetFBConfigs(Display * dpy, int screen, int *nelements) - - *nelements = 0; - if (priv && (priv->screens != NULL) -- && (screen >= 0) && (screen <= ScreenCount(dpy)) -+ && (screen >= 0) && (screen < ScreenCount(dpy)) - && (priv->screens[screen]->configs != NULL) - && (priv->screens[screen]->configs->fbconfigID - != (int) GLX_DONT_CARE)) { From 01ad272dc317bfb8c1d4aead8147150fb44aa03249a1e85fecf29031a7bdc74e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 8 Jun 2016 09:46:24 +0000 Subject: [PATCH 02/11] Accepting request 400616 from home:jirislaby:branches:X11:XOrg x86: enable virgl gallium driver OBS-URL: https://build.opensuse.org/request/show/400616 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=521 --- Mesa.changes | 5 +++++ Mesa.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Mesa.changes b/Mesa.changes index bcb0d11..eb81a30 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 8 07:33:35 UTC 2016 - jslaby@suse.com + +- x86: enable virgl gallium driver + ------------------------------------------------------------------- Tue Jun 7 23:25:31 UTC 2016 - tobias.johannes.klausmann@mni.thm.de diff --git a/Mesa.spec b/Mesa.spec index ac94898..12240f1 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -624,7 +624,7 @@ autoreconf -fvi --enable-opencl-icd \ %endif --enable-llvm-shared-libs \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga \ + --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \ --enable-vdpau \ --enable-va \ --enable-xvmc \ From 63ee6ec825bf44da0e16c86870c0b274f005692c55158e91fa137c679e5e889b Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 8 Jun 2016 20:41:14 +0000 Subject: [PATCH 03/11] Accepting request 400728 from home:tobijk:X11:XOrg - Fix Requirement for Mesa-libVulkan-devel, not Mesa-libvulkan, but Mesa-libVulkan OBS-URL: https://build.opensuse.org/request/show/400728 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=522 --- Mesa.changes | 6 ++++++ Mesa.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Mesa.changes b/Mesa.changes index eb81a30..a2e3fb4 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 8 20:10:11 UTC 2016 - tobias.johannes.klausmann@mni.thm.de + +- Fix Requirement for Mesa-libVulkan-devel, not Mesa-libvulkan, but + Mesa-libVulkan + ------------------------------------------------------------------- Wed Jun 8 07:33:35 UTC 2016 - jslaby@suse.com diff --git a/Mesa.spec b/Mesa.spec index 12240f1..e538323 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -465,7 +465,7 @@ This package contains the Vulkan parts for Mesa. %package libVulkan-devel Summary: Mesas Vulkan development files Group: System/Libraries -Requires: %{name}-libvulkan = %{version} +Requires: %{name}-libVulkan = %{version} %description libVulkan-devel This package contains the development files for Mesas Vulkan implementation. From 2a1f9111c43745a885d1e205fc7b59da49454c9743de2c2ed87b15a411abadff Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 9 Jun 2016 09:46:40 +0000 Subject: [PATCH 04/11] added U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch to changelog OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=523 --- Mesa.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Mesa.changes b/Mesa.changes index a2e3fb4..13c2829 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -53,6 +53,9 @@ Tue Jun 7 23:25:31 UTC 2016 - tobias.johannes.klausmann@mni.thm.de - Remove upstreamed patches: + u_glxcmds-glXGetFBConfigs-fix-screen-bounds.patch + U_gallivm-disable-avx512-features.patch +- Upstream Patches: + + U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch + * Otherwise we might fail to find the headers in some scenarios. - drop docs/COPYING: No GPL licensed code in Mesa resident (upstream change) ------------------------------------------------------------------- From cadaf923299804c0348bfd642f766dca625081d42acb9d535ac665b82f896423 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 10 Jun 2016 08:26:56 +0000 Subject: [PATCH 05/11] Accepting request 400892 from home:mimi_vx:branches:X11:XOrg - fix vulkan naming scheme, add supplement for xf86-video-intel OBS-URL: https://build.opensuse.org/request/show/400892 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=524 --- Mesa.changes | 5 +++++ Mesa.spec | 58 ++++++++++++++++++++++++++------------------------- baselibs.conf | 4 ++-- 3 files changed, 37 insertions(+), 30 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index 13c2829..d7b323d 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 9 20:29:29 UTC 2016 - mimi.vx@gmail.com + +- fix vulkan naming scheme, add supplement for xf86-video-intel + ------------------------------------------------------------------- Wed Jun 8 20:10:11 UTC 2016 - tobias.johannes.klausmann@mni.thm.de diff --git a/Mesa.spec b/Mesa.spec index e538323..68e8120 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -20,6 +20,7 @@ %define _name_archive mesa %define _version 12.0.0-rc2 %define with_opencl 0 +%define with_vulkan 0 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x %define gallium_loader 1 %else @@ -39,9 +40,9 @@ %if 0%{gallium_loader} && 0%{?suse_version} > 1310 # llvm >= 3.7 not provided for <= 13.1 %define with_opencl 1 -%endif %define with_vulkan 1 %endif +%endif Name: Mesa Version: 12.0.0~rc2 @@ -90,7 +91,7 @@ BuildRequires: pkgconfig(dri2proto) BuildRequires: pkgconfig(dri3proto) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(glproto) -BuildRequires: pkgconfig(libdrm) >= 2.4.60 +BuildRequires: pkgconfig(libdrm) >= 2.4.66 BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.63 BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.66 BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.56 @@ -99,7 +100,7 @@ BuildRequires: pkgconfig(libudev) > 151 BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(presentproto) -BuildRequires: pkgconfig(vdpau) >= 0.4.1 +BuildRequires: pkgconfig(vdpau) >= 1.1 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb-dri2) @@ -139,7 +140,6 @@ BuildRequires: pkgconfig(wayland-server) BuildRequires: llvm-devel BuildRequires: ncurses-devel %endif -#!BuildIgnore: python %if 0%{with_opencl} BuildRequires: libclc @@ -447,30 +447,13 @@ Mesa Direct3D9 state tracker %package libd3d-devel Summary: Mesa Direct3D9 state tracker development package -Group: System/Libraries +Group: Development/Libraries/C and C+ Requires: %{name}-libd3d = %{version} %description libd3d-devel Mesa Direct3D9 state tracker development package %endif -%if 0%{with_vulkan} -%package libVulkan -Summary: Mesas Vulkan implementation -Group: System/Libraries - -%description libVulkan -This package contains the Vulkan parts for Mesa. - -%package libVulkan-devel -Summary: Mesas Vulkan development files -Group: System/Libraries -Requires: %{name}-libVulkan = %{version} - -%description libVulkan-devel -This package contains the development files for Mesas Vulkan implementation. -%endif - %package -n libxatracker2 Version: 1.0.0 Release: 0 @@ -566,6 +549,25 @@ Supplements: Mesa %description libva This package contains the Mesa VA-API implementation provided through gallium. + +%if 0%{with_vulkan} +%package -n libvulkan_intel +Summary: Mesa vulkan driver for Intel GPU +Group: System/Libraries +Supplements: xf86-video-intel + +%description -n libvulkan_intel +This package contains the Vulkan parts for Mesa. + +%package libVulkan-devel +Summary: Mesas Vulkan development files +Group: System/Libraries +Requires: libvulkan_intel = %{version} + +%description libVulkan-devel +This package contains the development files for Mesas Vulkan implementation. +%endif + %prep %setup -q -n %{_name_archive}-%{_version} -b4 # remove some docs @@ -656,7 +658,7 @@ autoreconf -fvi --with-gallium-drivers=swrast,svga \ %endif CFLAGS="%{optflags} -DNDEBUG" -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install make DESTDIR=%{buildroot} install %{?_smp_mflags} @@ -769,14 +771,14 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \ %postun libva -p /sbin/ldconfig %if 0%{with_vulkan} -%post libVulkan -p /sbin/ldconfig +%post -n libvulkan_intel -p /sbin/ldconfig -%postun libVulkan -p /sbin/ldconfig +%postun -n libvulkan_intel -p /sbin/ldconfig %endif %files %defattr(-,root,root) -%doc docs/README* +%doc docs/README* docs/license.html %config %{_sysconfdir}/drirc %dir %{_libdir}/dri %if 0%{?suse_version} < 1315 @@ -981,12 +983,12 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \ %endif %if 0%{with_vulkan} -%files libVulkan +%files -n libvulkan_intel %defattr(-,root,root) %dir %{_sysconfdir}/vulkan %dir %{_sysconfdir}/vulkan/icd.d %{_sysconfdir}/vulkan/icd.d/intel_icd.json -%{_libdir}/libvulkan*.so +%{_libdir}/libvulkan_intel.so %files libVulkan-devel %defattr(-,root,root) diff --git a/baselibs.conf b/baselibs.conf index e55c347..8d3d58e 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -54,9 +54,9 @@ Mesa-libd3d provides "d3dadapter9.so.1" Mesa-libd3d-devel requires "Mesa-libd3d- = " -Mesa-libVulkan +libvulkan_intel Mesa-libVulkan-devel - requires "Mesa-libVulkan- = " + requires "libvulkan_intel- = " libXvMC_nouveau libXvMC_r600 libvdpau_nouveau From b34f1e86d6310320a482bf51d3948e5a1745b48ef1018c8f28559ef34841f484 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sun, 12 Jun 2016 09:23:17 +0000 Subject: [PATCH 06/11] - fixed 'osc service localrun download_files' run by removing rc release from version define OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=525 --- Mesa.changes | 6 ++++++ Mesa.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Mesa.changes b/Mesa.changes index d7b323d..189675b 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jun 12 09:22:10 UTC 2016 - sndirsch@suse.com + +- fixed 'osc service localrun download_files' run by removing + rc release from version define + ------------------------------------------------------------------- Thu Jun 9 20:29:29 UTC 2016 - mimi.vx@gmail.com diff --git a/Mesa.spec b/Mesa.spec index 68e8120..096ac8f 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -45,7 +45,7 @@ %endif Name: Mesa -Version: 12.0.0~rc2 +Version: 12.0.0 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT From cab497d30937e8985207a2115f4754b8847e5c414c7f91b95550dc710062aae5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 16 Jun 2016 10:36:16 +0000 Subject: [PATCH 07/11] - Update to version 12.0.0-rc2 * Bug fixes and performance improvements - supersedes patches: u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch, U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch - removed option for build in verbose log mode OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=526 --- Mesa.changes | 10 +++++ Mesa.spec | 10 +---- ...related-and-Wayland-CFLAGS-to-VULKAN.patch | 37 ----------------- mesa-12.0.0-rc2.tar.xz | 3 -- mesa-12.0.0-rc2.tar.xz.sig | Bin 543 -> 0 bytes mesa-12.0.0-rc3.tar.xz | 3 ++ mesa-12.0.0-rc3.tar.xz.sig | Bin 0 -> 543 bytes ...river-instances-to-gallium_drv_video.patch | 38 ------------------ 8 files changed, 15 insertions(+), 86 deletions(-) delete mode 100644 U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch delete mode 100644 mesa-12.0.0-rc2.tar.xz delete mode 100644 mesa-12.0.0-rc2.tar.xz.sig create mode 100644 mesa-12.0.0-rc3.tar.xz create mode 100644 mesa-12.0.0-rc3.tar.xz.sig delete mode 100644 u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch diff --git a/Mesa.changes b/Mesa.changes index 189675b..7010c57 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jun 15 14:39:32 UTC 2016 - sndirsch@suse.com + +- Update to version 12.0.0-rc2 + * Bug fixes and performance improvements +- supersedes patches: + u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch, + U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch +- removed option for build in verbose log mode + ------------------------------------------------------------------- Sun Jun 12 09:22:10 UTC 2016 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 096ac8f..2477291 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -18,7 +18,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 12.0.0-rc2 +%define _version 12.0.0-rc3 %define with_opencl 0 %define with_vulkan 0 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x @@ -66,14 +66,10 @@ Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch Patch13: u_mesa-8.0.1-fix-16bpp.patch # Patch from Fedora, use shmget when available, under llvmpipe Patch15: u_mesa-8.0-llvmpipe-shmget.patch -# to be upstreamed -Patch17: u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch # never to be upstreamed Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch # never to be upstreamed Patch21: n_Define-GLAPIVAR-separate-from-GLAPI.patch -# Build fix for intel vulkan (to be upstreamed) -Patch30: U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -582,10 +578,8 @@ rm -rf docs/README.{VMS,WIN32,OS2} #%patch11 -p1 #%patch15 -p1 #%patch13 -p1 -%patch17 -p1 %patch18 -p1 %patch21 -p1 -%patch30 -p1 %build %if 0%{?suse_version} >= 1310 @@ -658,7 +652,7 @@ autoreconf -fvi --with-gallium-drivers=swrast,svga \ %endif CFLAGS="%{optflags} -DNDEBUG" -make %{?_smp_mflags} V=1 +make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install %{?_smp_mflags} diff --git a/U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch b/U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch deleted file mode 100644 index 1985c11..0000000 --- a/U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch +++ /dev/null @@ -1,37 +0,0 @@ -From patchwork Fri Jun 3 23:22:40 2016 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [Mesa-dev] anv: add the X related and Wayland CFLAGS to - VULKAN_ENTRYPOINT_CPPFLAGS -From: Emil Velikov -X-Patchwork-Id: 91607 -Message-Id: <1464996160-23417-1-git-send-email-emil.l.velikov@gmail.com> -To: mesa-dev@lists.freedesktop.org -Cc: emil.l.velikov@gmail.com, Emil Velikov -Date: Sat, 4 Jun 2016 00:22:40 +0100 - -From: Emil Velikov - -Otherwise we might fail to find the headers in some scenarios. - -Cc: Tobias Klausmann -Reported-by: Tobias Klausmann -Signed-off-by: Emil Velikov ---- - src/intel/vulkan/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am -index 37c2986..3294fa4 100644 ---- a/src/intel/vulkan/Makefile.am -+++ b/src/intel/vulkan/Makefile.am -@@ -125,6 +125,8 @@ nodist_EXTRA_libvulkan_intel_la_SOURCES = dummy.cpp - libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES) - - VULKAN_ENTRYPOINT_CPPFLAGS = \ -+ $(XCB_DRI3_CFLAGS) \ -+ $(WAYLAND_CFLAGS) \ - -DVK_USE_PLATFORM_XCB_KHR \ - -DVK_USE_PLATFORM_WAYLAND_KHR - diff --git a/mesa-12.0.0-rc2.tar.xz b/mesa-12.0.0-rc2.tar.xz deleted file mode 100644 index 79ec387..0000000 --- a/mesa-12.0.0-rc2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4fea2e873e8baf92cefa58695d4e719bcddb279c601077f0e7fafaed1259fbc0 -size 8550332 diff --git a/mesa-12.0.0-rc2.tar.xz.sig b/mesa-12.0.0-rc2.tar.xz.sig deleted file mode 100644 index 4d40b2649d659d116c69ba5b7da74083f1dd4e01d33f6bc07484c6c4674a13db..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SEvF1p-%Awxj?G2@vhBH?S=0Ne!mi5C3N(@C~*GQF4W|F?;6z zzTK%cBXJ*R$^L&4%!UHxmV+nfRiO5{0wOK9fuZYdqOy+mY^mc)G4d;%2!5g{>;13d zKj;}C6#UW~qSP@O*iwL5Ad4=e^~@(V>v88LmZE6fiKBIL;bw zKj4THfF`nuXHr5|3xhu9a<6r`xZR9p{D@lP2;>V2Qxa5XP{2ioGW|*Tohs@}KA>Lnm0-^vJGA}x)Hb!hyzRK++ z(pY(z38Ios9X1vj+5B%y#V+qQ61gjL`;XH_cdw3bLV@ z`->s8?m7j40{aY2@jTUW2~DSMBO9H~kG5k)B1_h&uYV{zwyh_7qzv>HlyES)MIeYy hb);c({TgfpV701}8~QUCV|* ztUs!W!>ypR6#M@0ZH-Xp&QF-tRi)4pZrEUIV7{>azHt zMDBZ5ut~xZ`*1u)xedbHa6CU`{e)t literal 0 HcmV?d00001 diff --git a/u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch b/u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch deleted file mode 100644 index 6330cfb..0000000 --- a/u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8974248c4147e57552dc21c6d16e4d1817d34fad Mon Sep 17 00:00:00 2001 -From: Jimmy Berry -Date: Sat, 19 Dec 2015 22:49:10 -0600 -Subject: [Mesa-dev] [PATCH] st/va: hardlink driver instances to gallium_drv_video.so - -Removes the need to set LIBVA_DRIVER_NAME=gallium for supported targets and is -consistent with vdpau and general gallium drivers. - -Signed-off-by: Jimmy Berry ---- - src/gallium/targets/va/Makefile.am | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am -index 733e7ac..2cab898 100644 ---- a/src/gallium/targets/va/Makefile.am -+++ b/src/gallium/targets/va/Makefile.am -@@ -64,3 +64,17 @@ if HAVE_MESA_LLVM - gallium_drv_video_la_LIBADD += $(LLVM_LIBS) - gallium_drv_video_la_LDFLAGS += $(LLVM_LDFLAGS) - endif -+ -+# hardlink each megadriver instance, but don't actually have -+# gallium_drv_video.so in the set of final installed files. -+install-data-hook: -+ for i in $(TARGET_DRIVERS); do \ -+ ln -f $(DESTDIR)$(vadir)/gallium_drv_video.so \ -+ $(DESTDIR)$(vadir)/$${i}_drv_video.so; \ -+ done; \ -+ $(RM) $(DESTDIR)$(vadir)/gallium_drv_video.* -+ -+uninstall-hook: -+ for i in $(TARGET_DRIVERS); do \ -+ $(RM) $(DESTDIR)$(vadir)/$${i}_drv_video.so; \ -+ done; --- -2.6.3 - From fdd9dbcad856afaeec207a12053d689ab3b3cd795e62b54a4a5ff8386cccfcd1 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 16 Jun 2016 10:39:04 +0000 Subject: [PATCH 08/11] - improved Group tag for libVulkan-devel OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=527 --- Mesa.changes | 1 + Mesa.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Mesa.changes b/Mesa.changes index 7010c57..00ddadc 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -7,6 +7,7 @@ Wed Jun 15 14:39:32 UTC 2016 - sndirsch@suse.com u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch, U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch - removed option for build in verbose log mode +- improved Group tag for libVulkan-devel ------------------------------------------------------------------- Sun Jun 12 09:22:10 UTC 2016 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 2477291..74d47d8 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -557,7 +557,7 @@ This package contains the Vulkan parts for Mesa. %package libVulkan-devel Summary: Mesas Vulkan development files -Group: System/Libraries +Group: Development/Libraries/C and C++ Requires: libvulkan_intel = %{version} %description libVulkan-devel From 81f3b5b6d8f47d7d8b594ab86e99de63eed88bd594d651773817c35d99edc832 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 17 Jun 2016 14:19:40 +0000 Subject: [PATCH 09/11] - let Mesa-libVulkan-devel conflict with vulkan-devel due to file conflics in both packages OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=528 --- Mesa.changes | 6 ++++++ Mesa.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/Mesa.changes b/Mesa.changes index 00ddadc..1c2630e 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 17 14:12:52 UTC 2016 - sndirsch@suse.com + +- let Mesa-libVulkan-devel conflict with vulkan-devel due to file + conflics in both packages + ------------------------------------------------------------------- Wed Jun 15 14:39:32 UTC 2016 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 74d47d8..e678a57 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -559,6 +559,7 @@ This package contains the Vulkan parts for Mesa. Summary: Mesas Vulkan development files Group: Development/Libraries/C and C++ Requires: libvulkan_intel = %{version} +Conflicts: vulkan-devel %description libVulkan-devel This package contains the development files for Mesas Vulkan implementation. From 8ced621141fc46b00ff28dfc17391475104b2a39e9b4e3cd378bd63b40a172f3 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 17 Jun 2016 15:15:38 +0000 Subject: [PATCH 10/11] - moved libxatracker package definition to the end to get rid of issues related to the special version of this package OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=529 --- Mesa.changes | 6 ++++++ Mesa.spec | 56 ++++++++++++++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index 1c2630e..f582c3c 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 17 14:57:47 UTC 2016 - sndirsch@suse.com + +- moved libxatracker package definition to the end to get rid of + issues related to the special version of this package + ------------------------------------------------------------------- Fri Jun 17 14:12:52 UTC 2016 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index e678a57..12fb28d 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -450,34 +450,6 @@ Requires: %{name}-libd3d = %{version} Mesa Direct3D9 state tracker development package %endif -%package -n libxatracker2 -Version: 1.0.0 -Release: 0 -Summary: XA state tracker -Group: System/Libraries - -%description -n libxatracker2 -This package contains the XA state tracker for gallium3D driver. -It superseeds the Xorg state tracker and provides an infrastructure -to accelerate Xorg 2D operations. It is currently used by vmwgfx -video driver. - -%package -n libxatracker-devel -Version: 1.0.0 -Release: 0 -Summary: Development files for the XA API -Group: Development/Libraries/C and C++ -Requires: libxatracker2 = %{version} - -%description -n libxatracker-devel -This package contains the XA state tracker for gallium3D driver. -It superseeds the Xorg state tracker and provides an infrastructure -to accelerate Xorg 2D operations. It is currently used by vmwgfx -video driver. - -This package provides the development environment for compiling -programs against the XA state tracker. - %package -n libXvMC_nouveau Summary: XVMC state tracker for Nouveau Group: System/Libraries @@ -565,6 +537,34 @@ Conflicts: vulkan-devel This package contains the development files for Mesas Vulkan implementation. %endif +%package -n libxatracker2 +Version: 1.0.0 +Release: 0 +Summary: XA state tracker +Group: System/Libraries + +%description -n libxatracker2 +This package contains the XA state tracker for gallium3D driver. +It superseeds the Xorg state tracker and provides an infrastructure +to accelerate Xorg 2D operations. It is currently used by vmwgfx +video driver. + +%package -n libxatracker-devel +Version: 1.0.0 +Release: 0 +Summary: Development files for the XA API +Group: Development/Libraries/C and C++ +Requires: libxatracker2 = %{version} + +%description -n libxatracker-devel +This package contains the XA state tracker for gallium3D driver. +It superseeds the Xorg state tracker and provides an infrastructure +to accelerate Xorg 2D operations. It is currently used by vmwgfx +video driver. + +This package provides the development environment for compiling +programs against the XA state tracker. + %prep %setup -q -n %{_name_archive}-%{_version} -b4 # remove some docs From 12b4a658dc4dd3e5d994e3201fd5d4387ec55ddba8ff96d1b57880da2035ee23 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 22 Jun 2016 08:56:49 +0000 Subject: [PATCH 11/11] Accepting request 403941 from home:mimi_vx:branches:X11:XOrg - update to 12.0.0-rc4 final RC OBS-URL: https://build.opensuse.org/request/show/403941 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=530 --- Mesa.changes | 5 +++++ Mesa.spec | 2 +- mesa-12.0.0-rc3.tar.xz | 3 --- mesa-12.0.0-rc3.tar.xz.sig | Bin 543 -> 0 bytes mesa-12.0.0-rc4.tar.xz | 3 +++ mesa-12.0.0-rc4.tar.xz.sig | Bin 0 -> 543 bytes 6 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 mesa-12.0.0-rc3.tar.xz delete mode 100644 mesa-12.0.0-rc3.tar.xz.sig create mode 100644 mesa-12.0.0-rc4.tar.xz create mode 100644 mesa-12.0.0-rc4.tar.xz.sig diff --git a/Mesa.changes b/Mesa.changes index f582c3c..ac7ffaa 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 21 19:57:26 UTC 2016 - mimi.vx@gmail.com + +- update to 12.0.0-rc4 final RC + ------------------------------------------------------------------- Fri Jun 17 14:57:47 UTC 2016 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 12fb28d..6bb4c50 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -18,7 +18,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 12.0.0-rc3 +%define _version 12.0.0-rc4 %define with_opencl 0 %define with_vulkan 0 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x diff --git a/mesa-12.0.0-rc3.tar.xz b/mesa-12.0.0-rc3.tar.xz deleted file mode 100644 index efab581..0000000 --- a/mesa-12.0.0-rc3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29b3526e3e76cec4f84f3e2b17bfd0c3ab224ce305891471a47b02e81b4af6f5 -size 8564208 diff --git a/mesa-12.0.0-rc3.tar.xz.sig b/mesa-12.0.0-rc3.tar.xz.sig deleted file mode 100644 index 30ab84fc4477072e0159058eb5afcd57f7e730ed2450de450d51eae25ed2febc..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SEvF1p-%LFmC_~2@vhBH?S=0Ne#Qa5C2Cyn^7+2Kp0j@o^^=t zC!e#_X0bwB+e`+2Kld^7$^Tw3yJMfTvaElhSq({TgfpV701}8~QUCV|* ztUs!W!>ypR6#M@0ZH-Xp&QF-tRi)4pZrEUIV7{>azHt zMDBZ5ut~xZ`*1u)xedbHa6CU`{e)t diff --git a/mesa-12.0.0-rc4.tar.xz b/mesa-12.0.0-rc4.tar.xz new file mode 100644 index 0000000..eba3774 --- /dev/null +++ b/mesa-12.0.0-rc4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a27f43f0031a3f1e77d767f7e3e019120ec5181a0a7c81fc0da7b611e8c4e91a +size 8565652 diff --git a/mesa-12.0.0-rc4.tar.xz.sig b/mesa-12.0.0-rc4.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..6248b99de9f5333fd740459e251a1cd4d4bcb9a90f42b5a5c9b833a2d4fe5641 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0SEvF1p-%TOMCzd2@vhBH?S=0Neu}H5Bv>^?xnNUg-k76pk@jQW$8^E2|82jNvUPZ1s1d<^Rn)kyFlON!JFE4~UEz@3)qCfDGs)_z}* zSH@TtIMm_6No7gK_705AQKJVYD4I~WSyAhyCHkWNJ~_(m3Mnq9Dq+cQU3q`{z4?b} z4Xke(r^wt8*0*T@-tqiN@l7Pm31@z?2$lQU5x7(D*kDDsSL?SXMoy`@{M?CwGO=nU z;RDnm0;$6{MSCNoOGeLRuYzYlv#=H7^8;Qe2k-(jM0FeTrV&;#8X7VUA3K~K3ie02 zS@Ddn)oi1~x&L<62&a_~$2ncYvejWy*``}E26Tq;(0-xsOnbosqp>7EF#PPnUt5#Q z{Dka*OECVPt!6oG&M&7t>fnO7WIe|E*zgbJoVE|Ydm}?W&kYt6SkPQav4E9fIFV_x zC{K!LBR2DkpLV{khP2G*<+LR^HC2N+!}D5w$32+MIn!`I60;T*`+(=c)4*pA^fPKp z%^!fsMHG+37+-{(k h08r&+UN9^E1ak={EI|&G2vFGR#LKz2%!J~ literal 0 HcmV?d00001