mesa 19.1.4-1 (i686;x86_64) 2019-6347
9999
Status | published | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Submitter | angrypenguinpoland [@T] gmail.com | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Platform | 4.0 | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Repository | main | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
URL | https://abf.openmandriva.org/build_lists/590023 | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Packages |
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Build Date | 2019-08-11 20:12:44 +0000 UTC | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Last Updated | 2019-08-18 18:58:52.688468221 +0000 UTC |
$ git diff --patch-with-stat --summary 4f38d15a1f6955f2ca4f2b5f7010cfb64aa9e05b..b0ba02d9f582b80b85cccf29b7c9ab4311a8a736 .abf.yml | 2 +- 1084.diff | 102 +++++++++++++++++++++++++++++++++++ mesa-19.1.0-compile-bug-110709.patch | 33 ------------ mesa.spec | 62 ++++++++++++++++----- 4 files changed, 151 insertions(+), 48 deletions(-) create mode 100644 1084.diff delete mode 100644 mesa-19.1.0-compile-bug-110709.patch diff --git a/.abf.yml b/.abf.yml index eda1ff1..f4d604a 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - mesa-19.1.0.tar.xz: e2088e1d4fd9c113c5fc4ee416702f35f32ce668 + mesa-19.1.4.tar.xz: 393053bfa41b7fc65add756713004f034c39c3ce diff --git a/1084.diff b/1084.diff new file mode 100644 index 0000000..9bda924 --- /dev/null +++ b/1084.diff @@ -0,0 +1,102 @@ +diff --git a/src/gallium/auxiliary/vl/vl_bicubic_filter.c b/src/gallium/auxiliary/vl/vl_bicubic_filter.c +index f3f8cbee778ebc166854d1d396b1bb5ec84149c6..077e2131bfd74f660097d9325cd7d35d8fe72f78 100644 +--- a/src/gallium/auxiliary/vl/vl_bicubic_filter.c ++++ b/src/gallium/auxiliary/vl/vl_bicubic_filter.c +@@ -201,10 +201,11 @@ create_frag_shader(struct vl_bicubic_filter *filter, unsigned video_width, + + ureg_FLR(shader, ureg_writemask(t_array[22], TGSI_WRITEMASK_XY), + ureg_src(t_array[22])); +- ureg_DIV(shader, ureg_writemask(t_array[22], TGSI_WRITEMASK_XY), +- ureg_src(t_array[22]), ureg_imm2f(shader, video_width, video_height)); +- ureg_ADD(shader, ureg_writemask(t_array[22], TGSI_WRITEMASK_XY), +- ureg_src(t_array[22]), half_pixel); ++ ++ ureg_MAD(shader, ureg_writemask(t_array[22], TGSI_WRITEMASK_XY), ++ ureg_src(t_array[22]), ++ ureg_imm2f(shader, 1.0f / video_width, 1.0f / video_height), ++ half_pixel); + + /* + * t_array[0..*] = vtex + offset[0..*] +diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c +index 12c58ff7436db2ac865b4847f553646e9a767dd8..b925980b7ce49a9029c46ae4067a38f5cb0833de 100644 +--- a/src/gallium/auxiliary/vl/vl_compositor.c ++++ b/src/gallium/auxiliary/vl/vl_compositor.c +@@ -70,7 +70,7 @@ init_shaders(struct vl_compositor *c) + return false; + } + +- if (c->pipe_compute_supported) { ++ if (c->pipe_cs_composit_supported) { + c->cs_video_buffer = vl_compositor_cs_create_shader(c, compute_shader_video_buffer); + if (!c->cs_video_buffer) { + debug_printf("Unable to create video_buffer compute shader.\n"); +@@ -125,7 +125,7 @@ static void cleanup_shaders(struct vl_compositor *c) + c->pipe->delete_fs_state(c->pipe, c->fs_rgb_yuv.y); + c->pipe->delete_fs_state(c->pipe, c->fs_rgb_yuv.uv); + +- if (c->pipe_compute_supported) { ++ if (c->pipe_cs_composit_supported) { + c->pipe->delete_compute_state(c->pipe, c->cs_video_buffer); + c->pipe->delete_compute_state(c->pipe, c->cs_weave_rgb); + c->pipe->delete_compute_state(c->pipe, c->cs_rgba); +@@ -561,7 +561,7 @@ vl_compositor_set_buffer_layer(struct vl_compositor_state *s, + float half_a_line = 0.5f / s->layers[layer].zw.y; + switch(deinterlace) { + case VL_COMPOSITOR_WEAVE: +- if (c->pipe_compute_supported) ++ if (c->pipe_cs_composit_supported) + s->layers[layer].cs = c->cs_weave_rgb; + else + s->layers[layer].fs = c->fs_weave_rgb; +@@ -571,7 +571,7 @@ vl_compositor_set_buffer_layer(struct vl_compositor_state *s, + s->layers[layer].zw.x = 0.0f; + s->layers[layer].src.tl.y += half_a_line; + s->layers[layer].src.br.y += half_a_line; +- if (c->pipe_compute_supported) ++ if (c->pipe_cs_composit_supported) + s->layers[layer].cs = c->cs_video_buffer; + else + s->layers[layer].fs = c->fs_video_buffer; +@@ -581,7 +581,7 @@ vl_compositor_set_buffer_layer(struct vl_compositor_state *s, + s->layers[layer].zw.x = 1.0f; + s->layers[layer].src.tl.y -= half_a_line; + s->layers[layer].src.br.y -= half_a_line; +- if (c->pipe_compute_supported) ++ if (c->pipe_cs_composit_supported) + s->layers[layer].cs = c->cs_video_buffer; + else + s->layers[layer].fs = c->fs_video_buffer; +@@ -589,7 +589,7 @@ vl_compositor_set_buffer_layer(struct vl_compositor_state *s, + } + + } else { +- if (c->pipe_compute_supported) ++ if (c->pipe_cs_composit_supported) + s->layers[layer].cs = c->cs_video_buffer; + else + s->layers[layer].fs = c->fs_video_buffer; +@@ -757,7 +757,9 @@ vl_compositor_init(struct vl_compositor *c, struct pipe_context *pipe) + + memset(c, 0, sizeof(*c)); + +- c->pipe_compute_supported = pipe->screen->get_param(pipe->screen, PIPE_CAP_COMPUTE); ++ c->pipe_cs_composit_supported = pipe->screen->get_param(pipe->screen, PIPE_CAP_COMPUTE) && ++ pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_TEX_TXF_LZ); ++ + c->pipe = pipe; + + if (!init_pipe_state(c)) { +diff --git a/src/gallium/auxiliary/vl/vl_compositor.h b/src/gallium/auxiliary/vl/vl_compositor.h +index d42618824a7281b0e05cd82b10e50babd1985136..ae06c153d5b7229cada2a564e12c2f9e36f65f29 100644 +--- a/src/gallium/auxiliary/vl/vl_compositor.h ++++ b/src/gallium/auxiliary/vl/vl_compositor.h +@@ -121,7 +121,7 @@ struct vl_compositor + void *cs_weave_rgb; + void *cs_rgba; + +- bool pipe_compute_supported; ++ bool pipe_cs_composit_supported; + + struct { + struct { diff --git a/mesa-19.1.0-compile-bug-110709.patch b/mesa-19.1.0-compile-bug-110709.patch deleted file mode 100644 index f9e82f4..0000000 --- a/mesa-19.1.0-compile-bug-110709.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up mesa-19.1.0-rc2/src/glx/g_glxglvnddispatchfuncs.c.omv~ mesa-19.1.0-rc2/src/glx/g_glxglvnddispatchfuncs.c ---- mesa-19.1.0-rc2/src/glx/g_glxglvnddispatchfuncs.c.omv~ 2019-05-19 15:49:37.278203648 +0200 -+++ mesa-19.1.0-rc2/src/glx/g_glxglvnddispatchfuncs.c 2019-05-19 15:52:26.775930013 +0200 -@@ -143,7 +143,7 @@ static GLXFBConfigSGIX *dispatch_ChooseF - if (pChooseFBConfigSGIX == NULL) - return NULL; - -- ret = (*pChooseFBConfigSGIX)(dpy, screen, attrib_list, nelements); -+ ret = (*pChooseFBConfigSGIX)(dpy, screen, (int*)attrib_list, nelements); - if (AddFBConfigsMapping(dpy, ret, nelements, dd)) { - free(ret); - return NULL; -@@ -234,7 +234,7 @@ static GLXPbuffer dispatch_CreateGLXPbuf - if (pCreateGLXPbufferSGIX == NULL) - return None; - -- ret = (*pCreateGLXPbufferSGIX)(dpy, config, width, height, attrib_list); -+ ret = (*pCreateGLXPbufferSGIX)(dpy, config, width, height, (int*)attrib_list); - if (AddDrawableMapping(dpy, ret, dd)) { - PFNGLXDESTROYGLXPBUFFERSGIXPROC pDestroyGLXPbufferSGIX; - -diff -up mesa-19.1.0-rc2/src/glx/glxglvnd.c.omv~ mesa-19.1.0-rc2/src/glx/glxglvnd.c ---- mesa-19.1.0-rc2/src/glx/glxglvnd.c.omv~ 2019-05-19 15:53:36.667481737 +0200 -+++ mesa-19.1.0-rc2/src/glx/glxglvnd.c 2019-05-19 15:53:43.468439825 +0200 -@@ -41,7 +41,7 @@ static void *__glXGLVNDGetDispatchAddres - { - unsigned internalIndex = FindGLXFunction(procName); - -- return __glXDispatchFunctions[internalIndex]; -+ return (void*)__glXDispatchFunctions[internalIndex]; - } - - static void __glXGLVNDSetDispatchIndex(const GLubyte *procName, int index) diff --git a/mesa.spec b/mesa.spec index 8283b1e..288fb80 100644 --- a/mesa.spec +++ b/mesa.spec @@ -4,9 +4,10 @@ # (aco) Needed for the dri drivers %define _disable_ld_no_undefined 1 -%ifarch %{aarch64} -%global optflags %{optflags} -fuse-ld=bfd -%endif +# LLD fails because of https://bugs.llvm.org/show_bug.cgi?id=42447 +# BFD fails because it can't handle clang LTO bitcode in static libraries +%global optflags %{optflags} -O3 -fuse-ld=gold +%global ldflags %{ldflags} -fuse-ld=gold %define git %{nil} %define git_branch %(echo %{version} |cut -d. -f1-2) @@ -16,9 +17,6 @@ %define relc %{nil} -# bootstrap option: Build without requiring an X server -# (which in turn requires mesa to build) -%bcond_without hardware %ifarch %{ix86} %define _disable_lto 1 %endif @@ -120,7 +118,7 @@ Summary: OpenGL %{opengl_ver} compatible 3D graphics library Name: mesa -Version: 19.1.0 +Version: 19.1.4 %if "%{relc}%{git}" == "" Release: 1 %else @@ -159,7 +157,6 @@ Obsoletes: %{name}-xorg-drivers-nouveau < %{EVRD} # https://bugs.freedesktop.org/show_bug.cgi?id=74098 Patch1: mesa-10.2-clang-compilefix.patch -Patch2: mesa-19.1.0-compile-bug-110709.patch Patch3: mesa-19.0.0-rc2-more-ARM-drivers.patch # fedora patches @@ -185,6 +182,9 @@ Patch15: mesa-9.2-hardware-float.patch # git format-patch --start-number 100 mesa_7_5_1..mesa_7_5_branch | sed 's/^0\([0-9]\+\)-/Patch\1: 0\1-/' Patch201: 0201-revert-fix-glxinitializevisualconfigfromtags-handling.patch Patch202: riscv64.patch +# https://bugs.freedesktop.org/show_bug.cgi?id=110783 +# https://gitlab.freedesktop.org/mesa/mesa/merge_requests/1084 +#Patch203: https://gitlab.freedesktop.org/mesa/mesa/merge_requests/1084.diff # Direct3D patchset -- https://wiki.ixit.cz/d3d9 # @@ -214,7 +214,6 @@ BuildRequires: libatomic-devel BuildRequires: python-mako >= 0.8.0 BuildRequires: pkgconfig(libdrm) >= 2.4.56 BuildRequires: pkgconfig(libudev) >= 186 -BuildRequires: pkgconfig(talloc) %if %{with glvnd} BuildRequires: pkgconfig(libglvnd) %endif @@ -242,7 +241,8 @@ BuildRequires: stdc++-static-devel BuildRequires: pkgconfig(libssl) >= 1.1.1b-5 %if %{with opencl} BuildRequires: pkgconfig(libclc) -BuildRequires: clang-devel clang +BuildRequires: clang-devel +BuildRequires: clang %endif BuildRequires: pkgconfig(xvmc) %if %{with vdpau} @@ -281,6 +281,8 @@ Requires: %{dridrivers}-vc4 = %{EVRD} Requires: %{dridrivers}-v3d = %{EVRD} Requires: %{dridrivers}-etnaviv = %{EVRD} Requires: %{dridrivers}-tegra = %{EVRD} +Requires: %{dridrivers}-lima = %{EVRD} +Requires: %{dridrivers}-panfrost = %{EVRD} Requires: %{dridrivers}-kmsro = %{EVRD} %endif Provides: dri-drivers = %{EVRD} @@ -294,7 +296,6 @@ Summary: DRI Drivers for AMD/ATI Radeon graphics chipsets Group: System/Libraries Conflicts: %{mklibname dri-drivers} < 9.1.0-0.20130130.2 Conflicts: libva-vdpau-driver < 17.3.0 -%define __noautoreq '.*llvmradeon.*' %description -n %{dridrivers}-radeon DRI and XvMC drivers for AMD/ATI Radeon graphics chipsets @@ -386,6 +387,20 @@ Conflicts: %{mklibname dri-drivers} < 9.1.0-0.20130130.2 %description -n %{dridrivers}-tegra DRI and XvMC drivers for Tegra graphics chips +%package -n %{dridrivers}-lima +Summary: DRI Drivers for Mali Utgard devices +Group: System/Libraries + +%description -n %{dridrivers}-lima +DRI drivers for Mali Utgard devices + +%package -n %{dridrivers}-panfrost +Summary: DRI Drivers for Mali Midgard and Bifrost devices +Group: System/Libraries + +%description -n %{dridrivers}-panfrost +DRI drivers for Mali Midgard and Bifrost devices + %package -n %{dridrivers}-kmsro Summary: DRI Drivers for KMS-only devices Group: System/Libraries @@ -786,7 +801,7 @@ export CC=gcc export CXX=g++ %endif -%meson \ +if ! %meson \ -Db_ndebug=true \ -Dc_std=c11 \ -Dcpp_std=c++17 \ @@ -824,7 +839,10 @@ export CXX=g++ -Dshared-glapi=true \ -Dshared-llvm=true \ -Dswr-arches=avx,avx2,knl,skx \ - -Dtools=all + -Dtools=all; then + + cat build/meson-logs/meson-log.txt >/dev/stderr +fi %ninja_build -C build/ @@ -962,10 +980,26 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc %files -n %{dridrivers}-tegra %{_libdir}/dri/tegra_dri.so +%files -n %{dridrivers}-lima +%{_libdir}/dri/lima_dri.so + +%files -n %{dridrivers}-panfrost +%{_libdir}/dri/panfrost_dri.so + %files -n %{dridrivers}-kmsro -%{_libdir}/dri/pl111_dri.so +%{_libdir}/dri/armada-drm_dri.so +%{_libdir}/dri/exynos_dri.so %{_libdir}/dri/hx8357d_dri.so +%{_libdir}/dri/ili9???_dri.so %{_libdir}/dri/imx-drm_dri.so +%{_libdir}/dri/meson_dri.so +%{_libdir}/dri/mi0283qt_dri.so +%{_libdir}/dri/pl111_dri.so +%{_libdir}/dri/repaper_dri.so +%{_libdir}/dri/rockchip_dri.so +%{_libdir}/dri/st7586_dri.so +%{_libdir}/dri/st7735r_dri.so +%{_libdir}/dri/sun4i-drm_dri.so %endif %files -n %{libosmesa}
Not Available
benbullard79 [@T] cox.net | Package has been waiting 7 days or more | 1684d 22hrs |
benbullard79 [@T] cox.net | Disappointing people aren't voting on packages. | 1684d 22hrs |
benbullard79 [@T] cox.net | No Comment. | 1684d 20hrs |
benbullard79 [@T] cox.net | No Comment. | 1684d 20hrs |