Index: head/graphics/mesa-devel/Makefile =================================================================== --- head/graphics/mesa-devel/Makefile (revision 537859) +++ head/graphics/mesa-devel/Makefile (revision 537860) @@ -1,150 +1,149 @@ # $FreeBSD$ PORTNAME= mesa -DISTVERSION= 20.1-branchpoint-1363 -DISTVERSIONSUFFIX= -gfb62e642ae6 -PORTREVISION= 2 +DISTVERSION= 20.1-branchpoint-1495 +DISTVERSIONSUFFIX= -g8252bb0ec6d CATEGORIES= graphics PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= ee5c7790fa93.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= 9f52b5177728.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= cefdea8105bf.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= 55822330540d.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= f6c7569ad9ea.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= c7a2ab64144b.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= f3b7aba7ed39.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= 23df7d9971dd.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= ec60ac47860a.patch:-p1 PATCHFILES+= 807ae077ab19.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3568 PATCHFILES+= 1b10b42fe65e.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1619 PATCHFILES+= 9291544ca0bd.patch:-p1 PATCHFILES+= 700efacda59c.patch:-p1 PATCHFILES+= 227ebbd9e837.patch:-p1 PATCHFILES+= de60a36d5836.patch:-p1 PATCHFILES+= 614e5280165b.patch:-p1 PATCHFILES+= 15057d74fdb9.patch:-p1 PATCHFILES+= 4902067868ea.patch:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenGL, Vulkan) LICENSE= MIT ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 ONLY_FOR_ARCHS_REASON= Limited scope: no old drivers and no software rendering. \ See also https://mesamatrix.net/ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} LIB_DEPENDS= libdrm.so:graphics/libdrm \ libexpat.so:textproc/expat2 .if !exists(/usr/lib/libelf.so) # DragonFly doesn't install it yet LIB_DEPENDS+= libelf.so:devel/libelf .endif USES= bison compiler:c++11-lib meson pkgconfig python:3.6+,build shebangfix USE_GITHUB= yes GH_ACCOUNT= mesa3d USE_LDCONFIG= yes BINARY_ALIAS= python=${PYTHON_CMD} SHEBANG_FILES= src/vulkan/overlay-layer/${PORTNAME}-overlay-control.py PLATFORMS= ${PORT_OPTIONS:MX11:tl} ${PORT_OPTIONS:MWAYLAND:tl} drm surfaceless MESON_ARGS= -Dgallium-omx=disabled \ -Dgallium-opencl=disabled \ -Dgallium-xa=false \ -Dgallium-xvmc=false \ -Dplatforms=${PLATFORMS:ts,} \ ${PKGNAMESUFFIX:S/^/-Degl-lib-suffix=/} \ ${NULL} SUB_FILES= libmap.conf SUB_LIST= PKGNAMESUFFIX=${PKGNAMESUFFIX} PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} PKGNAMESUFFIX=${PKGNAMESUFFIX} .if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld # --build-id isn't supported by old GNU ld.bfd in base LDFLAGS+= -fuse-ld=lld .endif OPTIONS_DEFINE= ${OPTIONS_MULTI} LIBUNWIND LLVM VAAPI VDPAU WAYLAND X11 ZSTD OPTIONS_DEFAULT= ${OPTIONS_MULTI} LIBUNWIND LLVM VAAPI VDPAU WAYLAND X11 ZSTD OPTIONS_MULTI= DRI GALLIUM VULKAN OPTIONS_MULTI_DRI= i965 OPTIONS_MULTI_GALLIUM= iris r600 radeonsi OPTIONS_MULTI_VULKAN= anv radv OPTIONS_EXCLUDE_DragonFly= LIBUNWIND anv OPTIONS_EXCLUDE+= ${ARCH:Namd64:Ni386:C/.+/anv i965 iris/} OPTIONS_EXCLUDE+= ${ARCH:Naarch64:Namd64:Ni386:C/.+/LIBUNWIND/} OPTIONS_SUB= yes # Convert options to -D-drivers= .for i in ${OPTIONS_MULTI} MESON_ARGS+= -D${i:tl}-drivers=${${i}_DRIVERS:ts,} . for j in ${OPTIONS_MULTI_${i}} OPTIONS_DEFAULT+= ${j} ${j}_VARS+= ${i}_DRIVERS+=${j:S/anv/intel/:S/radv/amd/} . endfor .endfor DRI_DESC= Classic OpenGL drivers i965_DESC= GMA 3000 (Gen4) and newer GALLIUM_DESC= Unified OpenGL drivers iris_DESC= Broadwell and newer r600_DESC= R600, R700, Evergreen, Northern Islands radeonsi_DESC= Southern Islands and newer LIBUNWIND_DESC= Use libunwind for stacktraces LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind LIBUNWIND_MESON_ENABLED= libunwind LLVM_DESC= Build with LLVM support LLVM_LIB_DEPENDS= libLLVM-${LLVM_DEFAULT:C/^([6-9])0/\1/:S/-devel/11/}.so:devel/llvm${LLVM_DEFAULT} LLVM_MESON_ENABLED= llvm LLVM_BINARY_ALIAS= llvm-config=llvm-config${LLVM_DEFAULT} .for i in r600 radeonsi radv ${i}_IMPLIES+= LLVM .endfor VAAPI_BUILD_DEPENDS= libva>0:multimedia/libva VAAPI_MESON_ENABLED= gallium-va VDPAU_BUILD_DEPENDS= libvdpau>0:multimedia/libvdpau VDPAU_MESON_ENABLED= gallium-vdpau VULKAN_DESC= Vulkan drivers and layers VULKAN_BUILD_DEPENDS= glslangValidator:devel/glslang VULKAN_MESON_TRUE= vulkan-device-select-layer vulkan-overlay-layer anv_DESC= Haswell and newer radv_DESC= Southern Islands and newer WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-server.so:graphics/wayland X11_USES= xorg X11_USE= XORG=x11,xcb,xdamage,xext,xfixes,xorgproto,xrandr,xshmfence,xxf86vm X11_MESON_OFF= -Dglx=disabled ZSTD_DESC= Use ZSTD for shader cache ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_MESON_ENABLED= zstd post-patch: # Extract (snapshot) version from the port instead of empty string @${REINPLACE_CMD} '/MESA_GIT_SHA1/s/""/" (git-${DISTVERSIONSUFFIX:C/.*-g//})"/' \ ${WRKSRC}/bin/git_sha1_gen.py .if defined(PKGNAMESUFFIX) @${MV} ${WRKSRC}/src/egl/main/50_${PORTNAME}.json \ ${WRKSRC}/src/egl/main/50_${PKGBASE}.json @${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \ ${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf .endif post-install: .if defined(PKGNAMESUFFIX) @${INSTALL_DATA} ${WRKDIR}/libmap.conf \ ${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf.sample .endif .include Index: head/graphics/mesa-devel/distinfo =================================================================== --- head/graphics/mesa-devel/distinfo (revision 537859) +++ head/graphics/mesa-devel/distinfo (revision 537860) @@ -1,39 +1,39 @@ -TIMESTAMP = 1591037958 -SHA256 (mesa3d-mesa-20.1-branchpoint-1363-gfb62e642ae6_GH0.tar.gz) = 9bddd68cf92c8134070d857ee2bc2792feadd83d7259158f1e3ef00361884d50 -SIZE (mesa3d-mesa-20.1-branchpoint-1363-gfb62e642ae6_GH0.tar.gz) = 19830056 +TIMESTAMP = 1591225942 +SHA256 (mesa3d-mesa-20.1-branchpoint-1495-g8252bb0ec6d_GH0.tar.gz) = 161cf5a2c32874e1468c0449b9d5e168bd4196d88ecf097bf5e97548aee5020c +SIZE (mesa3d-mesa-20.1-branchpoint-1495-g8252bb0ec6d_GH0.tar.gz) = 19848752 SHA256 (ee5c7790fa93.patch) = 2bebf30e8dfc5d1b5d0c540f3fbbfd75b0876690be8e1ab3626cca0b69854b58 SIZE (ee5c7790fa93.patch) = 1653 SHA256 (9f52b5177728.patch) = d4f380b8872726b88c1aa75d0a9cb63adf79144a7c34da6b7fd525ea417d2b73 SIZE (9f52b5177728.patch) = 832 SHA256 (cefdea8105bf.patch) = caeb49b2a1a1b6685ad5757f6ff02b0b2eb8858a6113b830c516b33da2d2f3a1 SIZE (cefdea8105bf.patch) = 1731 SHA256 (55822330540d.patch) = fc776fee1d59f743a060ad1f78e1d9eba8826beb1fe7abef1734a407734b6109 SIZE (55822330540d.patch) = 1278 SHA256 (f6c7569ad9ea.patch) = 481784ca37e35549bf265e21eee1b9a29d2b0b8d3294de1d5b6b83a84f3d7a9b SIZE (f6c7569ad9ea.patch) = 1653 SHA256 (c7a2ab64144b.patch) = 6402bbbcc6f290374615b8ee50cd9587f2a6db89af4f3cf2331f700f98d61a13 SIZE (c7a2ab64144b.patch) = 2054 SHA256 (f3b7aba7ed39.patch) = de44136a4482b47cca0453ab93407d8e71e430b39ef7bb56c9ab9e54d11ee913 SIZE (f3b7aba7ed39.patch) = 1325 SHA256 (23df7d9971dd.patch) = b0516ae9018e7807d0267afa0c8e3fc807436f59433ce96ab62683343c96edc8 SIZE (23df7d9971dd.patch) = 1335 SHA256 (ec60ac47860a.patch) = 847c847888368eb5252aa3926ce100dc0fcf6b6bf05c7ee7efe2022f4629d204 SIZE (ec60ac47860a.patch) = 3647 SHA256 (807ae077ab19.patch) = 3b9fb7e75e4343a42667a249a0ee533110be9a6f113a4a3138d32de592d32bbc SIZE (807ae077ab19.patch) = 3514 SHA256 (1b10b42fe65e.patch) = f0aa9c049a43733fefff0edba4dcb322682fef4dc58d6affa41effcce7ed9eb3 SIZE (1b10b42fe65e.patch) = 11952 SHA256 (9291544ca0bd.patch) = e2b1c8a57aa6938fc3a6bda17b80846eefaae15539ff209210baac44a5882a36 SIZE (9291544ca0bd.patch) = 1489 SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5 SIZE (700efacda59c.patch) = 981 SHA256 (227ebbd9e837.patch) = 2321e198b85a3f936ee5f0545ebf560735ae2c1d56f0d0d5c42a969876f17202 SIZE (227ebbd9e837.patch) = 39765 SHA256 (de60a36d5836.patch) = aabe774d90cb41c8c0218abb9dec7d2efe6f7ab7b68750e307eb70c9e9e8377a SIZE (de60a36d5836.patch) = 2432 SHA256 (614e5280165b.patch) = a038bcec347b363cef8483960990c4a136d4a2fb01e92db1ab2c400d53418a33 SIZE (614e5280165b.patch) = 1936 SHA256 (15057d74fdb9.patch) = c307d2c1c09d7170fac9ead710543eec6cad6dc0b5fcf889437d8416a55d7cb4 SIZE (15057d74fdb9.patch) = 972 SHA256 (4902067868ea.patch) = af7efeeeea76c0ff456cb689a5387ef360d744e5801fc1cdde7d084d394895dd SIZE (4902067868ea.patch) = 1831 Index: head/graphics/mesa-devel/files/patch-suffix =================================================================== --- head/graphics/mesa-devel/files/patch-suffix (revision 537859) +++ head/graphics/mesa-devel/files/patch-suffix (revision 537860) @@ -1,179 +1,179 @@ Add library suffix to avoid conflict with mesa-libs + mesa-dri. Library selection is handled by libglvnd and/or libmap.conf. --- meson.build.orig 2020-05-30 21:28:01 UTC +++ meson.build @@ -79,7 +79,7 @@ with_imgui = with_intel_tools or with_vulkan_overlay_l dri_drivers_path = get_option('dri-drivers-path') if dri_drivers_path == '' - dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri') + dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri' + get_option('egl-lib-suffix')) endif dri_search_path = get_option('dri-search-path') if dri_search_path == '' @@ -427,9 +427,6 @@ if with_glvnd elif with_glx == 'disabled' and not with_egl error('glvnd requires DRI based GLX and/or EGL') endif - if get_option('egl-lib-suffix') != '' - error('''EGL lib suffix can't be used with libglvnd''') - endif endif if with_vulkan_icd_dir == '' @@ -491,7 +488,7 @@ if with_gallium_vdpau endif vdpau_drivers_path = get_option('vdpau-libs-path') if vdpau_drivers_path == '' - vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau') + vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau' + get_option('egl-lib-suffix')) endif if with_gallium_zink @@ -638,7 +635,7 @@ endif va_drivers_path = get_option('va-libs-path') if va_drivers_path == '' - va_drivers_path = join_paths(get_option('libdir'), 'dri') + va_drivers_path = join_paths(get_option('libdir'), 'dri' + get_option('egl-lib-suffix')) endif _xa = get_option('gallium-xa') ---- src/amd/vulkan/meson.build.orig 2020-05-30 21:28:01 UTC +--- src/amd/vulkan/meson.build.orig 2020-06-03 10:34:22 UTC +++ src/amd/vulkan/meson.build -@@ -158,7 +158,7 @@ if with_platform_android +@@ -149,7 +149,7 @@ if with_platform_android endif libvulkan_radeon = shared_library( - 'vulkan_radeon', + 'vulkan_radeon' + get_option('egl-lib-suffix'), - [libradv_files, radv_entrypoints, radv_extensions_c, amd_vk_format_table_c, sha1_h, radv_gfx10_format_table_h], + [libradv_files, radv_entrypoints, radv_extensions_c, amd_vk_format_table_c, sha1_h], include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util, inc_vulkan_wsi, --- src/egl/main/50_mesa.json.orig 2020-05-30 21:28:01 UTC +++ src/egl/main/50_mesa.json @@ -1,6 +1,6 @@ { "file_format_version" : "1.0.0", "ICD" : { - "library_path" : "libEGL_mesa.so.0" + "library_path" : "libEGL_mesa@0@.so.0".format(get_option('egl-lib-suffix')) } } --- src/egl/meson.build.orig 2020-05-30 21:28:01 UTC +++ src/egl/meson.build @@ -147,13 +147,13 @@ if not with_glvnd egl_lib_name = 'EGL' + get_option('egl-lib-suffix') egl_lib_version = '1.0.0' else - egl_lib_name = 'EGL_mesa' + egl_lib_name = 'EGL_mesa' + get_option('egl-lib-suffix') egl_lib_version = '0.0.0' deps_for_egl += dep_glvnd files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c] files_egl += files('main/eglglvnd.c', 'main/egldispatchstubs.c') install_data( - 'main/50_mesa.json', + 'main/50_mesa@0@.json'.format(get_option('egl-lib-suffix')), install_dir : join_paths(get_option('datadir'), 'glvnd', 'egl_vendor.d') ) endif --- src/gbm/backends/dri/gbm_dri.c.orig 2020-05-30 21:28:01 UTC +++ src/gbm/backends/dri/gbm_dri.c @@ -307,14 +307,6 @@ dri_bind_extensions(struct gbm_dri_device *dri, static const __DRIextension ** dri_open_driver(struct gbm_dri_device *dri) { - /* Temporarily work around dri driver libs that need symbols in libglapi - * but don't automatically link it in. - */ - /* XXX: Library name differs on per platforms basis. Update this as - * osx/cygwin/windows/bsd gets support for GBM.. - */ - dlopen("libglapi.so.0", RTLD_LAZY | RTLD_GLOBAL); - static const char *search_path_vars[] = { /* Read GBM_DRIVERS_PATH first for compatibility, but LIBGL_DRIVERS_PATH * is recommended over GBM_DRIVERS_PATH. --- src/gbm/meson.build.orig 2020-05-30 21:28:01 UTC +++ src/gbm/meson.build @@ -44,7 +44,7 @@ if with_platform_wayland endif libgbm = shared_library( - 'gbm', + 'gbm' + get_option('egl-lib-suffix'), files_gbm, include_directories : incs_gbm, c_args : [c_vis_args, args_gbm], --- src/glx/meson.build.orig 2020-05-30 21:28:01 UTC +++ src/glx/meson.build @@ -113,10 +113,10 @@ elif with_dri_platform == 'windows' endif if not with_glvnd - gl_lib_name = 'GL' + gl_lib_name = 'GL' + get_option('egl-lib-suffix') gl_lib_version = '1.2.0' else - gl_lib_name = 'GLX_mesa' + gl_lib_name = 'GLX_mesa' + get_option('egl-lib-suffix') gl_lib_version = '0.0.0' files_libglx += files( 'g_glxglvnddispatchfuncs.c', --- src/intel/vulkan/meson.build.orig 2020-05-30 21:28:01 UTC +++ src/intel/vulkan/meson.build @@ -188,7 +188,7 @@ libanv_common = static_library( ) libvulkan_intel = shared_library( - 'vulkan_intel', + 'vulkan_intel' + get_option('egl-lib-suffix'), [files('anv_gem.c'), anv_entrypoints[0], anv_extensions_h], include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi, --- src/mapi/es1api/meson.build.orig 2020-05-30 21:28:01 UTC +++ src/mapi/es1api/meson.build @@ -33,7 +33,7 @@ if with_platform_windows endif libglesv1_cm = shared_library( - 'GLESv1_CM' + get_option('gles-lib-suffix'), + 'GLESv1_CM' + get_option('egl-lib-suffix') + get_option('gles-lib-suffix'), ['../entry.c', es1_glapi_mapi_tmp_h], c_args : [ c_msvc_compat_args, --- src/mapi/es2api/meson.build.orig 2020-05-30 21:28:01 UTC +++ src/mapi/es2api/meson.build @@ -33,7 +33,7 @@ if with_platform_windows endif libgles2 = shared_library( - 'GLESv2' + get_option('gles-lib-suffix'), + 'GLESv2' + get_option('egl-lib-suffix') + get_option('gles-lib-suffix'), ['../entry.c', es2_glapi_mapi_tmp_h], c_args : [ c_msvc_compat_args, --- src/mapi/shared-glapi/meson.build.orig 2020-05-30 21:28:01 UTC +++ src/mapi/shared-glapi/meson.build @@ -42,7 +42,7 @@ if with_platform_windows endif libglapi = shared_library( - 'glapi', + 'glapi' + get_option('egl-lib-suffix'), [files_mapi_glapi, files_mapi_util, shared_glapi_mapi_tmp_h], c_args : [ _glapi_c_args, --- src/util/meson.build.orig 2020-05-30 21:28:01 UTC +++ src/util/meson.build @@ -122,7 +122,7 @@ files_mesa_util = files( 'xxhash.h', ) -files_drirc = files('00-mesa-defaults.conf') +files_drirc = files('00-mesa@0@-defaults.conf'.format(get_option('egl-lib-suffix'))) install_data(files_drirc, install_dir : join_paths(get_option('datadir'), 'drirc.d'))