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.2.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/b4704310a357
branches: trunk
changeset: 341304:b4704310a357
user: nia <nia%pkgsrc.org@localhost>
date: Fri Oct 18 09:57:07 2019 +0000
description:
MesaLib: Update to 19.2.1
Bug fixes in 19.2.1:
meson.build:1447:6: ERROR: Problem encountered: libdrm required for gallium video statetrackers when using x11
Mesa doesn't build with current Scons version (3.1.0)
libXvMC-1.0.12 breaks mesa build
Meson can't find 32-bit libXvMCW in non-standard path
Mesa installs gl.pc and egl.pc even with libglvnd >= 1.2.0
Changes in 19.2.0:
Adam Jackson (1):
docs: Update bug report URLs for the gitlab migration
Alex Smith (1):
radv: Change memory type order for GPUs without dedicated VRAM
Alyssa Rosenzweig (1):
pan/midgard: Fix writeout combining
Andres Gomez (1):
docs: Add the maximum implemented Vulkan API version in 19.2 rel notes
Andres Rodriguez (1):
radv: additional query fixes
Arcady Goldmints-Orlov (1):
anv: fix descriptor limits on gen8
Bas Nieuwenhuizen (6):
radv: Use correct vgpr_comp_cnt for VS if both prim_id and instance_id are needed.
radv: Emit VGT_GS_ONCHIP_CNTL for tess on GFX10.
radv: Disable NGG for geometry shaders.
Revert "ac/nir: Lower large indirect variables to scratch"
tu: Set up glsl types.
radv: Add workaround for hang in The Surge 2.
Caio Marcelo de Oliveira Filho (2):
nir/lower_explicit_io: Handle 1 bit loads and stores
glsl/nir: Avoid overflow when setting max_uniform_location
Connor Abbott (1):
radv: Call nir_propagate_invariant()
Danylo Piliaiev (3):
nir/loop_unroll: Prepare loop for unrolling in wrapper_unroll
nir/loop_analyze: Treat do{}while(false) loops as 0 iterations
tgsi_to_nir: Translate TGSI_INTERPOLATE_COLOR as INTERP_MODE_NONE
Dave Airlie (2):
virgl: fix format conversion for recent gallium changes.
gallivm: fix atomic compare-and-swap
Dave Stevenson (1):
broadcom/v3d: Allow importing linear BOs with arbitrary offset/stride.
Dylan Baker (9):
bump version to 19.2-rc2
nir: Add is_not_negative helper function
Bump version for rc3
meson: don't generate file into subdirs
add patches to be ignored
Bump version for 19.2.0-rc4
cherry-ignore: Add patches
rehardcode from origin/master to upstream/master
bin/get-pick-list: use --oneline=pretty instead of --oneline
Emil Velikov (1):
Update version to 19.2.0-rc1
Eric Engestrom (14):
ttn: fix 64-bit shift on 32-bit `1`
egl: fix deadlock in malloc error path
util/os_file: fix double-close()
anv: fix format string in error message
freedreno/drm-shim: fix mem leak
nir: fix memleak in error path
anv: add support for driconf
wsi: add minImageCount override
anv: add support for vk_x11_override_min_image_count
amd: move adaptive sync to performance section, as it is defined in xmlpool
radv: add support for vk_x11_override_min_image_count
drirc: override minImageCount=2 for gfxbench
gl: drop incorrect pkg-config file for glvnd
meson: re-add incorrect pkg-config files with GLVND for backward compatibility
Erik Faye-Lund (2):
gallium/auxiliary/indices: consistently apply start only to input
util: fix SSE-version needed for double opcodes
Haihao Xiang (1):
i965: support AYUV/XYUV for external import only
Hal Gentz (2):
glx: Fix SEGV due to dereferencing a NULL ptr from XCB-GLX.
gallium/osmesa: Fix the inability to set no context as current.
Iago Toral Quiroga (1):
v3d: make sure we have enough space in the CL for the primitive counts packet
Ian Romanick (8):
nir/algrbraic: Don't optimize open-coded bitfield reverse when lowering is enabled
intel/compiler: Request bitfield_reverse lowering on pre-Gen7 hardware
nir/algebraic: Mark some value range analysis-based optimizations imprecise
nir/range-analysis: Adjust result range of exp2 to account for flush-to-zero
nir/range-analysis: Adjust result range of multiplication to account for flush-to-zero
nir/range-analysis: Fix incorrect fadd range result for (ne_zero, ne_zero)
nir/range-analysis: Handle constants in nir_op_mov just like nir_op_bcsel
nir/algebraic: Do not apply late DPH optimization in vertex processing stages
Ilia Mirkin (1):
gallium/vl: use compute preference for all multimedia, not just blit
Jason Ekstrand (9):
anv: Bump maxComputeWorkgroupSize
nir: Handle complex derefs in nir_split_array_vars
nir: Don't infinitely recurse in lower_ssa_defs_to_regs_block
nir: Add a block_is_unreachable helper
nir/repair_ssa: Repair dominance for unreachable blocks
nir/repair_ssa: Insert deref casts when needed
nir/dead_cf: Repair SSA if the pass makes progress
intel/fs: Handle UNDEF in split_virtual_grfs
nir/repair_ssa: Replace the unreachable check with the phi builder
Jonathan Marek (1):
freedreno/a2xx: ir2: fix lowering of instructions after float lowering
Jose Maria Casanova Crespo (1):
mesa: recover target_check before get_current_tex_objects
Juan A. Suarez Romero (1):
bin/get-pick-list.sh: sha1 commits can be smaller than 8 chars
Kenneth Graunke (20):
gallium/ddebug: Wrap resource_get_param if available
gallium/trace: Wrap resource_get_param if available
gallium/rbug: Wrap resource_get_param if available
gallium/noop: Implement resource_get_param
iris: Replace devinfo->gen with GEN_GEN
iris: Fix broken aux.possible/sampler_usages bitmask handling
iris: Update fast clear colors on Gen9 with direct immediate writes.
iris: Drop copy format hacks from copy region based transfer path.
iris: Avoid unnecessary resolves on transfer maps
iris: Fix large timeout handling in rel2abs()
isl: Drop UnormPathInColorPipe for buffer surfaces.
isl: Don't set UnormPathInColorPipe for integer surfaces.
util: Add a _mesa_i64roundevenf() helper.
mesa: Fix _mesa_float_to_unorm() on 32-bit systems.
iris: Fix partial fast clear checks to account for miplevel.
iris: Report correct number of planes for planar images
iris: Fix constant buffer sizes for non-UBOs
gallium: Fix util_format_get_depth_only
iris: Initialize ice->state.prim_mode to an invalid value
intel: Increase Gen11 compute shader scratch IDs to 64.
Lepton Wu (1):
virgl: Fix pipe_resource leaks under multi-sample.
Lionel Landwerlin (9):
util/timespec: use unsigned 64 bit integers for nsec values
util: fix compilation on macos
egl: fix platform selection
vulkan/overlay: bounce image back to present layout
radv: store engine name
driconfig: add a new engine name/version parameter
vulkan: add vk_x11_strict_image_count option
util/xmlconfig: fix regexp compile failure check
drirc: include unreal engine version 0 to 23
Marek Ol??k (23):
radeonsi/gfx10: fix the legacy pipeline by storing as_ngg in the shader cache
radeonsi: move some global shader cache flags to per-binary flags
radeonsi/gfx10: fix tessellation for the legacy pipeline
radeonsi/gfx10: fix the PRIMITIVES_GENERATED query if using legacy streamout
radeonsi/gfx10: create the GS copy shader if using legacy streamout
radeonsi/gfx10: add as_ngg variant for VS as ES to select Wave32/64
radeonsi/gfx10: fix InstanceID for legacy VS+GS
radeonsi/gfx10: don't initialize VGT_INSTANCE_STEP_RATE_0
radeonsi/gfx10: always use the legacy pipeline for streamout
radeonsi/gfx10: finish up Navi14, add PCI ID
radeonsi/gfx10: add AMD_DEBUG=nongg
winsys/amdgpu+radeon: process AMD_DEBUG in addition to R600_DEBUG
radeonsi: add PKT3_CONTEXT_REG_RMW
radeonsi/gfx10: remove incorrect ngg/pos_writes_edgeflag variables
radeonsi/gfx10: set PA_CL_VS_OUT_CNTL with CONTEXT_REG_RMW to fix edge flags
radeonsi: consolidate determining VGPR_COMP_CNT for API VS
radeonsi: unbind blend/DSA/rasterizer state correctly in delete functions
radeonsi: fix scratch buffer WAVESIZE setting leading to corruption
radeonsi/gfx10: don't call gfx10_destroy_query with compute-only contexts
radeonsi/gfx10: fix wave occupancy computations
radeonsi: add Navi12 PCI ID
amd: add more PCI IDs for Navi14
ac/addrlib: fix chip identification for Vega10, Arcturus, Raven2, Renoir
Mauro Rossi (2):
android: mesa: revert "Enable asm unconditionally"
android: anv: libmesa_vulkan_common: add libmesa_util static dependency
Paulo Zanoni (2):
intel/fs: grab fail_msg from v32 instead of v16 when v32->run_cs fails
intel/fs: fix SHADER_OPCODE_CLUSTER_BROADCAST for SIMD32
Pierre-Eric Pelloux-Prayer (1):
glsl: replace 'x + (-x)' with constant 0
Rafael Antognolli (1):
anv: Only re-emit non-dynamic state that has changed.
Rhys Perry (1):
radv: always emit a position export in gs copy shaders
Samuel Iglesias Gons?lvez (1):
intel/nir: do not apply the fsin and fcos trig workarounds for consts
Samuel Pitoiset (11):
radv: allow to enable VK_AMD_shader_ballot only on GFX8+
radv: add a new debug option called RADV_DEBUG=noshaderballot
radv: force enable VK_AMD_shader_ballot for Wolfenstein Youngblood
ac: fix exclusive scans on GFX8-GFX9
radv/gfx10: don't initialize VGT_INSTANCE_STEP_RATE_0
radv/gfx10: do not use NGG with NAVI14
radv: fix getting the index type size for uint8_t
nir: do not assume that the result of fexp2(a) is always an integral
radv: fix allocating number of user sgprs if streamout is used
radv: fix loading 64-bit GS inputs
radv/gfx10: fix VK_KHR_pipeline_executable_properties with NGG GS
Sergii Romantsov (2):
intel/dri: finish proper glthread
nir/large_constants: more careful data copying
Tapani P?lli (5):
util: fix os_create_anonymous_file on android
iris/android: fix build and link with libmesa_intel_perf
egl: reset blob cache set/get functions on terminate
iris: close screen fd on iris_destroy_screen
egl: check for NULL value like eglGetSyncAttribKHR does
Thong Thai (1):
Revert "radeonsi: don't emit PKT3_CONTEXT_CONTROL on amdgpu"
Timur Krist?f (1):
st/nine: Properly initialize GLSL types for NIR shaders.
Vinson Lee (2):
swr: Fix build with llvm-9.0 again.
travis: Fail build if any command in if statement fails.
diffstat:
graphics/MesaLib/Makefile | 50 ++++---
graphics/MesaLib/distinfo | 25 +--
graphics/MesaLib/options.mk | 18 ++-
graphics/MesaLib/patches/patch-meson.build | 24 ---
graphics/MesaLib/patches/patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c | 19 ---
graphics/MesaLib/patches/patch-src_gallium_auxiliary_drivers_trace_tr__dump.c | 50 --------
graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_meson.build | 15 --
graphics/MesaLib/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c | 8 +-
graphics/MesaLib/patches/patch-src_intel_isl_isl__tiled__memcpy.c | 22 ---
graphics/MesaLib/patches/patch-src_intel_tools_aub__mem.c | 36 -----
graphics/MesaLib/patches/patch-src_intel_vulkan_anv__allocator.c | 62 ----------
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_mapi_u__current.c | 8 +-
graphics/MesaLib/patches/patch-src_mapi_u__current.h | 10 +-
15 files changed, 63 insertions(+), 339 deletions(-)
diffs (truncated from 599 to 300 lines):
diff -r 6163efce7fdc -r b4704310a357 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Fri Oct 18 09:45:27 2019 +0000
+++ b/graphics/MesaLib/Makefile Fri Oct 18 09:57:07 2019 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.168 2019/10/07 09:28:11 prlw1 Exp $
+# $NetBSD: Makefile,v 1.169 2019/10/18 09:57:07 nia Exp $
-DISTNAME= mesa-19.1.6
+DISTNAME= mesa-19.2.1
PKGNAME= ${DISTNAME:S/mesa/MesaLib/}
-PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= https://mesa.freedesktop.org/archive/
EXTRACT_SUFX= .tar.xz
@@ -16,18 +15,6 @@
USE_LANGUAGES= c99 c++
USE_LIBTOOL= yes
-PKGCONFIG_OVERRIDE+= src/egl/main/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
-PKGCONFIG_OVERRIDE+= src/mesa/drivers/osmesa/osmesa.pc.in
-PKGCONFIG_OVERRIDE+= src/mesa/gl.pc.in
-
SUBST_CLASSES+= py
SUBST_STAGE.py= pre-configure
SUBST_MESSAGE.py= Fixing Python binary name
@@ -60,6 +47,7 @@
PLIST_VARS+= egl gbm vaapi xatracker
.if ${OPSYS} != "Darwin" && ${OPSYS} != "Cygwin"
+BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.81
.include "../../x11/libdrm/buildlink3.mk"
MESA_PLATFORMS+= drm
. if ${OPSYS} != "SunOS"
@@ -151,9 +139,18 @@
CPPFLAGS+= -DHAVE_NOATEXIT
CPPFLAGS+= -DSYSCONFDIR=${PKG_SYSCONFDIR}
+TOOL_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
+
+# needed to build vulkan support
+TOOL_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
+
# https://gitlab.freedesktop.org/mesa/mesa/merge_requests/1854
BUILDLINK_TRANSFORM+= rm:-Werror=return-type
+# ../src/intel/perf/gen_perf.c:426:7: error: %m is only allowed in syslog(3) like functions
+BUILDLINK_TRANSFORM+= rm:-Werror=format
+BUILDLINK_TRANSFORM+= rm:-Wformat-security
+
# https://gitlab.freedesktop.org/mesa/mesa/merge_requests/1853
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--build-id=sha1
@@ -161,13 +158,6 @@
CFLAGS.NetBSD+= -Dalloca=__builtin_alloca
CXXFLAGS.NetBSD+= -Dalloca=__builtin_alloca
-PYTHON_FOR_BUILD_ONLY= yes
-
-TOOL_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
-
-# needed to build vulkan support
-TOOL_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
-
EGDIR= ${PREFIX}/share/examples/mesa
OWN_DIRS= ${PKG_SYSCONFDIR}/drirc.d
@@ -176,13 +166,27 @@
INSTALLATION_DIRS+= ${EGDIR}
+PYTHON_FOR_BUILD_ONLY= tool
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
+PKGCONFIG_OVERRIDE_STAGE= pre-install
+PKGCONFIG_OVERRIDE+= output/meson-private/glesv1_cm.pc
+PKGCONFIG_OVERRIDE+= output/meson-private/glesv2.pc
+PKGCONFIG_OVERRIDE+= output/meson-private/dri.pc
+PKGCONFIG_OVERRIDE+= output/meson-private/gbm.pc
+PKGCONFIG_OVERRIDE+= output/meson-private/egl.pc
+PKGCONFIG_OVERRIDE+= output/meson-private/osmesa.pc
+PKGCONFIG_OVERRIDE+= output/meson-private/xatracker.pc
+PKGCONFIG_OVERRIDE+= output/meson-private/gl.pc
+
pre-configure:
- touch ${WRKSRC}/src/glx/apple_dummy.cpp
+ ${TOUCH} ${WRKSRC}/src/glx/apple_dummy.cpp
post-install:
${MV} ${DESTDIR}${PREFIX}/share/drirc.d/00-mesa-defaults.conf ${DESTDIR}${EGDIR}
.include "../../devel/meson/build.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/tool.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 6163efce7fdc -r b4704310a357 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Fri Oct 18 09:45:27 2019 +0000
+++ b/graphics/MesaLib/distinfo Fri Oct 18 09:57:07 2019 +0000
@@ -1,22 +1,18 @@
-$NetBSD: distinfo,v 1.133 2019/09/09 14:42:29 tnn Exp $
+$NetBSD: distinfo,v 1.134 2019/10/18 09:57:07 nia Exp $
-SHA1 (mesa-19.1.6.tar.xz) = 6344c54ff6f66c85c1f0a44a96259263163f9969
-RMD160 (mesa-19.1.6.tar.xz) = dd0cfe323b38bdcb5c2b262150bd7127feee60a6
-SHA512 (mesa-19.1.6.tar.xz) = 399ce97a293769893ef9a4a6af1f77c7d835f5405bdbc03bbf9b73e052e4ff3b43dec5dafd6b9fedaaf2c59531aeccaa0f685a8bfdc5719a26c3815fc7f68024
-Size (mesa-19.1.6.tar.xz) = 10939908 bytes
-SHA1 (patch-meson.build) = a9fdcaa59aed9b56ff95d4153dd73064e2261c45
+SHA1 (mesa-19.2.1.tar.xz) = 8ba7cb66799d5372923651f193f84d498b35c9a5
+RMD160 (mesa-19.2.1.tar.xz) = a3f068b71b138aae24cefd5c3cb044a5975b9aa2
+SHA512 (mesa-19.2.1.tar.xz) = decd74976fe866bf67fac4ae55a62d8e33ad24278dd58effe533e7d258b249f0ead848360e7e71444265184c6d9d9b04361caf0c6df99504e33599e7a0cd6c5d
+Size (mesa-19.2.1.tar.xz) = 11468492 bytes
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) = e4868011711fb89a293580a12eb603b8e7162336
SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4
SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 49e48c31eacb79d1da357fe70eaffd2926b5280e
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_drivers_nouveau_meson.build) = 27918a92a72a9da88bc8e887a3d293c332c2862f
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
+SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = 2a6fb80e2dd8c19a73c1ae9c037e7b1769ca100f
SHA1 (patch-src_gallium_drivers_vc4_vc4__bufmgr.c) = 1d591d346486fdf58893f69ab92a272e6a31a987
SHA1 (patch-src_gallium_include_pipe_p__config.h) = f4e38eac66167b619c30076bb0144dd716310967
SHA1 (patch-src_gallium_state__trackers_clover_llvm_invocation.cpp) = 3053db09fbfffffd82e232b60b244a0a80c8f181
@@ -29,18 +25,13 @@
SHA1 (patch-src_glx_glxcurrent.c) = 8b8e949eded13491c5865601253c6e7d4b06e228
SHA1 (patch-src_glx_glxext.c) = 15c2c5e0c6b5095ce849fb86ad148aa05d7d907a
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.c) = 526f36d96bd9d72893764da2b9e78cb9b70de92b
-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__gem.c) = b8eb487fa704151e7c3c3b1d23973b2b0aa5922e
-SHA1 (patch-src_intel_vulkan_anv__gem__stubs.c) = ad5a4bd9fe521cf73faf2f0cf0f493a0b40f4c20
SHA1 (patch-src_loader_loader.c) = 303e941f9b8afa6ee8053107af01e2c26e6ff118
SHA1 (patch-src_mapi_entry__x86-64__tls.h) = 11b7ef1da435fa17fc7025a46a123d447d6a7d07
SHA1 (patch-src_mapi_entry__x86__tls.h) = 11c0f5302d305a77f3a1780d44a2c61f48a66273
-SHA1 (patch-src_mapi_u__current.c) = 38d324fcd1c28d155106ccd248edb5eb1aa9ffac
-SHA1 (patch-src_mapi_u__current.h) = 465a992bd34057e9521f0a33e6f2e25cefc145ca
+SHA1 (patch-src_mapi_u__current.c) = 4e3ec6e253af3737f77ecd43e56044ba2b81e699
+SHA1 (patch-src_mapi_u__current.h) = 9f4744681381a0959fda2926a436f296c89577f3
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
diff -r 6163efce7fdc -r b4704310a357 graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk Fri Oct 18 09:45:27 2019 +0000
+++ b/graphics/MesaLib/options.mk Fri Oct 18 09:57:07 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.73 2019/09/01 09:36:16 nia Exp $
+# $NetBSD: options.mk,v 1.74 2019/10/18 09:57:07 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
-PKG_SUPPORTED_OPTIONS+= llvm x11
+PKG_SUPPORTED_OPTIONS+= llvm vulkan x11
.if ${OPSYS} != "Darwin" && ${OPSYS} != "Cygwin"
PKG_SUPPORTED_OPTIONS+= wayland
@@ -40,11 +40,14 @@
#
.if !empty(PKG_OPTIONS:Mllvm)
MESON_ARGS+= -Dllvm=true
-BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=7.0.1nb2
+BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=7.0.1nb2
. include "../../devel/libelf/buildlink3.mk"
. include "../../lang/libLLVM/buildlink3.mk"
. if ${OPSYS} != "Darwin" && ${OPSYS} != "Cygwin"
+# This is the latest libdrm requirement for amdgpu.
+BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.99
+
PLIST.r600= yes
GALLIUM_DRIVERS+= r600
PLIST.radeonsi= yes
@@ -55,6 +58,15 @@
.endif
#
+# Vulkan support - experimental
+#
+.if !empty(PKG_OPTIONS:Mvulkan)
+MESON_ARGS+= -Dvulkan-drivers="auto"
+.else
+MESON_ARGS+= -Dvulkan-drivers=""
+.endif
+
+#
# Wayland support
#
.if !empty(PKG_OPTIONS:Mwayland)
diff -r 6163efce7fdc -r b4704310a357 graphics/MesaLib/patches/patch-meson.build
--- a/graphics/MesaLib/patches/patch-meson.build Fri Oct 18 09:45:27 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$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
diff -r 6163efce7fdc -r b4704310a357 graphics/MesaLib/patches/patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c
--- a/graphics/MesaLib/patches/patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c Fri Oct 18 09:45:27 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c,v 1.1 2019/08/21 13:35:28 nia Exp $
-
-Define ETIME if missing
-
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225415
-FreeBSD Bugzilla: Bug 225415 graphics/mesa-dri: update to 18.0.0
-
---- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c.orig 2018-02-09 02:17:57.000000000 +0000
-+++ src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
-@@ -33,6 +33,9 @@
- #include "radv_amdgpu_bo.h"
- #include "sid.h"
-
-+#ifndef ETIME
-+#define ETIME ETIMEDOUT
-+#endif
-
- enum {
- VIRTUAL_BUFFER_HASH_TABLE_SIZE = 1024
diff -r 6163efce7fdc -r b4704310a357 graphics/MesaLib/patches/patch-src_gallium_auxiliary_drivers_trace_tr__dump.c
--- a/graphics/MesaLib/patches/patch-src_gallium_auxiliary_drivers_trace_tr__dump.c Fri Oct 18 09:45:27 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-$NetBSD: patch-src_gallium_auxiliary_drivers_trace_tr__dump.c,v 1.1 2019/08/21 13:35:28 nia Exp $
-
-atexit() is not a good idea in shared libraries.
-
-FreeBSD reported atexit bug for 10.6:
-https://bugs.freedesktop.org/show_bug.cgi?id=91869
-
---- src/gallium/auxiliary/driver_trace/tr_dump.c.orig 2018-09-07 21:18:07.000000000 +0000
-+++ src/gallium/auxiliary/driver_trace/tr_dump.c
-@@ -63,7 +63,6 @@ static mtx_t call_mutex = _MTX_INITIALIZ
- static long unsigned call_no = 0;
- static boolean dumping = FALSE;
-
--
- static inline void
- trace_dump_write(const char *buf, size_t size)
- {
-@@ -171,9 +170,20 @@ trace_dump_trace_flush(void)
- }
- }
-
-+#if defined(HAVE_NOATEXIT)
-+static boolean trace_dump_has_begun = FALSE;
-+
-+static void __attribute__((__destructor__))
-+#else
- static void
-+#endif
- trace_dump_trace_close(void)
- {
-+#if defined(HAVE_NOATEXIT)
-+ if (!trace_dump_has_begun)
-+ return;
-+#endif
-+
- if (stream) {
- trace_dump_writes("</trace>\n");
- if (close_stream) {
-@@ -233,7 +243,11 @@ trace_dump_trace_begin(void)
- * screen multiple times, so we only write </trace> tag and close at exit
- * time.
- */
-+#if defined(HAVE_NOATEXIT)
Home |
Main Index |
Thread Index |
Old Index