pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/graphics Move graphics/MesaLib18 to graphics/MesaLib.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd96dc22c896
branches:  trunk
changeset: 338264:cd96dc22c896
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Aug 21 13:35:27 2019 +0000

description:
Move graphics/MesaLib18 to graphics/MesaLib.

Move graphics/MesaLib to graphics/MesaLib11.

diffstat:

 graphics/Makefile                                                                           |    4 +-
 graphics/MesaLib/Makefile                                                                   |   99 +-
 graphics/MesaLib/PLIST                                                                      |   88 +-
 graphics/MesaLib/buildlink3.mk                                                              |    7 +-
 graphics/MesaLib/builtin.mk                                                                 |    4 +-
 graphics/MesaLib/distinfo                                                                   |  127 ++-
 graphics/MesaLib/dri.mk                                                                     |   42 +-
 graphics/MesaLib/files/patch-manual_fdo90311                                                |  111 ---
 graphics/MesaLib/options.mk                                                                 |  271 ++++++---
 graphics/MesaLib/patches/patch-configure                                                    |  161 -----
 graphics/MesaLib/patches/patch-configure.ac                                                 |  110 +++
 graphics/MesaLib/patches/patch-include_GL_glxext.h                                          |   17 -
 graphics/MesaLib/patches/patch-include_GL_internal_dri__interface.h                         |   27 +
 graphics/MesaLib/patches/patch-src_amd_common_ac__debug.c                                   |   19 +
 graphics/MesaLib/patches/patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c              |   19 +
 graphics/MesaLib/patches/patch-src_compiler_builtin__type__macros.h                         |   25 +
 graphics/MesaLib/patches/patch-src_compiler_glsl_builtin__functions.cpp                     |   14 -
 graphics/MesaLib/patches/patch-src_compiler_glsl_glsl__parser__extras.cpp                   |   18 +
 graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__drm.c                         |   18 +-
 graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__x11.c                         |   36 +-
 graphics/MesaLib/patches/patch-src_egl_main_eglglobals.c                                    |   39 +-
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_draw_draw__llvm.c                      |   27 -
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_drivers_trace_tr__dump.c               |   50 +
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_gallivm_lp__bld__intr.c                |  105 ---
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_gallivm_lp__bld__intr.h                |   44 -
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_gallivm_lp__bld__sample__soa.c         |   24 -
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c        |  127 ++++
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__format__tests.c                |    2 +-
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__helpers.c                      |   34 +
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__math.h                         |   31 -
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__network.c                      |   33 -
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__network.h                      |   15 -
 graphics/MesaLib/patches/patch-src_gallium_drivers_llvmpipe_lp__state__fs.c                 |   16 -
 graphics/MesaLib/patches/patch-src_gallium_drivers_llvmpipe_lp__state__setup.c              |   17 -
 graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_codegen_nv50__ir__peephole.cpp   |   25 -
 graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_nouveau__debug.h                 |   15 -
 graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c            |    6 +-
 graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_nv50_nv84__video.c               |    2 +-
 graphics/MesaLib/patches/patch-src_gallium_drivers_r600_r600__llvm.c                        |   71 --
 graphics/MesaLib/patches/patch-src_gallium_drivers_radeon_radeon__llvm__util.c              |   27 -
 graphics/MesaLib/patches/patch-src_gallium_drivers_radeon_radeon__setup__tgsi__llvm.c       |   66 --
 graphics/MesaLib/patches/patch-src_gallium_drivers_radeonsi_si__shader.c                    |  204 ------
 graphics/MesaLib/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c            |   21 +
 graphics/MesaLib/patches/patch-src_gallium_drivers_vc4_vc4__bufmgr.c                        |   18 +
 graphics/MesaLib/patches/patch-src_gallium_include_pipe_p__config.h                         |   31 +
 graphics/MesaLib/patches/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp       |   40 +
 graphics/MesaLib/patches/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp         |   21 +
 graphics/MesaLib/patches/patch-src_gallium_state__trackers_clover_util_range.hpp            |   40 +
 graphics/MesaLib/patches/patch-src_gallium_targets_dri_Makefile.in                          |   15 -
 graphics/MesaLib/patches/patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c          |   18 -
 graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen.c                    |   19 -
 graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c             |   32 -
 graphics/MesaLib/patches/patch-src_gbm_Makefile.am                                          |   12 +
 graphics/MesaLib/patches/patch-src_gbm_main_gbm.c                                           |   19 -
 graphics/MesaLib/patches/patch-src_glsl_ralloc.c                                            |   39 -
 graphics/MesaLib/patches/patch-src_glx_Makefile.am                                          |   49 +
 graphics/MesaLib/patches/patch-src_glx_apple_apple__glapi.c                                 |    8 +-
 graphics/MesaLib/patches/patch-src_glx_dri__common.h                                        |   17 +
 graphics/MesaLib/patches/patch-src_glx_dri__glx.c                                           |   43 +
 graphics/MesaLib/patches/patch-src_glx_glxclient.h                                          |    6 +-
 graphics/MesaLib/patches/patch-src_glx_glxcurrent.c                                         |    6 +-
 graphics/MesaLib/patches/patch-src_glx_glxext.c                                             |   47 +
 graphics/MesaLib/patches/patch-src_intel_Makefile.tools.am                                  |   14 +
 graphics/MesaLib/patches/patch-src_intel_compiler_brw__fs__bank__conflicts.cpp              |   23 +
 graphics/MesaLib/patches/patch-src_intel_tools_aub__mem.c                                   |   36 +
 graphics/MesaLib/patches/patch-src_intel_tools_aubinator__error__decode.c                   |   19 +
 graphics/MesaLib/patches/patch-src_intel_vulkan_anv__allocator.c                            |   62 ++
 graphics/MesaLib/patches/patch-src_intel_vulkan_anv__device.c                               |   47 +
 graphics/MesaLib/patches/patch-src_intel_vulkan_anv__gem.c                                  |   19 +
 graphics/MesaLib/patches/patch-src_intel_vulkan_anv__gem__stubs.c                           |   36 +
 graphics/MesaLib/patches/patch-src_intel_vulkan_anv__queue.c                                |   25 +
 graphics/MesaLib/patches/patch-src_loader_Makefile.in                                       |   24 -
 graphics/MesaLib/patches/patch-src_loader_loader.c                                          |   96 ---
 graphics/MesaLib/patches/patch-src_mapi_entry__x86-64__tls.h                                |   28 +-
 graphics/MesaLib/patches/patch-src_mapi_entry__x86__tls.h                                   |   22 +-
 graphics/MesaLib/patches/patch-src_mapi_entry__x86__tsd.h                                   |   17 -
 graphics/MesaLib/patches/patch-src_mapi_glapi_gen_gl__gentable.py                           |    6 +-
 graphics/MesaLib/patches/patch-src_mapi_u__current.c                                        |   12 +-
 graphics/MesaLib/patches/patch-src_mapi_u__current.h                                        |    4 +-
 graphics/MesaLib/patches/patch-src_mesa_drivers_dri_Makefile.in                             |   15 -
 graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_Makefile.in                      |   16 -
 graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_xmlconfig.c                      |   50 -
 graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i915_intel__screen.c                    |   31 +-
 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__screen.c                    |   33 +-
 graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_intel__tiled__memcpy.c             |   22 +
 graphics/MesaLib/patches/patch-src_mesa_drivers_dri_swrast_swrast.c                         |    8 +-
 graphics/MesaLib/patches/patch-src_mesa_drivers_x11_Makefile.am                             |   15 +
 graphics/MesaLib/patches/patch-src_mesa_main_context.c                                      |   42 +-
 graphics/MesaLib/patches/patch-src_mesa_main_extensions.c                                   |   35 +-
 graphics/MesaLib/patches/patch-src_mesa_main_macros.h                                       |   10 +-
 graphics/MesaLib/patches/patch-src_mesa_main_shader__query.cpp                              |   30 +-
 graphics/MesaLib/patches/patch-src_mesa_tnl_t__pipeline.c                                   |   20 -
 graphics/MesaLib/patches/patch-src_mesa_x86_common__x86.c                                   |   14 +-
 graphics/MesaLib/patches/patch-src_util_Makefile.am                                         |   15 +
 graphics/MesaLib/patches/patch-src_util_build__id.c                                         |   25 +
 graphics/MesaLib/patches/patch-src_util_disk__cache.c                                       |   29 +
 graphics/MesaLib/patches/patch-src_util_futex.h                                             |   53 +
 graphics/MesaLib/patches/patch-src_util_ralloc.c                                            |   25 +
 graphics/MesaLib/patches/patch-src_util_strndup.c                                           |   30 -
 graphics/MesaLib/patches/patch-src_util_strndup.h                                           |   14 +-
 graphics/MesaLib/patches/patch-src_util_u__atomic.h                                         |   37 +-
 graphics/MesaLib/patches/patch-src_util_u__queue.c                                          |   70 ++
 graphics/MesaLib/patches/patch-src_util_u__thread.h                                         |   76 ++
 graphics/MesaLib/patches/patch-src_util_xmlconfig.c                                         |   31 +
 graphics/MesaLib11/DESCR                                                                    |    5 +
 graphics/MesaLib11/Makefile                                                                 |  110 +++
 graphics/MesaLib11/PLIST                                                                    |   82 ++
 graphics/MesaLib11/buildlink3.mk                                                            |   48 +
 graphics/MesaLib11/builtin.mk                                                               |   87 ++
 graphics/MesaLib11/distinfo                                                                 |   62 ++
 graphics/MesaLib11/dri.mk                                                                   |   37 +
 graphics/MesaLib11/files/patch-manual_fdo90311                                              |  111 +++
 graphics/MesaLib11/options.mk                                                               |  215 +++++++
 graphics/MesaLib11/patches/patch-configure                                                  |  161 +++++
 graphics/MesaLib11/patches/patch-include_GL_glxext.h                                        |   17 +
 graphics/MesaLib11/patches/patch-src_compiler_glsl_builtin__functions.cpp                   |   14 +
 graphics/MesaLib11/patches/patch-src_egl_drivers_dri2_platform__drm.c                       |   16 +
 graphics/MesaLib11/patches/patch-src_egl_drivers_dri2_platform__x11.c                       |   30 +
 graphics/MesaLib11/patches/patch-src_egl_main_eglglobals.c                                  |   40 +
 graphics/MesaLib11/patches/patch-src_gallium_auxiliary_draw_draw__llvm.c                    |   27 +
 graphics/MesaLib11/patches/patch-src_gallium_auxiliary_gallivm_lp__bld__intr.c              |  105 +++
 graphics/MesaLib11/patches/patch-src_gallium_auxiliary_gallivm_lp__bld__intr.h              |   44 +
 graphics/MesaLib11/patches/patch-src_gallium_auxiliary_gallivm_lp__bld__sample__soa.c       |   24 +
 graphics/MesaLib11/patches/patch-src_gallium_auxiliary_util_u__format__tests.c              |   17 +
 graphics/MesaLib11/patches/patch-src_gallium_auxiliary_util_u__math.h                       |   31 +
 graphics/MesaLib11/patches/patch-src_gallium_auxiliary_util_u__network.c                    |   33 +
 graphics/MesaLib11/patches/patch-src_gallium_auxiliary_util_u__network.h                    |   15 +
 graphics/MesaLib11/patches/patch-src_gallium_drivers_llvmpipe_lp__state__fs.c               |   16 +
 graphics/MesaLib11/patches/patch-src_gallium_drivers_llvmpipe_lp__state__setup.c            |   17 +
 graphics/MesaLib11/patches/patch-src_gallium_drivers_nouveau_codegen_nv50__ir__peephole.cpp |   25 +
 graphics/MesaLib11/patches/patch-src_gallium_drivers_nouveau_nouveau__debug.h               |   15 +
 graphics/MesaLib11/patches/patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c          |   18 +
 graphics/MesaLib11/patches/patch-src_gallium_drivers_nouveau_nv50_nv84__video.c             |   18 +
 graphics/MesaLib11/patches/patch-src_gallium_drivers_r600_r600__llvm.c                      |   71 ++
 graphics/MesaLib11/patches/patch-src_gallium_drivers_radeon_radeon__llvm__util.c            |   27 +
 graphics/MesaLib11/patches/patch-src_gallium_drivers_radeon_radeon__setup__tgsi__llvm.c     |   66 ++
 graphics/MesaLib11/patches/patch-src_gallium_drivers_radeonsi_si__shader.c                  |  204 ++++++
 graphics/MesaLib11/patches/patch-src_gallium_targets_dri_Makefile.in                        |   15 +
 graphics/MesaLib11/patches/patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c        |   18 +
 graphics/MesaLib11/patches/patch-src_gallium_winsys_svga_drm_vmw__screen.c                  |   19 +
 graphics/MesaLib11/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c           |   32 +
 graphics/MesaLib11/patches/patch-src_gbm_main_gbm.c                                         |   19 +
 graphics/MesaLib11/patches/patch-src_glsl_ralloc.c                                          |   39 +
 graphics/MesaLib11/patches/patch-src_glx_apple_apple__glapi.c                               |   24 +
 graphics/MesaLib11/patches/patch-src_glx_glxclient.h                                        |   19 +
 graphics/MesaLib11/patches/patch-src_glx_glxcurrent.c                                       |   40 +
 graphics/MesaLib11/patches/patch-src_loader_Makefile.in                                     |   24 +
 graphics/MesaLib11/patches/patch-src_loader_loader.c                                        |   96 +++
 graphics/MesaLib11/patches/patch-src_mapi_entry__x86-64__tls.h                              |   40 +
 graphics/MesaLib11/patches/patch-src_mapi_entry__x86__tls.h                                 |   48 +
 graphics/MesaLib11/patches/patch-src_mapi_entry__x86__tsd.h                                 |   17 +
 graphics/MesaLib11/patches/patch-src_mapi_glapi_gen_gl__gentable.py                         |   15 +
 graphics/MesaLib11/patches/patch-src_mapi_u__current.c                                      |   31 +
 graphics/MesaLib11/patches/patch-src_mapi_u__current.h                                      |   16 +
 graphics/MesaLib11/patches/patch-src_mesa_drivers_dri_Makefile.in                           |   15 +
 graphics/MesaLib11/patches/patch-src_mesa_drivers_dri_common_Makefile.in                    |   16 +
 graphics/MesaLib11/patches/patch-src_mesa_drivers_dri_common_xmlconfig.c                    |   50 +
 graphics/MesaLib11/patches/patch-src_mesa_drivers_dri_i915_intel__screen.c                  |   39 +
 graphics/MesaLib11/patches/patch-src_mesa_drivers_dri_i965_intel__screen.c                  |   39 +
 graphics/MesaLib11/patches/patch-src_mesa_drivers_dri_swrast_swrast.c                       |   19 +
 graphics/MesaLib11/patches/patch-src_mesa_main_context.c                                    |   41 +
 graphics/MesaLib11/patches/patch-src_mesa_main_extensions.c                                 |   24 +
 graphics/MesaLib11/patches/patch-src_mesa_main_macros.h                                     |   16 +
 graphics/MesaLib11/patches/patch-src_mesa_main_shader__query.cpp                            |   48 +
 graphics/MesaLib11/patches/patch-src_mesa_tnl_t__pipeline.c                                 |   20 +
 graphics/MesaLib11/patches/patch-src_mesa_x86_common__x86.c                                 |   24 +
 graphics/MesaLib11/patches/patch-src_util_strndup.c                                         |   30 +
 graphics/MesaLib11/patches/patch-src_util_strndup.h                                         |   15 +
 graphics/MesaLib11/patches/patch-src_util_u__atomic.h                                       |   30 +
 graphics/MesaLib18/DESCR                                                                    |    5 -
 graphics/MesaLib18/Makefile                                                                 |  111 ---
 graphics/MesaLib18/PLIST                                                                    |  102 ---
 graphics/MesaLib18/buildlink3.mk                                                            |   49 -
 graphics/MesaLib18/builtin.mk                                                               |   89 --
 graphics/MesaLib18/distinfo                                                                 |   71 --
 graphics/MesaLib18/dri.mk                                                                   |   31 -
 graphics/MesaLib18/options.mk                                                               |  299 ----------
 graphics/MesaLib18/patches/patch-configure.ac                                               |  110 ---
 graphics/MesaLib18/patches/patch-include_GL_internal_dri__interface.h                       |   27 -
 graphics/MesaLib18/patches/patch-src_amd_common_ac__debug.c                                 |   19 -
 graphics/MesaLib18/patches/patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c            |   19 -
 graphics/MesaLib18/patches/patch-src_compiler_builtin__type__macros.h                       |   25 -
 graphics/MesaLib18/patches/patch-src_compiler_glsl_glsl__parser__extras.cpp                 |   18 -
 graphics/MesaLib18/patches/patch-src_egl_drivers_dri2_platform__drm.c                       |   18 -
 graphics/MesaLib18/patches/patch-src_egl_drivers_dri2_platform__x11.c                       |   60 --
 graphics/MesaLib18/patches/patch-src_egl_main_eglglobals.c                                  |   53 -
 graphics/MesaLib18/patches/patch-src_gallium_auxiliary_drivers_trace_tr__dump.c             |   50 -
 graphics/MesaLib18/patches/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c      |  127 ----
 graphics/MesaLib18/patches/patch-src_gallium_auxiliary_util_u__format__tests.c              |   17 -
 graphics/MesaLib18/patches/patch-src_gallium_auxiliary_util_u__helpers.c                    |   34 -
 graphics/MesaLib18/patches/patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c          |   18 -
 graphics/MesaLib18/patches/patch-src_gallium_drivers_nouveau_nv50_nv84__video.c             |   18 -
 graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c          |   21 -
 graphics/MesaLib18/patches/patch-src_gallium_drivers_vc4_vc4__bufmgr.c                      |   18 -
 graphics/MesaLib18/patches/patch-src_gallium_include_pipe_p__config.h                       |   31 -
 graphics/MesaLib18/patches/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp     |   40 -
 graphics/MesaLib18/patches/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp       |   21 -
 graphics/MesaLib18/patches/patch-src_gallium_state__trackers_clover_util_range.hpp          |   40 -
 graphics/MesaLib18/patches/patch-src_gbm_Makefile.am                                        |   12 -
 graphics/MesaLib18/patches/patch-src_glx_Makefile.am                                        |   49 -
 graphics/MesaLib18/patches/patch-src_glx_apple_apple__glapi.c                               |   24 -
 graphics/MesaLib18/patches/patch-src_glx_dri__common.h                                      |   17 -
 graphics/MesaLib18/patches/patch-src_glx_dri__glx.c                                         |   43 -
 graphics/MesaLib18/patches/patch-src_glx_glxclient.h                                        |   19 -
 graphics/MesaLib18/patches/patch-src_glx_glxcurrent.c                                       |   40 -
 graphics/MesaLib18/patches/patch-src_glx_glxext.c                                           |   47 -
 graphics/MesaLib18/patches/patch-src_intel_Makefile.tools.am                                |   14 -
 graphics/MesaLib18/patches/patch-src_intel_compiler_brw__fs__bank__conflicts.cpp            |   23 -
 graphics/MesaLib18/patches/patch-src_intel_tools_aub__mem.c                                 |   36 -
 graphics/MesaLib18/patches/patch-src_intel_tools_aubinator__error__decode.c                 |   19 -
 graphics/MesaLib18/patches/patch-src_intel_vulkan_anv__allocator.c                          |   62 --
 graphics/MesaLib18/patches/patch-src_intel_vulkan_anv__device.c                             |   47 -
 graphics/MesaLib18/patches/patch-src_intel_vulkan_anv__gem.c                                |   19 -
 graphics/MesaLib18/patches/patch-src_intel_vulkan_anv__gem__stubs.c                         |   36 -
 graphics/MesaLib18/patches/patch-src_intel_vulkan_anv__queue.c                              |   25 -
 graphics/MesaLib18/patches/patch-src_mapi_entry__x86-64__tls.h                              |   32 -
 graphics/MesaLib18/patches/patch-src_mapi_entry__x86__tls.h                                 |   40 -
 graphics/MesaLib18/patches/patch-src_mapi_glapi_gen_gl__gentable.py                         |   15 -
 graphics/MesaLib18/patches/patch-src_mapi_u__current.c                                      |   31 -
 graphics/MesaLib18/patches/patch-src_mapi_u__current.h                                      |   16 -
 graphics/MesaLib18/patches/patch-src_mesa_drivers_dri_i915_intel__screen.c                  |   44 -
 graphics/MesaLib18/patches/patch-src_mesa_drivers_dri_i965_brw__oa__metrics.c               |   13 -
 graphics/MesaLib18/patches/patch-src_mesa_drivers_dri_i965_brw__performance__query.c        |   72 --
 graphics/MesaLib18/patches/patch-src_mesa_drivers_dri_i965_intel__screen.c                  |   44 -
 graphics/MesaLib18/patches/patch-src_mesa_drivers_dri_i965_intel__tiled__memcpy.c           |   22 -
 graphics/MesaLib18/patches/patch-src_mesa_drivers_dri_swrast_swrast.c                       |   19 -
 graphics/MesaLib18/patches/patch-src_mesa_drivers_x11_Makefile.am                           |   15 -
 graphics/MesaLib18/patches/patch-src_mesa_main_context.c                                    |   57 -
 graphics/MesaLib18/patches/patch-src_mesa_main_extensions.c                                 |   31 -
 graphics/MesaLib18/patches/patch-src_mesa_main_macros.h                                     |   18 -
 graphics/MesaLib18/patches/patch-src_mesa_main_shader__query.cpp                            |   58 -
 graphics/MesaLib18/patches/patch-src_mesa_x86_common__x86.c                                 |   24 -
 graphics/MesaLib18/patches/patch-src_util_Makefile.am                                       |   15 -
 graphics/MesaLib18/patches/patch-src_util_build__id.c                                       |   25 -
 graphics/MesaLib18/patches/patch-src_util_disk__cache.c                                     |   29 -
 graphics/MesaLib18/patches/patch-src_util_futex.h                                           |   53 -
 graphics/MesaLib18/patches/patch-src_util_ralloc.c                                          |   25 -
 graphics/MesaLib18/patches/patch-src_util_strndup.h                                         |   15 -
 graphics/MesaLib18/patches/patch-src_util_u__atomic.h                                       |   15 -
 graphics/MesaLib18/patches/patch-src_util_u__queue.c                                        |   70 --
 graphics/MesaLib18/patches/patch-src_util_u__thread.h                                       |   76 --
 graphics/MesaLib18/patches/patch-src_util_xmlconfig.c                                       |   31 -
 244 files changed, 4874 insertions(+), 4869 deletions(-)

diffs (truncated from 11308 to 300 lines):

diff -r 22d795f3466d -r cd96dc22c896 graphics/Makefile
--- a/graphics/Makefile Wed Aug 21 13:22:54 2019 +0000
+++ b/graphics/Makefile Wed Aug 21 13:35:27 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.839 2019/08/19 09:56:53 nia Exp $
+# $NetBSD: Makefile,v 1.840 2019/08/21 13:35:27 nia Exp $
 #
 
 COMMENT=       Graphics tools and libraries
@@ -16,7 +16,7 @@
 SUBDIR+=       Mesa
 SUBDIR+=       MesaDemos
 SUBDIR+=       MesaLib
-SUBDIR+=       MesaLib18
+SUBDIR+=       MesaLib11
 SUBDIR+=       MesaLib7
 SUBDIR+=       Ngraph
 SUBDIR+=       OpenRM
diff -r 22d795f3466d -r cd96dc22c896 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Wed Aug 21 13:22:54 2019 +0000
+++ b/graphics/MesaLib/Makefile Wed Aug 21 13:35:27 2019 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.148 2019/04/26 13:13:59 maya Exp $
+# $NetBSD: Makefile,v 1.149 2019/08/21 13:35:28 nia Exp $
 
-DISTNAME=      mesa-11.2.2
+DISTNAME=      mesa-18.3.4
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
-PKGREVISION=   11
+PKGREVISION=   1
 CATEGORIES=    graphics x11
-MASTER_SITES=  ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
+MASTER_SITES=  ftp://ftp.freedesktop.org/pub/mesa/
+# MASTER_SITES=        ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -13,21 +14,16 @@
 LICENSE=       mit
 
 GNU_CONFIGURE= yes
-USE_TOOLS+=    bison pkg-config gmake flex
+USE_TOOLS+=    autoconf automake autoreconf bison pkg-config gmake flex
 USE_LANGUAGES= c99 c++
 USE_LIBTOOL=   yes
 
-#CFLAGS+=      -g -O0
-#CXXFLAGS+=    -g -O0
-
-GCC_REQD+=     4.2
-
 PKGCONFIG_OVERRIDE+=   src/egl/main/egl.pc.in
-PKGCONFIG_OVERRIDE+=   src/egl/wayland/wayland-egl/wayland-egl.pc.in
 PKGCONFIG_OVERRIDE+=   src/gallium/targets/d3dadapter9/d3d.pc.in
 PKGCONFIG_OVERRIDE+=   src/gallium/targets/osmesa/osmesa.pc.in
 PKGCONFIG_OVERRIDE+=   src/gallium/targets/xa/xatracker.pc.in
 PKGCONFIG_OVERRIDE+=   src/gbm/main/gbm.pc.in
+PKGCONFIG_OVERRIDE+=   src/glx/windows/windowsdriproto.pc.in
 PKGCONFIG_OVERRIDE+=   src/mapi/es1api/glesv1_cm.pc.in
 PKGCONFIG_OVERRIDE+=   src/mapi/es2api/glesv2.pc.in
 PKGCONFIG_OVERRIDE+=   src/mesa/drivers/dri/dri.pc.in
@@ -41,24 +37,30 @@
 # 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 glapi-shared/libglapi in Makefiles
-SUBST_FILES.wrapper-bug=       src/gbm/Makefile.in
-SUBST_FILES.wrapper-bug+=      src/glx/Makefile.in
-SUBST_FILES.wrapper-bug+=      src/mapi/Makefile.in
-SUBST_FILES.wrapper-bug+=      src/mesa/drivers/x11/Makefile.in
-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_tmp_rename.la,libglapi.la,g'
+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 with ${PREFIX}/etc/drirc
-SUBST_CLASSES+=                        drirc
-SUBST_STAGE.drirc=             pre-configure
-SUBST_MESSAGE.drirc=           Fixing hardcoded /etc/drirc references
-SUBST_FILES.drirc+=            src/mesa/drivers/dri/common/xmlconfig.c
-SUBST_SED.drirc+=               -e 's|/etc/|${PREFIX}/etc/|g'
+# Replace /etc/drirc.d with ${PREFIX}/etc/drirc.d
+SUBST_CLASSES+=                drirc
+SUBST_STAGE.drirc=     pre-configure
+SUBST_MESSAGE.drirc=   Fixing hardcoded /etc/drirc.d references
+SUBST_FILES.drirc+=    src/util/xmlconfig.c
+SUBST_SED.drirc+=      -e 's|/etc|${PREFIX}/etc|g'
 
-# Required due to clang defaulting to strict C standard by default (no strdup).
-CFLAGS.SunOS+= -D__EXTENSIONS__
+CFLAGS.SunOS+=         -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
+CXXFLAGS.SunOS+=       -Drestrict=__restrict__
+LDFLAGS.SunOS+=                -lsocket -lnsl
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
@@ -68,20 +70,11 @@
 CONFIGURE_ARGS+=       --enable-glx-read-only-text
 .endif
 
-.if !empty(PKGSRC_COMPILER:Mclang)
-SUBST_CLASSES+=                tr1
-SUBST_STAGE.tr1=       pre-configure
-SUBST_MESSAGE.tr1=     Fixing TR1 C++ namespace
-SUBST_FILES.tr1=       src/gallium/drivers/nouveau/codegen/*.h
-SUBST_FILES.tr1+=      src/gallium/drivers/nouveau/codegen/*.cpp
-SUBST_SED.tr1=         -e 's,std::tr1::,std::,g'
-SUBST_SED.tr1+=                -e 's,include <tr1/,include <,g'
-.endif
-
 PYTHON_FOR_BUILD_ONLY= yes
-PYTHON_VERSIONS_INCOMPATIBLE=   36 37 # as of 11.2.2
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
-CONFIGURE_ENV+=                ac_cv_prog_PYTHON2=${PYTHONBIN}
+# 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
@@ -90,21 +83,29 @@
 CPPFLAGS+=     -Dexp2f\(x\)=expf\(\(x\)\*M_LN2\)
 .endif
 
-# Manual patch for FDO bug 90311. Don't apply if not on Darwin as there could
-# be side effects.
-.if ${OPSYS} == "Darwin"
-pre-configure: ${WRKDIR}/.manual_patch_done
-${WRKDIR}/.manual_patch_done:
-       cd ${WRKSRC} && ${TOOLS_PATCH} -z .manual -p0 < ${FILESDIR}/patch-manual_fdo90311
-       touch ${.TARGET}
-.endif
+# Work around Xorg segfaulting in radeon driver due to wrong alloca being used
+CFLAGS.NetBSD+=                -Dalloca=__builtin_alloca
+CXXFLAGS.NetBSD+=      -Dalloca=__builtin_alloca
 
-INSTALLATION_DIRS+=    share/examples/MesaLib
+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
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/src/mesa/drivers/dri/common/drirc ${DESTDIR}${PREFIX}/share/examples/MesaLib
+       ${INSTALL_DATA} ${WRKSRC}/src/util/00-mesa-defaults.conf ${DESTDIR}${EGDIR}
 
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/libxshmfence/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 22d795f3466d -r cd96dc22c896 graphics/MesaLib/PLIST
--- a/graphics/MesaLib/PLIST    Wed Aug 21 13:22:54 2019 +0000
+++ b/graphics/MesaLib/PLIST    Wed Aug 21 13:35:27 2019 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.38 2018/12/24 13:56:44 sevan Exp $
-${PLIST.dri}include/EGL/egl.h
-${PLIST.dri}include/EGL/eglext.h
-${PLIST.dri}include/EGL/eglextchromium.h
-${PLIST.dri}include/EGL/eglmesaext.h
-${PLIST.dri}include/EGL/eglplatform.h
+@comment $NetBSD: PLIST,v 1.39 2019/08/21 13:35:28 nia Exp $
+${PLIST.egl}include/EGL/egl.h
+${PLIST.egl}include/EGL/eglext.h
+${PLIST.egl}include/EGL/eglextchromium.h
+${PLIST.egl}include/EGL/eglmesaext.h
+${PLIST.egl}include/EGL/eglplatform.h
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glcorearb.h
@@ -12,56 +12,74 @@
 include/GL/glx_mangle.h
 include/GL/glxext.h
 ${PLIST.dri}include/GL/internal/dri_interface.h
-include/GL/osmesa.h
-include/GL/wglext.h
-${PLIST.dri}include/GLES/egl.h
-${PLIST.dri}include/GLES/gl.h
-${PLIST.dri}include/GLES/glext.h
-${PLIST.dri}include/GLES/glplatform.h
-${PLIST.dri}include/GLES2/gl2.h
-${PLIST.dri}include/GLES2/gl2ext.h
-${PLIST.dri}include/GLES2/gl2platform.h
-${PLIST.dri}include/GLES3/gl3.h
-${PLIST.dri}include/GLES3/gl31.h
-${PLIST.dri}include/GLES3/gl3ext.h
-${PLIST.dri}include/GLES3/gl3platform.h
-${PLIST.dri}include/KHR/khrplatform.h
+${PLIST.osmesa}include/GL/osmesa.h
+${PLIST.glesv1}include/GLES/egl.h
+${PLIST.glesv1}include/GLES/gl.h
+${PLIST.glesv1}include/GLES/glext.h
+${PLIST.glesv1}include/GLES/glplatform.h
+${PLIST.glesv2}include/GLES2/gl2.h
+${PLIST.glesv2}include/GLES2/gl2ext.h
+${PLIST.glesv2}include/GLES2/gl2platform.h
+${PLIST.glesv2}include/GLES3/gl3.h
+${PLIST.glesv2}include/GLES3/gl31.h
+${PLIST.glesv2}include/GLES3/gl32.h
+${PLIST.glesv2}include/GLES3/gl3ext.h
+${PLIST.glesv2}include/GLES3/gl3platform.h
+include/KHR/khrplatform.h
 ${PLIST.gbm}include/gbm.h
+${PLIST.vulkan}include/vulkan/vulkan_intel.h
 ${PLIST.xatracker}include/xa_composite.h
 ${PLIST.xatracker}include/xa_context.h
 ${PLIST.xatracker}include/xa_tracker.h
-${PLIST.vaapi}lib/dri/gallium_drv_video.la
-${PLIST.i915_dri}lib/dri/i915_dri.so
-${PLIST.i965_dri}lib/dri/i965_dri.so
-${PLIST.ilo}lib/dri/ilo_dri.so
+@comment ${PLIST.vaapi}lib/dri/gallium_drv_video.la
+@comment ${PLIST.vaapi}lib/dri/gallium_drv_video.so
+${PLIST.i915}lib/dri/i915_dri.so
+${PLIST.i965}lib/dri/i965_dri.so
+@comment ${PLIST.ilo}lib/dri/ilo_dri.so
 ${PLIST.freedreno}lib/dri/kgsl_dri.so
 ${PLIST.swrast}lib/dri/kms_swrast_dri.so
 ${PLIST.freedreno}lib/dri/msm_dri.so
 ${PLIST.nouveau}lib/dri/nouveau_dri.so
+@comment ${PLIST.vdpau}lib/dri/nouveau_drv_video.la
+${PLIST.nouveau}${PLIST.vaapi}lib/dri/nouveau_drv_video.so
 ${PLIST.nouveau_dri}lib/dri/nouveau_vieux_dri.so
-${PLIST.r200_dri}lib/dri/r200_dri.so
+@comment ${PLIST.vdpau}lib/dri/radeonsi_drv_video.la
+${PLIST.r200}lib/dri/r200_dri.so
 ${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.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.dri}lib/libEGL.la
+${PLIST.egl}lib/libEGL.la
 lib/libGL.la
-${PLIST.dri}lib/libGLESv1_CM.la
-${PLIST.dri}lib/libGLESv2.la
+${PLIST.glesv1}lib/libGLESv1_CM.la
+${PLIST.glesv2}lib/libGLESv2.la
+${PLIST.osmesa}lib/libOSMesa.la
+${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so
+${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so.1
+${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so.1.0
+${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so.1.0.0
+${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so
+${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.wayland}lib/libwayland-egl.la
+${PLIST.vulkan}lib/libvulkan_intel.la
+${PLIST.vulkan}lib/libvulkan_radeon.la
 ${PLIST.xatracker}lib/libxatracker.la
 ${PLIST.dri}lib/pkgconfig/dri.pc
-${PLIST.dri}lib/pkgconfig/egl.pc
+${PLIST.egl}lib/pkgconfig/egl.pc
 ${PLIST.gbm}lib/pkgconfig/gbm.pc
 lib/pkgconfig/gl.pc
-${PLIST.dri}lib/pkgconfig/glesv1_cm.pc
-${PLIST.dri}lib/pkgconfig/glesv2.pc
-${PLIST.wayland}lib/pkgconfig/wayland-egl.pc
+${PLIST.glesv1}lib/pkgconfig/glesv1_cm.pc
+${PLIST.glesv2}lib/pkgconfig/glesv2.pc
+${PLIST.osmesa}lib/pkgconfig/osmesa.pc
 ${PLIST.xatracker}lib/pkgconfig/xatracker.pc
 ${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so
 ${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1
@@ -79,4 +97,6 @@
 ${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1
 ${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1.0
 ${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1.0.0
-share/examples/MesaLib/drirc
+${PLIST.vulkan}share/vulkan/icd.d/intel_icd.${MACHINE_ARCH}.json
+${PLIST.vulkan}share/vulkan/icd.d/radeon_icd.${MACHINE_ARCH}.json



Home | Main Index | Thread Index | Old Index