pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/MesaLib MesaLib: Update to 19.1.4



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ab6d97d550b5
branches:  trunk
changeset: 338317:ab6d97d550b5
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Aug 22 17:24:01 2019 +0000

description:
MesaLib: Update to 19.1.4

Upstream has replaced their autotools-based build system with Meson.

Thanks to fox@ for testing on Linux.

New features:

* GL_AMD_texture_texture4 on all GL 4.0 drivers.
* GL_EXT_shader_implicit_conversions on all drivers (ES extension).
* GL_EXT_texture_compression_bptc on all GL 4.0 drivers (ES extension).
* GL_EXT_texture_compression_rgtc on all GL 3.0 drivers (ES extension).
* GL_EXT_render_snorm on gallium drivers (ES extension).
* GL_EXT_texture_view on drivers supporting texture views (ES extension).
* GL_OES_texture_view on drivers supporting texture views (ES extension).
* GL_NV_shader_atomic_float on nvc0 (Fermi/Kepler only).
* Shader-based software implementations of GL_ARB_gpu_shader_fp64, GL_ARB_gpu_shader_int64, GL_ARB_vertex_attrib_64bit, and GL_ARB_shader_ballot on i965.
* VK_ANDROID_external_memory_android_hardware_buffer on Intel
* Fixed and re-exposed VK_EXT_pci_bus_info on Intel and RADV
* VK_EXT_scalar_block_layout on Intel and RADV
* VK_KHR_depth_stencil_resolve on Intel
* VK_KHR_draw_indirect_count on Intel
* VK_EXT_conditional_rendering on Intel
* VK_EXT_memory_budget on RADV
* GL_ARB_parallel_shader_compile on all drivers.
* GL_EXT_gpu_shader4 on all GL 3.1 drivers.
* GL_EXT_shader_image_load_formatted on radeonsi.
* GL_EXT_texture_buffer_object on all GL 3.1 drivers.
* GL_EXT_texture_compression_s3tc_srgb on Gallium drivers and i965 (ES extension).
* GL_NV_compute_shader_derivatives on iris and i965.
* GL_KHR_parallel_shader_compile on all drivers.
* VK_EXT_buffer_device_address on Intel and RADV.
* VK_EXT_depth_clip_enable on Intel and RADV.
* VK_KHR_ycbcr_image_arrays on Intel.
* VK_EXT_inline_uniform_block on Intel and RADV.
* VK_EXT_external_memory_host on Intel.
* VK_EXT_host_query_reset on Intel and RADV.
* VK_KHR_surface_protected_capabilities on Intel and RADV.
* VK_EXT_pipeline_creation_feedback on Intel and RADV.
* VK_KHR_8bit_storage on RADV.
* VK_AMD_gpu_shader_int16 on RADV.
* VK_AMD_gpu_shader_half_float on RADV.
* VK_NV_compute_shader_derivatives on Intel.
* VK_KHR_shader_float16_int8 on Intel and RADV (RADV only supports int8).
* VK_KHR_shader_atomic_int64 on Intel.
* VK_EXT_descriptor_indexing on Intel.
* VK_KHR_shader_float16_int8 on Intel and RADV.
* GL_INTEL_conservative_rasterization on iris.
* VK_EXT_memory_budget on Intel.

diffstat:

 graphics/MesaLib/Makefile                                                          |   63 +--
 graphics/MesaLib/PLIST                                                             |   39 +-
 graphics/MesaLib/distinfo                                                          |   30 +-
 graphics/MesaLib/options.mk                                                        |  155 +++------
 graphics/MesaLib/patches/patch-configure.ac                                        |  110 -------
 graphics/MesaLib/patches/patch-include_GL_internal_dri__interface.h                |   27 -
 graphics/MesaLib/patches/patch-meson.build                                         |   24 +
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__format__tests.c       |   17 -
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__helpers.c             |   34 --
 graphics/MesaLib/patches/patch-src_gbm_Makefile.am                                 |   12 -
 graphics/MesaLib/patches/patch-src_glx_Makefile.am                                 |   49 ---
 graphics/MesaLib/patches/patch-src_intel_Makefile.tools.am                         |   14 -
 graphics/MesaLib/patches/patch-src_intel_isl_isl__tiled__memcpy.c                  |   22 +
 graphics/MesaLib/patches/patch-src_intel_perf_gen__perf.h                          |   16 +
 graphics/MesaLib/patches/patch-src_intel_vulkan_anv__device.c                      |   47 ---
 graphics/MesaLib/patches/patch-src_mapi_glapi_gen_gl__gentable.py                  |   15 -
 graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__oa__metrics.c        |   13 -
 graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__performance__query.c |   72 ----
 graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_intel__tiled__memcpy.c    |   22 -
 graphics/MesaLib/patches/patch-src_mesa_drivers_x11_Makefile.am                    |   15 -
 graphics/MesaLib/patches/patch-src_mesa_main_context.c                             |   57 ---
 graphics/MesaLib/patches/patch-src_util_Makefile.am                                |   15 -
 graphics/MesaLib/patches/patch-src_util_futex.h                                    |   53 ---
 graphics/MesaLib/patches/patch-src_util_xmlconfig.c                                |   31 --
 24 files changed, 177 insertions(+), 775 deletions(-)

diffs (truncated from 1289 to 300 lines):

diff -r c22b859263de -r ab6d97d550b5 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Thu Aug 22 16:20:36 2019 +0000
+++ b/graphics/MesaLib/Makefile Thu Aug 22 17:24:01 2019 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.151 2019/08/22 09:59:47 nia Exp $
+# $NetBSD: Makefile,v 1.152 2019/08/22 17:24:01 nia Exp $
 
-DISTNAME=      mesa-18.3.4
+DISTNAME=      mesa-19.1.4
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
-PKGREVISION=   1
 CATEGORIES=    graphics x11
 MASTER_SITES=  https://mesa.freedesktop.org/archive/
 EXTRACT_SUFX=  .tar.xz
@@ -12,8 +11,7 @@
 COMMENT=       Open source OpenGL implementation
 LICENSE=       mit
 
-GNU_CONFIGURE= yes
-USE_TOOLS+=    autoconf automake autoreconf bison pkg-config gmake flex
+USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c99 c++
 USE_LIBTOOL=   yes
 
@@ -29,27 +27,6 @@
 PKGCONFIG_OVERRIDE+=   src/mesa/drivers/osmesa/osmesa.pc.in
 PKGCONFIG_OVERRIDE+=   src/mesa/gl.pc.in
 
-CONFIGURE_ARGS+=               --enable-shared-glapi
-
-# Work around a buildlink and/or libtool bug:
-# In the libtool install/relink stage, if we want to link with two static
-# archives named libglapi.la but in different directories, bad things happen.
-SUBST_CLASSES+=                        wrapper-bug
-SUBST_STAGE.wrapper-bug=       pre-configure
-SUBST_MESSAGE.wrapper-bug=     Renaming non-shared libglapi.la in Makefiles
-SUBST_FILES.wrapper-bug=       src/gallium/targets/libgl-xlib/Makefile.am
-SUBST_FILES.wrapper-bug+=      src/gallium/targets/osmesa/Makefile.am
-SUBST_FILES.wrapper-bug+=      src/glx/Makefile.am
-SUBST_FILES.wrapper-bug+=      src/mapi/Makefile.am
-SUBST_FILES.wrapper-bug+=      src/mesa/drivers/osmesa/Makefile.am
-SUBST_FILES.wrapper-bug+=      src/mesa/drivers/x11/Makefile.am
-SUBST_SED.wrapper-bug=         -e 's,shared-glapi/libglapi\.la,shared-glapi/libglapi_tmp_rename.la,g'
-SUBST_SED.wrapper-bug+=                -e 's,shared_glapi_libglapi_la,shared_glapi_libglapi_tmp_rename_la,g'
-SUBST_SED.wrapper-bug+=                -e 's,libglapi\.la,libglapi_impl.la,g'
-SUBST_SED.wrapper-bug+=                -e 's,libglapi_la,libglapi_impl_la,g'
-SUBST_SED.wrapper-bug+=                -e 's,libglapi_tmp_rename\.la,libglapi.la,g'
-SUBST_SED.wrapper-bug+=                -e 's,libglapi_tmp_rename_la,libglapi_la,g'
-
 # Replace /etc/drirc.d with ${PREFIX}/etc/drirc.d
 SUBST_CLASSES+=                drirc
 SUBST_STAGE.drirc=     pre-configure
@@ -57,6 +34,12 @@
 SUBST_FILES.drirc+=    src/util/xmlconfig.c
 SUBST_SED.drirc+=      -e 's|/etc|${PREFIX}/etc|g'
 
+SUBST_CLASSES+=                py
+SUBST_STAGE.py=                pre-configure
+SUBST_MESSAGE.py=      Fixing Python binary name
+SUBST_FILES.py+=       meson.build
+SUBST_VARS.py+=                PYTHONBIN
+
 CFLAGS.SunOS+=         -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
 CXXFLAGS.SunOS+=       -Drestrict=__restrict__
 LDFLAGS.SunOS+=                -lsocket -lnsl
@@ -66,40 +49,36 @@
 .include "options.mk"
 
 .if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=       --enable-glx-read-only-text
+MESON_ARGS+=   -Dglx-read-only-text=true
 .endif
 
+MESON_ARGS+=   -Dshared-glapi=true
+
+CPPFLAGS+=     -DHAVE_NOATEXIT
+
+# Work around Xorg segfaulting in radeon driver due to wrong alloca being used
+CFLAGS.NetBSD+=                -Dalloca=__builtin_alloca
+CXXFLAGS.NetBSD+=      -Dalloca=__builtin_alloca
+
 PYTHON_FOR_BUILD_ONLY= yes
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
 # needed to build vulkan support
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
-CONFIGURE_ENV+=                PYTHON=${PYTHONBIN}
-.include "../../lang/python/tool.mk"
-
-# Handle platforms without exp2
-.if !empty(MACHINE_PLATFORM:MNetBSD-[1-5].*-*)
-CPPFLAGS+=     -Dexp2\(x\)=exp\(\(x\)\*M_LN2\)
-CPPFLAGS+=     -Dexp2f\(x\)=expf\(\(x\)\*M_LN2\)
-.endif
-
-# Work around Xorg segfaulting in radeon driver due to wrong alloca being used
-CFLAGS.NetBSD+=                -Dalloca=__builtin_alloca
-CXXFLAGS.NetBSD+=      -Dalloca=__builtin_alloca
 
 pre-configure:
        touch ${WRKSRC}/src/glx/apple_dummy.cpp
-       cd ${WRKSRC} && autoreconf -vif
 
 DRIRC_DIR=             ${PKG_SYSCONFDIR}/drirc.d
 EGDIR=                 ${PREFIX}/share/examples/mesa
 OWN_DIRS+=             ${DRIRC_DIR}
 INSTALLATION_DIRS+=    ${EGDIR}
-CONF_FILES+=           ${EGDIR}/00-mesa-defaults.conf  \
-                         ${DRIRC_DIR}/00-mesa-defaults.conf
+CONF_FILES+=           ${EGDIR}/00-mesa-defaults.conf \
+                       ${DRIRC_DIR}/00-mesa-defaults.conf
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/src/util/00-mesa-defaults.conf ${DESTDIR}${EGDIR}
 
+.include "../../devel/py-meson/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
diff -r c22b859263de -r ab6d97d550b5 graphics/MesaLib/PLIST
--- a/graphics/MesaLib/PLIST    Thu Aug 22 16:20:36 2019 +0000
+++ b/graphics/MesaLib/PLIST    Thu Aug 22 17:24:01 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2019/08/21 13:35:28 nia Exp $
+@comment $NetBSD: PLIST,v 1.40 2019/08/22 17:24:01 nia Exp $
 ${PLIST.egl}include/EGL/egl.h
 ${PLIST.egl}include/EGL/eglext.h
 ${PLIST.egl}include/EGL/eglextchromium.h
@@ -49,17 +49,27 @@
 ${PLIST.r600}lib/dri/r600_dri.so
 @comment ${PLIST.vdpau}lib/dri/r600_drv_video.la
 ${PLIST.vaapi}lib/dri/r600_drv_video.so
-${PLIST.radeon_dri}lib/dri/radeon_dri.so
+${PLIST.r100}lib/dri/radeon_dri.so
 ${PLIST.radeonsi}lib/dri/radeonsi_dri.so
 ${PLIST.vaapi}lib/dri/radeonsi_drv_video.so
 ${PLIST.swrast_dri}lib/dri/swrast_dri.so
 ${PLIST.vc4}lib/dri/vc4_dri.so
 ${PLIST.svga}lib/dri/vmwgfx_dri.so
-${PLIST.egl}lib/libEGL.la
-lib/libGL.la
-${PLIST.glesv1}lib/libGLESv1_CM.la
-${PLIST.glesv2}lib/libGLESv2.la
-${PLIST.osmesa}lib/libOSMesa.la
+${PLIST.egl}lib/libEGL.so
+${PLIST.egl}lib/libEGL.so.1
+${PLIST.egl}lib/libEGL.so.1.0.0
+lib/libGL.so
+lib/libGL.so.1
+lib/libGL.so.${GLVER}
+${PLIST.glesv1}lib/libGLESv1_CM.so
+${PLIST.glesv1}lib/libGLESv1_CM.so.1
+${PLIST.glesv1}lib/libGLESv1_CM.so.1.1.0
+${PLIST.glesv2}lib/libGLESv2.so
+${PLIST.glesv2}lib/libGLESv2.so.2
+${PLIST.glesv2}lib/libGLESv2.so.2.0.0
+${PLIST.osmesa}lib/libOSMesa.so
+${PLIST.osmesa}lib/libOSMesa.so.8
+${PLIST.osmesa}lib/libOSMesa.so.8.0.0
 ${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so
 ${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so.1
 ${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so.1.0
@@ -68,11 +78,15 @@
 ${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so.1
 ${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so.1.0
 ${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so.1.0.0
-${PLIST.gbm}lib/libgbm.la
-lib/libglapi.la
-${PLIST.vulkan}lib/libvulkan_intel.la
-${PLIST.vulkan}lib/libvulkan_radeon.la
-${PLIST.xatracker}lib/libxatracker.la
+${PLIST.gbm}lib/libgbm.so
+${PLIST.gbm}lib/libgbm.so.1
+${PLIST.gbm}lib/libgbm.so.1.0.0
+lib/libglapi.so
+lib/libglapi.so.0
+lib/libglapi.so.0.0.0
+${PLIST.xatracker}lib/libxatracker.so
+${PLIST.xatracker}lib/libxatracker.so.2
+${PLIST.xatracker}lib/libxatracker.so.2.5.0
 ${PLIST.dri}lib/pkgconfig/dri.pc
 ${PLIST.egl}lib/pkgconfig/egl.pc
 ${PLIST.gbm}lib/pkgconfig/gbm.pc
@@ -99,4 +113,5 @@
 ${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1.0.0
 ${PLIST.vulkan}share/vulkan/icd.d/intel_icd.${MACHINE_ARCH}.json
 ${PLIST.vulkan}share/vulkan/icd.d/radeon_icd.${MACHINE_ARCH}.json
+share/drirc.d/00-mesa-defaults.conf
 share/examples/mesa/00-mesa-defaults.conf
diff -r c22b859263de -r ab6d97d550b5 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Thu Aug 22 16:20:36 2019 +0000
+++ b/graphics/MesaLib/distinfo Thu Aug 22 17:24:01 2019 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.124 2019/08/21 13:35:28 nia Exp $
+$NetBSD: distinfo,v 1.125 2019/08/22 17:24:01 nia Exp $
 
-SHA1 (mesa-18.3.4.tar.xz) = a9a6ea0f5b99df362dc35770ade10c1738e2629c
-RMD160 (mesa-18.3.4.tar.xz) = 659565933a679d04dda58c7314e5d7c172e46d12
-SHA512 (mesa-18.3.4.tar.xz) = e4ead944ba053aa05425e9e199d633f576dfa424976253fc32438e8db6da5e8d381122e4c4b7fb18f94177421f208bab5567cfec8d2692d104e266483ca02a99
-Size (mesa-18.3.4.tar.xz) = 11875224 bytes
-SHA1 (patch-configure.ac) = 5283215d27410c80f81ffd28b3f7b02506d1c1b8
-SHA1 (patch-include_GL_internal_dri__interface.h) = 146d2f3f3e50fc1947e8941301d9cf9d90a035e2
+SHA1 (mesa-19.1.4.tar.xz) = 393053bfa41b7fc65add756713004f034c39c3ce
+RMD160 (mesa-19.1.4.tar.xz) = 1d813c4a212710bb6fa8db184b4618788851cd15
+SHA512 (mesa-19.1.4.tar.xz) = 234032d917c9b378c3f6ceb921677b64e549344c3957331810b50fd73e0dccd2f4f62e2bd39e619590f389bc58fdab10fab4b88f7c117557cbeb1dda049b9fc5
+Size (mesa-19.1.4.tar.xz) = 10938008 bytes
+SHA1 (patch-meson.build) = a9fdcaa59aed9b56ff95d4153dd73064e2261c45
 SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9
 SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45
 SHA1 (patch-src_compiler_builtin__type__macros.h) = 857bca0c0f55ec8d7a20b3807c7a5d7bd06bdfbf
@@ -15,8 +14,6 @@
 SHA1 (patch-src_egl_main_eglglobals.c) = 0d52014f52e62fc5fa6650336ddb0011ecf331e6
 SHA1 (patch-src_gallium_auxiliary_drivers_trace_tr__dump.c) = 360e1608508a7bbb41acecd58930781038e2309e
 SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = f913b779404e6bd8ae707a4fd66eb7c1dca9b311
-SHA1 (patch-src_gallium_auxiliary_util_u__format__tests.c) = 4d5e4677c2825778c43440ab131b8807f6840975
-SHA1 (patch-src_gallium_auxiliary_util_u__helpers.c) = a955657951d6d7d84ef349b3b6639a94e44994a5
 SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = 04f95784c3270c9bb7e95377982e217962481525
 SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626
 SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = ed51a57765f2349bc91fd509dc03e709241bd899
@@ -25,47 +22,36 @@
 SHA1 (patch-src_gallium_state__trackers_clover_llvm_invocation.cpp) = 3053db09fbfffffd82e232b60b244a0a80c8f181
 SHA1 (patch-src_gallium_state__trackers_clover_llvm_metadata.hpp) = c97d38098ea03658bc193a50e445b87f1c020839
 SHA1 (patch-src_gallium_state__trackers_clover_util_range.hpp) = cdc78067986c1b92818472c4201c58ef1b42c4f4
-SHA1 (patch-src_gbm_Makefile.am) = 5f3107afbf64b97f7d21ce427cecc4fb78974db3
-SHA1 (patch-src_glx_Makefile.am) = 869c4f2388f835b9b296b3c84c2a03ef7717f17d
 SHA1 (patch-src_glx_apple_apple__glapi.c) = c4eea8dabf74eb03d22da4eb834b18ae3384c63b
 SHA1 (patch-src_glx_dri__common.h) = 0274877f8c65a4bb729536a897df4704897a4c6e
 SHA1 (patch-src_glx_dri__glx.c) = 8fd48776e9953b18bd17ba130d90ae2935e67242
 SHA1 (patch-src_glx_glxclient.h) = f0358179ae397bc8677597b0ccb9a471f40f15de
 SHA1 (patch-src_glx_glxcurrent.c) = 8b8e949eded13491c5865601253c6e7d4b06e228
 SHA1 (patch-src_glx_glxext.c) = 15c2c5e0c6b5095ce849fb86ad148aa05d7d907a
-SHA1 (patch-src_intel_Makefile.tools.am) = 5253d5972b48ae3bc8d648bb9f479dcf6cbd3fab
 SHA1 (patch-src_intel_compiler_brw__fs__bank__conflicts.cpp) = 6276d2c6846bb4dd08699921bec4e20202a17478
+SHA1 (patch-src_intel_isl_isl__tiled__memcpy.c) = 9b79991648ab4c39ae14df219135cd2b01c1b3c0
+SHA1 (patch-src_intel_perf_gen__perf.h) = cbc9c8efe6ce127b8dcb9f2c733d3427f114c5c0
 SHA1 (patch-src_intel_tools_aub__mem.c) = 6a21ecb4cfbdf216474b3be16bda441bb1390350
 SHA1 (patch-src_intel_tools_aubinator__error__decode.c) = d8f636e3c3e76763a505a1dce23de0b198ad62fa
 SHA1 (patch-src_intel_vulkan_anv__allocator.c) = da5a11c95d17d6476e7141572264a215807b8cd7
-SHA1 (patch-src_intel_vulkan_anv__device.c) = 5d581dcd9695c869855f200c575cf98b7165c1ba
 SHA1 (patch-src_intel_vulkan_anv__gem.c) = b8eb487fa704151e7c3c3b1d23973b2b0aa5922e
 SHA1 (patch-src_intel_vulkan_anv__gem__stubs.c) = ad5a4bd9fe521cf73faf2f0cf0f493a0b40f4c20
 SHA1 (patch-src_intel_vulkan_anv__queue.c) = 2dbf7dfd0c77f74f510032bf8d12109f58c50a30
 SHA1 (patch-src_mapi_entry__x86-64__tls.h) = 11b7ef1da435fa17fc7025a46a123d447d6a7d07
 SHA1 (patch-src_mapi_entry__x86__tls.h) = 11c0f5302d305a77f3a1780d44a2c61f48a66273
-SHA1 (patch-src_mapi_glapi_gen_gl__gentable.py) = 0b1d4ef3f78a9b3726ef7f9921608a48a5e4ac56
 SHA1 (patch-src_mapi_u__current.c) = 38d324fcd1c28d155106ccd248edb5eb1aa9ffac
 SHA1 (patch-src_mapi_u__current.h) = 465a992bd34057e9521f0a33e6f2e25cefc145ca
 SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = e33f51b3502e8c52ff7283aeb807996717f79f4f
-SHA1 (patch-src_mesa_drivers_dri_i965_brw__oa__metrics.c) = bb7ca6a8b9e42c1dc4e59a3cf78d063699f7b66e
-SHA1 (patch-src_mesa_drivers_dri_i965_brw__performance__query.c) = 1250b3477c4b8013b928772b7dc7f24e8c4b67aa
 SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 795b17970e95347222514bacc0701aa86fa1ff02
-SHA1 (patch-src_mesa_drivers_dri_i965_intel__tiled__memcpy.c) = 5b940f9a56c694ffaf8a4383c3a2eae25cfd35a6
 SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = 3106f350e590f62c8bd29cd85f24f977639dccdb
-SHA1 (patch-src_mesa_drivers_x11_Makefile.am) = 172a8da11a620edce790f64338a0390cd1e93188
-SHA1 (patch-src_mesa_main_context.c) = 74226013b56ad6c9678f1970458538b35967678f
 SHA1 (patch-src_mesa_main_extensions.c) = 2f48bdb1176c2878bb33bcfab7556172b50a987e
 SHA1 (patch-src_mesa_main_macros.h) = c5dceaa8dc02a58e5b2273d82e3fe1cc12e327d3
 SHA1 (patch-src_mesa_main_shader__query.cpp) = 3f9c31645d87855759def11344dee16af23c7be3
 SHA1 (patch-src_mesa_x86_common__x86.c) = f8c4b93443ef66d017f6aa114b877565b30f2598
-SHA1 (patch-src_util_Makefile.am) = e390cd47b784ad08987b81fdbce537968ad4a624
 SHA1 (patch-src_util_build__id.c) = 7a9547bbda9d2fb9f0018ccf27b70b59e497aa2c
 SHA1 (patch-src_util_disk__cache.c) = cc0b29780dba5d5b5e43c0798336f16a1f0008de
-SHA1 (patch-src_util_futex.h) = 35097c3b8baf8b969c6ec5ec1feb6f4e0a48237e
 SHA1 (patch-src_util_ralloc.c) = d311bfd9ed7e673d72e050668d351c1e6552cdc8
 SHA1 (patch-src_util_strndup.h) = 73f49694ca48ad6b9a9d8346c5b84fddec2463bd
 SHA1 (patch-src_util_u__atomic.h) = 31d4514538ef5ee53012695eb5c66134aaec981e
 SHA1 (patch-src_util_u__queue.c) = ed1ea3f6fc37e9a64894a3e865c48691b6e01b2c
 SHA1 (patch-src_util_u__thread.h) = f0453485bb62d0b7c00a1b840cfce2726ebcbfd2
-SHA1 (patch-src_util_xmlconfig.c) = ad5619e067957b120a70c1c63421c92b356e16ac
diff -r c22b859263de -r ab6d97d550b5 graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk       Thu Aug 22 16:20:36 2019 +0000
+++ b/graphics/MesaLib/options.mk       Thu Aug 22 17:24:01 2019 +0000
@@ -1,28 +1,33 @@
-# $NetBSD: options.mk,v 1.65 2019/08/21 13:35:28 nia Exp $
+# $NetBSD: options.mk,v 1.66 2019/08/22 17:24:01 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=         llvm dri wayland
 PKG_SUGGESTED_OPTIONS=
 
-PKG_SUPPORTED_OPTIONS+=                glx-tls xvmc debug
 PKG_SUPPORTED_OPTIONS+=                vdpau vaapi
 PKG_SUPPORTED_OPTIONS+=                osmesa
 PKG_SUPPORTED_OPTIONS+=                glesv1 glesv2
-PKG_SUPPORTED_OPTIONS+=                xa
-PKG_SUPPORTED_OPTIONS+=                noatexit
+PKG_SUPPORTED_OPTIONS+=                gallium-xa
+PKG_SUPPORTED_OPTIONS+=                gallium-xvmc
 PKG_SUPPORTED_OPTIONS+=                vulkan
 
-# PKG_SUGGESTED_OPTIONS+=              xvmc
 PKG_SUGGESTED_OPTIONS+=                vdpau vaapi
 PKG_SUGGESTED_OPTIONS+=                glesv1 glesv2
 
-PKG_SUGGESTED_OPTIONS+=                xa
-PKG_SUGGESTED_OPTIONS+=                noatexit
+PKG_SUGGESTED_OPTIONS+=                gallium-xa
+#PKG_SUGGESTED_OPTIONS+=       gallium-xvmc
+PKG_SUGGESTED_OPTIONS+=                osmesa
+
+PKG_OPTIONS_LEGACY_OPTS+=      xa:gallium-xa



Home | Main Index | Thread Index | Old Index