diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index b7934a2fe29d..573345a3552a 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -1,100 +1,100 @@ # Makefile.common - shared code between MesaLib ports. # # !!! Here be dragons !!! (they seem to be everywhere these days) # # Remember to upgrade the following ports everytime you bump MESAVERSION: # # - graphics/libosmesa # - graphics/mesa-dri # - graphics/mesa-libs # - lang/clover MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} -MESABASEVERSION= 23.3.2 +MESABASEVERSION= 23.3.3 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= MASTER_SITES= https://mesa.freedesktop.org/archive/ \ https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \ ftp://ftp.freedesktop.org/pub/mesa/ \ ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX} PATCH_SITES= https://gitlab.freedesktop.org/mesa/mesa/-/commit/ PATCHFILES+= 4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26284 MAINTAINER= x11@FreeBSD.org LICENSE= MIT LICENSE_FILE= ${WRKSRC}/docs/license.rst COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} LIB_DEPENDS+= libexpat.so:textproc/expat2 .if ${COMPONENT} != clover .if ${PORT_OPTIONS:MPLATFORM_X11} USES+= xorg .endif .endif .if ${COMPONENT} != osmesa LIB_DEPENDS+= libdrm.so:graphics/libdrm .endif USES+= compiler:c++11-lib bison meson pathfix pkgconfig \ python:build shebangfix tar:xz .if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld # --build-id isn't supported by old GNU ld.bfd in base # Also ld.bfd have problems that seems related to --as-needed USE_BINUTILS= yes LDFLAGS+= -B${LOCALBASE}/bin .endif # only have one port to check with portscout. .if ${PORTNAME} != mesa-dri PORTSCOUT= ignore:1 .endif python_OLD_CMD= /usr/bin/env[[:space:]]python2 /usr/bin/python2 /bin/env[[:space:]]python SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ src/gallium/drivers/svga/svgadump/svga_dump.py \ src/mapi/glapi/gen/*.py src/mapi/mapi_abi.py \ src/mesa/main/get_*.py src/util/format_srgb.py \ src/amd/*/*.py src/intel/genxml/gen_pack_header.py MASTERDIR= ${.CURDIR:H:H}/graphics/mesa-dri PATCHDIR= ${MASTERDIR}/files WRKSRC= ${WRKDIR}/mesa-${MESADISTVERSION} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist PKGHELP= ${.CURDIR}/pkg-help PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall .include BINARY_ALIAS+= python3=${PYTHON_VERSION} CONFIGURE_ENV+= LLVM_CONFIG=${LLVM_CONFIG} # Deal with unclean env if the user have elfutils installed # and build the port directly without poudriere .if exists(${LOCALBASE}/include/libelf.h) LIB_DEPENDS+= libelf.so:devel/elfutils MESON_ARGS+= -Dlibelf=enabled .else MESON_ARGS+= -Dlibelf=disabled .endif # Some symbols in mesa's linker version scripts are not always defined, # depending on configuration options. Suppress errors with lld >= 17 due to # these undefined symbols. LDFLAGS+= -Wl,--undefined-version LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_VERSION}/lib MESON_ARGS+= -Dllvm=enabled \ -Dlibunwind=disabled diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo index b207480523cf..040858398f5e 100644 --- a/graphics/mesa-dri/distinfo +++ b/graphics/mesa-dri/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1703745161 -SHA256 (mesa-23.3.2.tar.xz) = 3cfcb81fa16f89c56abe3855d2637d396ee4e03849b659000a6b8e5f57e69adc -SIZE (mesa-23.3.2.tar.xz) = 19365140 +TIMESTAMP = 1704956578 +SHA256 (mesa-23.3.3.tar.xz) = 518307c0057fa3cee8b58df78be431d4df5aafa7edc60d09278b2d7a0a80f3b4 +SIZE (mesa-23.3.3.tar.xz) = 19379484 SHA256 (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 84f18f14788bd8f387e2fc754b945bf30f84b517dd917785ed5d8ef1d594e24a SIZE (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 1626 diff --git a/graphics/mesa-dri/files/patch-src_gallium_drivers_zink_zink__screen.c b/graphics/mesa-dri/files/patch-src_gallium_drivers_zink_zink__screen.c deleted file mode 100644 index 2bb9b9119097..000000000000 --- a/graphics/mesa-dri/files/patch-src_gallium_drivers_zink_zink__screen.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/gallium/drivers/zink/zink_screen.c.orig 2023-12-01 14:18:25 UTC -+++ src/gallium/drivers/zink/zink_screen.c -@@ -55,7 +55,9 @@ - #include - #include - #include -+#if DETECT_OS_LINUX - #include -+#endif - #endif - - static int num_screens = 0;