From nobody Tue Apr 30 06:12:00 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VT8ww4FHSz5JHk5; Tue, 30 Apr 2024 06:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VT8ww1bpwz556m; Tue, 30 Apr 2024 06:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714457520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yIO/P6o086yWs5GfojvmMlMm+pvfvurUgAW+J4x+LtM=; b=JU6jmOMvc+nzU8Y5h/OUBAIgXuMf8KQRQ9VzNebnbEQ8soGnDJ5Tpe4/AGCuu+cpaFIHsM C2AcKAxKEJg4fym9ZvSWD2J3Kxc+ibudVrnphCc81hf92pIo/gEyD8jehX+RxCvIuNlyE4 mP19wA4jpxN7yw2rkNivYmgP2VAdaEI0VuAjgUm6RyJ5ry1OibqUeZIuYvmu7luYMEfi30 flU7SESBaEELynwfK+pMn0CvMeZnU4jnsUTZj21fe103oRi6B82KJU1m320VH7iBNo/imH IjAu7Qf/I/YTix9Wi4yla70PwlGvjQ18lWwEHxZOWv20QA9ObwZZzCS47K94LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714457520; a=rsa-sha256; cv=none; b=AIzh/N+xBtM+lq8UVvHh5UqtU5QbP+7G/3xUlSRMaxoUSUYoDUa4W2Cenfpc2+V68dOBNf TR9LdicssHiJcp6fGapIw6dPyjHKRs65xJYmCULhh8Ek3GqOBt6uXV+oNZxUq7HBMQVgaJ Elugz1jUhrvbVuQXbJ3iolDWgc6lBhBrGswoDGP799ilbwwZCWHpo0fi4wpA1sUNa1DcfW 1QaH+dlP20cwMRcGAME5sj63o+dA4e/2znLk+BU5wGutf1EMwINJBSgjjKxWV8HJDme7+j y+gLihAz7a2sgvT/wnvLmTWt9LRa4FNSKTwdy3COcJY5ZSNMZjA778UMZO/3hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714457520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yIO/P6o086yWs5GfojvmMlMm+pvfvurUgAW+J4x+LtM=; b=vLajrg0KWbDcmn4AmtZUNllM3ZE68L8B/27scaRasbHif+ERb9Dr8fWjVf7febUp6vVi1n 8kLf4BRQ3JpefgtpKVSoZuNWrFry2N1E6U+mVLvCYIN0u2emwevSXFb+M4EBytBhkKQMat GBwPaWkre30TxayKo2GO5938eFiN7irfqGobUBB7m8zyPB911uOmWzdxZH7ryx7F8LoD3M 3zN8eu8TiS9G8eTp1i+t+jgRcAvWMj/5+WI5Lt6ZL/HaxlIqFfHfxHmT3fjMUIC7u6Fz6e Ol5mesqeyBkjreuedsTJy4ZkfhsA+phBlEWvQRONzzIBP7dlXdJ1rcjMhcsopQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VT8ww17hczNmX; Tue, 30 Apr 2024 06:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43U6C0oK069592; Tue, 30 Apr 2024 06:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U6C0CX069589; Tue, 30 Apr 2024 06:12:00 GMT (envelope-from git) Date: Tue, 30 Apr 2024 06:12:00 GMT Message-Id: <202404300612.43U6C0CX069589@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: bb4092f4014b - main - graphics/mesa-demos: Update to 8.5.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb4092f4014ba2316009af630f588b8289ef841e Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb4092f4014ba2316009af630f588b8289ef841e commit bb4092f4014ba2316009af630f588b8289ef841e Author: Emmanuel Vadot AuthorDate: 2024-04-26 08:01:33 +0000 Commit: Emmanuel Vadot 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 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 , so only _aligned_malloc() needs -# ---- src/tests/texdown.c.orig 2018-02-23 08:50:21 UTC -+++ src/tests/texdown.c -@@ -34,7 +34,9 @@ - - #include - #include -+#ifdef _WIN32 - #include -+#endif - #include - #include - #include "glut_wrap.h"