pkgsrc-Changes archive

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

CVS commit: pkgsrc/graphics/MesaLib



Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Aug 22 17:24:01 UTC 2019

Modified Files:
        pkgsrc/graphics/MesaLib: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/graphics/MesaLib/patches: patch-meson.build
            patch-src_intel_isl_isl__tiled__memcpy.c
            patch-src_intel_perf_gen__perf.h
Removed Files:
        pkgsrc/graphics/MesaLib/patches: patch-configure.ac
            patch-include_GL_internal_dri__interface.h
            patch-src_gallium_auxiliary_util_u__format__tests.c
            patch-src_gallium_auxiliary_util_u__helpers.c
            patch-src_gbm_Makefile.am patch-src_glx_Makefile.am
            patch-src_intel_Makefile.tools.am
            patch-src_intel_vulkan_anv__device.c
            patch-src_mapi_glapi_gen_gl__gentable.py
            patch-src_mesa_drivers_dri_i965_brw__oa__metrics.c
            patch-src_mesa_drivers_dri_i965_brw__performance__query.c
            patch-src_mesa_drivers_dri_i965_intel__tiled__memcpy.c
            patch-src_mesa_drivers_x11_Makefile.am
            patch-src_mesa_main_context.c patch-src_util_Makefile.am
            patch-src_util_futex.h patch-src_util_xmlconfig.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/MesaLib/PLIST
cvs rdiff -u -r1.124 -r1.125 pkgsrc/graphics/MesaLib/distinfo
cvs rdiff -u -r1.65 -r1.66 pkgsrc/graphics/MesaLib/options.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/graphics/MesaLib/patches/patch-configure.ac
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/MesaLib/patches/patch-include_GL_internal_dri__interface.h \
    pkgsrc/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__helpers.c \
    pkgsrc/graphics/MesaLib/patches/patch-src_gbm_Makefile.am \
    pkgsrc/graphics/MesaLib/patches/patch-src_glx_Makefile.am \
    pkgsrc/graphics/MesaLib/patches/patch-src_intel_Makefile.tools.am \
    pkgsrc/graphics/MesaLib/patches/patch-src_intel_vulkan_anv__device.c \
    pkgsrc/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__oa__metrics.c \
    pkgsrc/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__performance__query.c \
    pkgsrc/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_intel__tiled__memcpy.c \
    pkgsrc/graphics/MesaLib/patches/patch-src_mesa_drivers_x11_Makefile.am \
    pkgsrc/graphics/MesaLib/patches/patch-src_util_Makefile.am \
    pkgsrc/graphics/MesaLib/patches/patch-src_util_futex.h \
    pkgsrc/graphics/MesaLib/patches/patch-src_util_xmlconfig.c
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/MesaLib/patches/patch-meson.build \
    pkgsrc/graphics/MesaLib/patches/patch-src_intel_isl_isl__tiled__memcpy.c \
    pkgsrc/graphics/MesaLib/patches/patch-src_intel_perf_gen__perf.h
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__format__tests.c \
    pkgsrc/graphics/MesaLib/patches/patch-src_mapi_glapi_gen_gl__gentable.py
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/graphics/MesaLib/patches/patch-src_mesa_main_context.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaLib/Makefile
diff -u pkgsrc/graphics/MesaLib/Makefile:1.151 pkgsrc/graphics/MesaLib/Makefile:1.152
--- pkgsrc/graphics/MesaLib/Makefile:1.151      Thu Aug 22 09:59:47 2019
+++ pkgsrc/graphics/MesaLib/Makefile    Thu Aug 22 17:24:01 2019
@@ -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 @@ HOMEPAGE=     https://www.mesa3d.org/
 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/dr
 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_MESSAGE.drirc= Fixing hardcoded /e
 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 @@ LDFLAGS.SunOS+=             -lsocket -lnsl
 .include "options.mk"
 
 .if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=       --enable-glx-read-only-text
+MESON_ARGS+=   -Dglx-read-only-text=true
 .endif
 
-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"
+MESON_ARGS+=   -Dshared-glapi=true
 
-# 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
+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
+
 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"

Index: pkgsrc/graphics/MesaLib/PLIST
diff -u pkgsrc/graphics/MesaLib/PLIST:1.39 pkgsrc/graphics/MesaLib/PLIST:1.40
--- pkgsrc/graphics/MesaLib/PLIST:1.39  Wed Aug 21 13:35:28 2019
+++ pkgsrc/graphics/MesaLib/PLIST       Thu Aug 22 17:24:01 2019
@@ -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.r300}lib/dri/r300_dri.so
 ${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/libXvMCr60
 ${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_radeons
 ${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

Index: pkgsrc/graphics/MesaLib/distinfo
diff -u pkgsrc/graphics/MesaLib/distinfo:1.124 pkgsrc/graphics/MesaLib/distinfo:1.125
--- pkgsrc/graphics/MesaLib/distinfo:1.124      Wed Aug 21 13:35:28 2019
+++ pkgsrc/graphics/MesaLib/distinfo    Thu Aug 22 17:24:01 2019
@@ -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_drivers_dri2_platfor
 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_include_pipe_p__
 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

Index: pkgsrc/graphics/MesaLib/options.mk
diff -u pkgsrc/graphics/MesaLib/options.mk:1.65 pkgsrc/graphics/MesaLib/options.mk:1.66
--- pkgsrc/graphics/MesaLib/options.mk:1.65     Wed Aug 21 13:35:28 2019
+++ pkgsrc/graphics/MesaLib/options.mk  Thu Aug 22 17:24:01 2019
@@ -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
+PKG_OPTIONS_LEGACY_OPTS+=      xvmc:gallium-xvmc
 
 # The LLVM option enables JIT accelerated software rendering and
 # is also required to support the latest RADEON GPUs, so enable it
-# by default on platforms where such GPUs might be encountered.
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
+# by default on platforms where such GPUs might be encountered
+# or accelerated software rendering might be useful.
+.if (${MACHINE_ARCH} == "i386" || \
+     ${MACHINE_ARCH} == "x86_64" || \
+     ${MACHINE_ARCH} == "aarch64") && \
        ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=                llvm
 .endif
@@ -34,25 +39,13 @@ PKG_SUGGESTED_OPTIONS+=             llvm
 PKG_SUGGESTED_OPTIONS+=                dri
 .endif
 
-
-# Use Thread Local Storage in GLX where it is supported by Mesa and works.
-.if \
-       !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) ||        \
-       !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) ||      \
-       !empty(MACHINE_PLATFORM:MLinux-*-i386) ||               \
-       !empty(MACHINE_PLATFORM:MLinux-*-x86_64) ||             \
-       !empty(MACHINE_PLATFORM:MFreeBSD-1[0-9].*-x86_64) ||    \
-       !empty(MACHINE_PLATFORM:MDragonFly-*-x86_64)
-PKG_SUGGESTED_OPTIONS+=                glx-tls
-.endif
-
 .include "../../mk/bsd.options.mk"
 
 # gallium
 PLIST_VARS+=   freedreno i915 i965 nouveau r300 r600 radeonsi  \
                swrast svga vc4 virgl vulkan
 # classic DRI
-PLIST_VARS+=   dri swrast_dri nouveau_dri radeon_dri r200
+PLIST_VARS+=   dri swrast_dri nouveau_dri r100 r200
 # other features
 PLIST_VARS+=   egl gbm vaapi vdpau wayland xatracker
 PLIST_VARS+=   osmesa xvmc
@@ -72,53 +65,40 @@ PLIST.wayland=              yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mdri)
-CONFIGURE_ARGS+=       --enable-dri
 # Having DRI3 and egl compiled in by default doesn't hurt, the X server
 # will only use it if it is supported at run time.
-CONFIGURE_ARGS+=       --enable-dri3
+MESON_ARGS+=           -Ddri3=true
 .  if ${OPSYS} != "Darwin"
-CONFIGURE_ARGS+=       --enable-egl
-CONFIGURE_ARGS+=       --enable-gbm
+MESON_ARGS+=           -Degl=true
+MESON_ARGS+=           -Dgbm=true
 PLIST.egl=             yes
 PLIST.gbm=             yes
 .  else
-CONFIGURE_ARGS+=       --disable-egl
-CONFIGURE_ARGS+=       --disable-gbm
+MESON_ARGS+=           -Degl=false
+MESON_ARGS+=           -Dgbm=false
 .  endif
 
 .  if !empty(PKG_OPTIONS:Mosmesa)
-CONFIGURE_ARGS+=       --enable-osmesa
+MESON_ARGS+=           -Dosmesa=classic
 PLIST.osmesa=          yes
+.  else
+MESON_ARGS+=           -Dosmesa=none
 .  endif
 
 .  if !empty(PKG_OPTIONS:Mglesv1)
-CONFIGURE_ARGS+=       --enable-gles1
+MESON_ARGS+=           -Dgles1=true
 PLIST.glesv1=          yes
 .  else
-CONFIGURE_ARGS+=       --disable-gles1
+MESON_ARGS+=           -Dgles1=false
 .  endif
 
 .  if !empty(PKG_OPTIONS:Mglesv2)
-CONFIGURE_ARGS+=       --enable-gles2
+MESON_ARGS+=           -Dgles2=true
 PLIST.glesv2=          yes
 .  else
-CONFIGURE_ARGS+=       --disable-gles2
+MESON_ARGS+=           -Dgles2=false
 .  endif
 
-.  if !empty(PKG_OPTIONS:Mglx-tls)
-# Recommended by
-# http://www.freedesktop.org/wiki/Software/Glamor/
-CONFIGURE_ARGS+=       --enable-glx-tls
-.  else
-# (EE) Failed to load /usr/pkg/lib/xorg/modules/extensions/libglx.so:
-# /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model
-# initial-exec and dlopen is not supported
-CONFIGURE_ARGS+=       --disable-glx-tls
-.  endif # glx-tls
-
-# DRI on Linux needs either sysfs or udev
-CONFIGURE_ARGS.Linux+= --enable-sysfs
-
 PLIST.dri=     yes
 
 .  if ${OPSYS} != "Darwin"
@@ -134,10 +114,6 @@ VULKAN_DRIVERS=            #
 # Software rasterizer
 PLIST.swrast_dri=      yes
 DRI_DRIVERS+=          swrast
-.  if ${OPSYS} != "Darwin"
-PLIST.swrast=          yes
-GALLIUM_DRIVERS+=      swrast
-.  endif
 
 # x86 only drivers
 .  if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "Darwin"
@@ -147,7 +123,6 @@ GALLIUM_DRIVERS+=   svga
 
 # Intel chipsets, x86 only
 PLIST.i915=            yes
-GALLIUM_DRIVERS+=      i915
 DRI_DRIVERS+=          i915
 
 PLIST.i965=            yes
@@ -157,8 +132,8 @@ DRI_DRIVERS+=               i965
 
 # Vulkan support
 .  if !empty(PKG_OPTIONS:Mvulkan)
+VULKAN_DRIVERS+=       amd
 VULKAN_DRIVERS+=       intel
-VULKAN_DRIVERS+=       radeon
 PLIST.vulkan=          yes
 .  endif
 
@@ -198,9 +173,9 @@ PLIST.nouveau=              yes
 GALLIUM_DRIVERS+=      nouveau
 .    endif
 
-# classic DRI radeon
-PLIST.radeon_dri=      yes
-DRI_DRIVERS+=          radeon
+# classic DRI r100
+PLIST.r100=            yes
+DRI_DRIVERS+=          r100
 
 # classic DRI r200
 PLIST.r200=            yes
@@ -233,9 +208,11 @@ PLIST.vdpau=       yes
 .    endif # vdpau
 
 # XA is useful for accelerating xf86-video-vmware
-.    if !empty(PKG_OPTIONS:Mxa)
-CONFIGURE_ARGS+=       --enable-xa
+.    if !empty(PKG_OPTIONS:Mgallium-xa)
+MESON_ARGS+=           -Dgallium-xa=true
 PLIST.xatracker=       yes
+.    else
+MESON_ARGS+=           -Dgallium-xa=false
 .    endif
 
 # AMD Radeon r300
@@ -244,56 +221,42 @@ GALLIUM_DRIVERS+= r300
 # AMD Canary Islands GPUs
 PLIST.radeonsi=                yes
 GALLIUM_DRIVERS+=      radeonsi
-CONFIGURE_ARGS+=       --enable-llvm
-CONFIGURE_ARGS+=       --enable-llvm-shared-libs
-
-.    if !exists(/usr/include/libelf.h)
-.      include "../../devel/libelf/buildlink3.mk"
-.    endif
+MESON_ARGS+=           -Dllvm=true
 
 BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=7.0
+.    include "../../devel/libelf/buildlink3.mk"
 .    include "../../lang/libLLVM/buildlink3.mk"
-CONFIGURE_ENV+=                ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
 .  else # !llvm
-CONFIGURE_ARGS+=       --disable-xa
-CONFIGURE_ARGS+=       --disable-llvm
-CONFIGURE_ARGS+=       --disable-llvm-shared-libs
+MESON_ARGS+=           -Dgallium-xa=false
+MESON_ARGS+=           -Dllvm=false
+MESON_ARGS+=           -Dllvm-shared=false
 .  endif # llvm
-
-CONFIGURE_ARGS+=       --with-gallium-drivers=${GALLIUM_DRIVERS:ts,}
-CONFIGURE_ARGS+=       --with-dri-drivers=${DRI_DRIVERS:ts,}
-CONFIGURE_ARGS+=       --with-vulkan-drivers=${VULKAN_DRIVERS:ts,}
-CONFIGURE_ARGS+=       --with-platforms=${EGL_PLATFORMS:S/ /,/gW}
-
+PLIST_SUBST+=          GLVER="1.2.0"
+MESON_ARGS+=           -Dgallium-drivers=${GALLIUM_DRIVERS:ts,}
+MESON_ARGS+=           -Ddri-drivers=${DRI_DRIVERS:ts,}
+MESON_ARGS+=           -Dvulkan-drivers=${VULKAN_DRIVERS:ts,}
+MESON_ARGS+=           -Dplatforms=${EGL_PLATFORMS:ts,}
 .else # !dri
-CONFIGURE_ARGS+=       --with-gallium-drivers=
-CONFIGURE_ARGS+=       --with-dri-drivers=
-CONFIGURE_ARGS+=       --with-vulkan-drivers=
-CONFIGURE_ARGS+=       --disable-dri
-CONFIGURE_ARGS+=       --disable-dri3
-CONFIGURE_ARGS+=       --disable-egl
-CONFIGURE_ARGS+=       --disable-gbm
-CONFIGURE_ARGS+=       --disable-gles1
-CONFIGURE_ARGS+=       --disable-gles2
-CONFIGURE_ARGS+=       --enable-xlib-glx
-CONFIGURE_ARGS+=       --with-platforms=x11
+PLIST_SUBST+=          GLVER="1.6.0"
+MESON_ARGS+=           -Dgallium-drivers=
+MESON_ARGS+=           -Ddri-drivers=
+MESON_ARGS+=           -Dvulkan-drivers=
+MESON_ARGS+=           -Ddri3=false
+MESON_ARGS+=           -Degl=false
+MESON_ARGS+=           -Dgbm=false
+MESON_ARGS+=           -Dgles1=false
+MESON_ARGS+=           -Dgles2=false
+MESON_ARGS+=           -Dglx=xlib
+MESON_ARGS+=           -Dplatforms=x11
 .  if !empty(PKG_OPTIONS:Mllvm)
 PKG_FAIL_REASON+=      "The llvm PKG_OPTION must also be disabled when dri is disabled"
 .  endif
 .endif # dri
 
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=       --enable-debug
-.endif
-
-.if !empty(PKG_OPTIONS:Mxvmc)
-CONFIGURE_ARGS+=       --enable-xvmc
+.if !empty(PKG_OPTIONS:Mgallium-xvmc)
+MESON_ARGS+=           -Dgallium-xvmc=true
 .include "../../x11/libXvMC/buildlink3.mk"
 PLIST.xvmc=            yes
 .else
-CONFIGURE_ARGS+=       --disable-xvmc
-.endif
-
-.if !empty(PKG_OPTIONS:Mnoatexit)
-CPPFLAGS+=     -DHAVE_NOATEXIT
+MESON_ARGS+=           -Dgallium-xvmc=false
 .endif

Added files:

Index: pkgsrc/graphics/MesaLib/patches/patch-meson.build
diff -u /dev/null pkgsrc/graphics/MesaLib/patches/patch-meson.build:1.1
--- /dev/null   Thu Aug 22 17:24:02 2019
+++ pkgsrc/graphics/MesaLib/patches/patch-meson.build   Thu Aug 22 17:24:01 2019
@@ -0,0 +1,24 @@
+$NetBSD: patch-meson.build,v 1.1 2019/08/22 17:24:01 nia Exp $
+
+Fix python binary name.
+
+--- meson.build.orig   2019-08-07 16:39:16.000000000 +0000
++++ meson.build
+@@ -22,7 +22,7 @@ project(
+   'mesa',
+   ['c', 'cpp'],
+   version : run_command(
+-    [find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py']
++    [find_program('@PYTHONBIN@', 'python', 'python2', 'python3'), 'bin/meson_get_version.py']
+   ).stdout(),
+   license : 'MIT',
+   meson_version : '>= 0.45',
+@@ -760,7 +760,7 @@ if with_platform_haiku
+ endif
+ 
+ if meson.version().version_compare('>=0.50')
+-  prog_python = import('python').find_installation('python3')
++  prog_python = import('python').find_installation('@PYTHONBIN@')
+ else
+   prog_python = import('python3').find_python()
+ endif
Index: pkgsrc/graphics/MesaLib/patches/patch-src_intel_isl_isl__tiled__memcpy.c
diff -u /dev/null pkgsrc/graphics/MesaLib/patches/patch-src_intel_isl_isl__tiled__memcpy.c:1.1
--- /dev/null   Thu Aug 22 17:24:02 2019
+++ pkgsrc/graphics/MesaLib/patches/patch-src_intel_isl_isl__tiled__memcpy.c    Thu Aug 22 17:24:01 2019
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_intel_isl_isl__tiled__memcpy.c,v 1.1 2019/08/22 17:24:01 nia Exp $
+
+NetBSD has bswap32 in libc.
+
+--- src/intel/isl/isl_tiled_memcpy.c.orig      2019-08-07 16:39:17.000000000 +0000
++++ src/intel/isl/isl_tiled_memcpy.c
+@@ -64,6 +64,7 @@ ror(uint32_t n, uint32_t d)
+    return (n >> d) | (n << (32 - d));
+ }
+ 
++#ifndef __NetBSD__
+ static inline uint32_t
+ bswap32(uint32_t n)
+ {
+@@ -76,6 +77,7 @@ bswap32(uint32_t n)
+           (n << 24);
+ #endif
+ }
++#endif
+ 
+ /**
+  * Copy RGBA to BGRA - swap R and B.
Index: pkgsrc/graphics/MesaLib/patches/patch-src_intel_perf_gen__perf.h
diff -u /dev/null pkgsrc/graphics/MesaLib/patches/patch-src_intel_perf_gen__perf.h:1.1
--- /dev/null   Thu Aug 22 17:24:02 2019
+++ pkgsrc/graphics/MesaLib/patches/patch-src_intel_perf_gen__perf.h    Thu Aug 22 17:24:01 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_intel_perf_gen__perf.h,v 1.1 2019/08/22 17:24:01 nia Exp $
+
+for major() - sysmacros.h is non-portable
+
+--- src/intel/perf/gen_perf.h.orig     2019-08-07 16:39:17.000000000 +0000
++++ src/intel/perf/gen_perf.h
+@@ -28,7 +28,9 @@
+ #include <stdint.h>
+ #include <string.h>
+ 
++#ifdef MAJOR_IN_SYSMACROS
+ #include <sys/sysmacros.h>
++#endif
+ 
+ #include "util/hash_table.h"
+ #include "util/ralloc.h"



Home | Main Index | Thread Index | Old Index