Date: Tue, 30 Apr 2024 06:12:00 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bb4092f4014b - main - graphics/mesa-demos: Update to 8.5.0 Message-ID: <202404300612.43U6C0CX069589@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb4092f4014ba2316009af630f588b8289ef841e commit bb4092f4014ba2316009af630f588b8289ef841e Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2024-04-26 08:01:33 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2024-04-30 06:11:33 +0000 graphics/mesa-demos: Update to 8.5.0 While here switch to meson Differential Revision: https://reviews.freebsd.org/D44969 Sponsored by: Beckhoff Automation GmbH & Co. KG --- graphics/mesa-demos/Makefile | 19 +++++++++++-------- graphics/mesa-demos/distinfo | 6 +++--- .../mesa-demos/files/patch-src_egl_opengl_eglkms.c | 16 ---------------- graphics/mesa-demos/files/patch-src_tests_texdown.c | 14 -------------- 4 files changed, 14 insertions(+), 41 deletions(-) diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile index d962a34339b6..5c3ff5932655 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -1,8 +1,8 @@ PORTNAME= mesa-demos -PORTVERSION= 8.4.0 -PORTREVISION= 4 +PORTVERSION= 8.5.0 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/ #${PORTVERSION}/ +MASTER_SITES= https://mesa.freedesktop.org/archive/demos/${PORTVERSION}/ \ + ftp://ftp.freedesktop.org/pub/mesa/demos/ #${PORTVERSION}/ MAINTAINER= x11@FreeBSD.org COMMENT= OpenGL demos distributed with Mesa @@ -12,13 +12,16 @@ LICENSE= MIT CONFLICTS_INSTALL= glx-utils -USES= gmake gl localbase pkgconfig tar:bzip2 xorg -GNU_CONFIGURE= yes -USE_GL= egl gl glesv2 glew glu glut +USES= gl localbase meson pkgconfig tar:bzip2 xorg +USE_GL= egl gl glesv2 glu glut USE_XORG= xorgproto x11 xdamage xext xfixes xi xxf86vm -CONFIGURE_ARGS+=--disable-gles1 --disable-osmesa --disable-vg --disable-wayland \ - --with-system-data-files +MESON_ARGS+= -Dwith-glut=${LOCALBASE} \ + -Dgles1=disabled \ + -Dlibdrm=disabled \ + -Dosmesa=disabled \ + -Dwayland=disabled \ + -Dwith-system-data-files=true .include <bsd.port.options.mk> diff --git a/graphics/mesa-demos/distinfo b/graphics/mesa-demos/distinfo index a26c7840680d..5bf8f1579b41 100644 --- a/graphics/mesa-demos/distinfo +++ b/graphics/mesa-demos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519375835 -SHA256 (mesa-demos-8.4.0.tar.bz2) = 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d -SIZE (mesa-demos-8.4.0.tar.bz2) = 10073259 +TIMESTAMP = 1714117397 +SHA256 (mesa-demos-8.5.0.tar.bz2) = cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1 +SIZE (mesa-demos-8.5.0.tar.bz2) = 10367517 diff --git a/graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c b/graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c deleted file mode 100644 index 5f9f35dd4c8f..000000000000 --- a/graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c +++ /dev/null @@ -1,16 +0,0 @@ -# Fix an uninitialized variable in a particular execution path -# -# While it would be better design to initialize the error value -# at the start, it is set in every other error path so the least -# intrusive correction is to set it in the one missed path. -# ---- src/egl/opengl/eglkms.c.orig 2012-08-28 14:31:17 UTC -+++ src/egl/opengl/eglkms.c -@@ -212,6 +212,7 @@ int main(int argc, char *argv[]) - - if (!eglChooseConfig(dpy, attribs, &config, 1, &n) || n != 1) { - fprintf(stderr, "failed to choose argb config\n"); -+ ret = -1; - goto egl_terminate; - } - diff --git a/graphics/mesa-demos/files/patch-src_tests_texdown.c b/graphics/mesa-demos/files/patch-src_tests_texdown.c deleted file mode 100644 index 01f325a66cea..000000000000 --- a/graphics/mesa-demos/files/patch-src_tests_texdown.c +++ /dev/null @@ -1,14 +0,0 @@ -# aligned_alloc() is in <stdlib.h>, so only _aligned_malloc() needs <malloc.h> -# ---- src/tests/texdown.c.orig 2018-02-23 08:50:21 UTC -+++ src/tests/texdown.c -@@ -34,7 +34,9 @@ - - #include <stdio.h> - #include <stdlib.h> -+#ifdef _WIN32 - #include <malloc.h> -+#endif - #include <math.h> - #include <GL/glew.h> - #include "glut_wrap.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404300612.43U6C0CX069589>