Index: head/graphics/mesa-devel/Makefile =================================================================== --- head/graphics/mesa-devel/Makefile (revision 539305) +++ head/graphics/mesa-devel/Makefile (revision 539306) @@ -1,173 +1,175 @@ # $FreeBSD$ PORTNAME= mesa -DISTVERSION= 20.1-branchpoint-1696 -DISTVERSIONSUFFIX= -g67ad75a282d +DISTVERSION= 20.1-branchpoint-1896 +DISTVERSIONSUFFIX= -g25a629558ca 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 +PATCHFILES+= e86eead1255e.patch:-p1 +PATCHFILES+= ee6635dea86a.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5463 +PATCHFILES+= 525b0ed4974f.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5463 +PATCHFILES+= 7b643e935870.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5462 +PATCHFILES+= 91c69ccd11e6.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5461 +PATCHFILES+= b0314147a92b.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5460 +PATCHFILES+= ba91764bc737.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5464 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=disabled \ -Dgallium-xvmc=disabled \ -Dplatforms=${PLATFORMS:ts,} \ ${BINARY_ALIAS:D--native-file=binary_alias.ini} \ ${NULL} PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} .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 NLS 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_EXCLUDE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"==${.CURDIR:T}:?COINST:} OPTIONS_EXCLUDE+= ${"${GL_DEFAULT:S/,/ /g:[1]}"!=libglvnd:?GLVND:} OPTIONS_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:} OPTIONS_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[1]}"==libglvnd:?GLVND:} 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 COINST_DESC= Allow co-installation with another Mesa port COINST_MESON_ON= -Degl-lib-suffix=${PKGNAMESUFFIX} COINST_PLIST_SUB= SUFFIX=${PKGNAMESUFFIX} COINST_SUB_FILES= libmap.conf COINST_SUB_LIST= SUFFIX=${PKGNAMESUFFIX} COINST_PLIST_SUB_OFF= SUFFIX= GLVND_DESC= GL Vendor-Neutral Dispatch support GLVND_BUILD_DEPENDS= libglvnd>0:graphics/libglvnd GLVND_MESON_TRUE= glvnd 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 NLS_USES= gettext-tools 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-extract: # Work around Meson lookup order e.g., llvm-config .if defined(BINARY_ALIAS) @${ECHO_CMD} '[binaries]' >${WRKSRC}/binary_alias.ini @for f in ${BINARY_ALIAS}; do \ ${ECHO_CMD} "$${f%%=*} = '$${f#*=}'"; \ done >>${WRKSRC}/binary_alias.ini .endif 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 post-patch-COINST-on: @${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \ ${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf pre-build-NLS-on: # Meson doesn't automatically generate translations @${DO_MAKE_BUILD} -C ${BUILD_WRKSRC} xmlpool-gmo post-install-COINST-on: @${INSTALL_DATA} ${WRKDIR}/libmap.conf \ ${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf.sample .include Index: head/graphics/mesa-devel/distinfo =================================================================== --- head/graphics/mesa-devel/distinfo (revision 539305) +++ head/graphics/mesa-devel/distinfo (revision 539306) @@ -1,39 +1,43 @@ -TIMESTAMP = 1591828028 -SHA256 (mesa3d-mesa-20.1-branchpoint-1696-g67ad75a282d_GH0.tar.gz) = 65ced088d19fb8bd0e73cf96aaa58a382477a13963e81b4f935e6a01b992ea47 -SIZE (mesa3d-mesa-20.1-branchpoint-1696-g67ad75a282d_GH0.tar.gz) = 19928167 +TIMESTAMP = 1592216963 +SHA256 (mesa3d-mesa-20.1-branchpoint-1896-g25a629558ca_GH0.tar.gz) = 20029dae4ff615d65551459e45914264c30c8acffc5dd42d6e60019ea55fe804 +SIZE (mesa3d-mesa-20.1-branchpoint-1896-g25a629558ca_GH0.tar.gz) = 19908273 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 +SHA256 (e86eead1255e.patch) = abf351ec2ed6c86f15db62addbd8c225eb7c58da018c1d3e83956b21124e8fd9 +SIZE (e86eead1255e.patch) = 39437 +SHA256 (ee6635dea86a.patch) = 57aa49634bb4dae81aaf34b52b6676692a19bdbe325f6bd32124841a9f3292e9 +SIZE (ee6635dea86a.patch) = 4030 +SHA256 (525b0ed4974f.patch) = 33819aa080deb968883ae6da1bf3b0687ad8ef287fe5fd3414afdd71a52f3c22 +SIZE (525b0ed4974f.patch) = 1658 +SHA256 (7b643e935870.patch) = b6c9d6f61b2e3c55fdeadec145f0148eeb1b94c0a332a225af8ea99edf425656 +SIZE (7b643e935870.patch) = 1936 +SHA256 (91c69ccd11e6.patch) = 7618abeda1774968caeccbf7f4d0ffe10519b9648ef0b584e5b4b53699c72136 +SIZE (91c69ccd11e6.patch) = 995 +SHA256 (b0314147a92b.patch) = c64f27777e5473783d7d25258721227e8c90c78bd067d76df2f5c4995b65a990 +SIZE (b0314147a92b.patch) = 1831 +SHA256 (ba91764bc737.patch) = 2b8535842a8d41017fc5a9f8137b3c1ff886334b5fa1d698e61a78d4cbe7768a +SIZE (ba91764bc737.patch) = 2568 Index: head/graphics/mesa-devel/files/patch-i386 =================================================================== --- head/graphics/mesa-devel/files/patch-i386 (revision 539305) +++ head/graphics/mesa-devel/files/patch-i386 (nonexistent) @@ -1,53 +0,0 @@ -FreeBSD doesn't ship libatomic for Clang to use, so use __sync* atomics. -https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230888 - -Checking if "GCC atomic builtins" compiles: YES -Checking if "GCC atomic builtins required -latomic" links: NO - -meson.build:1098:4: ERROR: C library 'atomic' not found - -ld.lld: error: undefined symbol: __atomic_load_8 ->>> referenced by testfile.c ->>> /tmp/testfile-055958.o:(main) - -ld.lld: error: undefined symbol: __atomic_fetch_add_8 ->>> referenced by testfile.c ->>> /tmp/testfile-055958.o:(main) -cc: error: linker command failed with exit code 1 (use -v to see invocation) - ---- meson.build.orig 2020-05-30 21:28:01 UTC -+++ meson.build -@@ -1068,7 +1068,7 @@ endif - # Check for GCC style atomics - dep_atomic = null_dep - --if cc.compiles('''#include -+if cc.links('''#include - int main() { - struct { - uint64_t *v; -@@ -1079,24 +1079,6 @@ if cc.compiles('''#include - }''', - name : 'GCC atomic builtins') - pre_args += '-DUSE_GCC_ATOMIC_BUILTINS' -- -- # Not all atomic calls can be turned into lock-free instructions, in which -- # GCC will make calls into the libatomic library. Check whether we need to -- # link with -latomic. -- # -- # This can happen for 64-bit atomic operations on 32-bit architectures such -- # as ARM. -- if not cc.links('''#include -- int main() { -- struct { -- uint64_t *v; -- } x; -- return (int)__atomic_load_n(x.v, __ATOMIC_ACQUIRE) & -- (int)__atomic_add_fetch(x.v, (uint64_t)1, __ATOMIC_ACQ_REL); -- }''', -- name : 'GCC atomic builtins required -latomic') -- dep_atomic = cc.find_library('atomic') -- endif - endif - if not cc.links('''#include - uint64_t v; Property changes on: head/graphics/mesa-devel/files/patch-i386 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property