From nobody Tue Apr 30 06:11:57 2024 X-Original-To: dev-commits-ports-all@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 4VT8wt1KxWz5JHYG; Tue, 30 Apr 2024 06:11:58 +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 4VT8ws6BGZz55GM; Tue, 30 Apr 2024 06:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714457517; 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=a6IPPsizknQykPo6mcxMQAy2nhpyUKgl8cjUc6g6xkE=; b=dQvv0Ie9eHH2doPfyvZ53aaGyKqiFvneL2NQXCPnhuN8VdsHLgQlRF3lIc6tKw+2Rzxbb1 TTYZcXSCF82LBThg7U4y/f9YO22Dw+e0QX0b3C37+ervr4MBcf4BRTLLxVE2Xrbjn+ugVK wLrRdRlRLSJMkwFTrOBigKwIGxsZxElEUyoYaCZT7yqSFHAFlv8lNYmIGYdjcvc5aPvifN iakIYLvFZR1AFS97/qlwmx6aN1Hb3KKqXoPnofvchjCiqp+PCw8OozNkuYZFZE1zhWQDgg j5QretcTkLONVrcnLLSgX+mvrifELGHvsr18njAeBlDoW1tWSvlvb0lxXB3d8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714457517; a=rsa-sha256; cv=none; b=btCJJhlZMOq0ntOMVN6wd1H8de27XSHkSxkpClDs8hhijI9F/EBgXdKIFsJRmUwuYabVk/ 7Pkp1+rBjt8BIq/2z16rvv3N0TZSrkuWVueXDYYg7IVre1LMhsqdp++NFYNpAtuTafDNeh FEIyR7JkMErasRNLE+IqZOSPmg0v1n0fjggPVWKs/T0UOZEmekvNMEX++YigAyBcU6Movr HlmiknIZEyUcF1Tp70uqA+WLmAUCenpaNePs8MhpV2z4zEGl8+MfLxQC4zpM36KQtBWXUG PzPzYMe4ZSPRmkkYHUvi92PxtBImYHCXhReZUhMVGQGtREu9PQmA8vCxOrgx+w== 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=1714457517; 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=a6IPPsizknQykPo6mcxMQAy2nhpyUKgl8cjUc6g6xkE=; b=xG3IbsjElcT9MhnV6IFk5TTK5US6avlb5h9u/PeDcmQs/w0fOPtiLtPfLpcwMYLvTDKepX 2EVfVsSGr9ErOObEOqNTBZn+je69vyOC/b3aULvZTn+VM8lm28Yujr948O65bLnGLer4oa TX8YksqOAwq3gh2kriwZj3CrGXYbobcqboMkEResZ9B7BpHVrwJdFcO0mPEScgsosxriy3 yVLL9dl0pCiq9zhee9CU90Rbe4YoiCW6m8n1XWRmohX9G2EMiC/tSq5uQtV4HtWnqToa7I +1L7PAdjsNqUI3ASnRwVQU7fKIBWAVuQ6Qs6hjxVfosDYnzqjMwfaSST59sGFg== 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 4VT8ws5nLxzNxq; Tue, 30 Apr 2024 06:11:57 +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 43U6BvY4069492; Tue, 30 Apr 2024 06:11:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U6BvWw069489; Tue, 30 Apr 2024 06:11:57 GMT (envelope-from git) Date: Tue, 30 Apr 2024 06:11:57 GMT Message-Id: <202404300611.43U6BvWw069489@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: c0e16d7d00d6 - main - graphics/mesa-demos: Drop patch to rename bitmap to bitmap_demo List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: c0e16d7d00d6525d9df7ee59c976d97b86b38015 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0e16d7d00d6525d9df7ee59c976d97b86b38015 commit c0e16d7d00d6525d9df7ee59c976d97b86b38015 Author: Emmanuel Vadot AuthorDate: 2024-04-26 07:15:48 +0000 Commit: Emmanuel Vadot CommitDate: 2024-04-30 06:11:33 +0000 graphics/mesa-demos: Drop patch to rename bitmap to bitmap_demo mesa-demos provides a bitmap program that conflict with x11/bitmap. Instead of patching the makefiles just rename the binary in post-stage. Differential Revision: https://reviews.freebsd.org/D44967 Sponsored by: Beckhoff Automation GmbH & Co.KG --- graphics/mesa-demos/Makefile | 4 ++ .../mesa-demos/files/patch-src-glsl-Makefile.am | 22 ---------- .../mesa-demos/files/patch-src-glsl-Makefile.in | 48 ---------------------- 3 files changed, 4 insertions(+), 70 deletions(-) diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile index f8a8bb89904e..1bed87600e15 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -28,4 +28,8 @@ CONFIGURE_ARGS+=--disable-gles1 --disable-osmesa --disable-vg --disable-wayland CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif +post-stage: + # bitmap program conflicts with x11/bitmap + ${MV} ${STAGEDIR}/${PREFIX}/bin/bitmap ${STAGEDIR}/${PREFIX}/bin/bitmap_demo + .include diff --git a/graphics/mesa-demos/files/patch-src-glsl-Makefile.am b/graphics/mesa-demos/files/patch-src-glsl-Makefile.am deleted file mode 100644 index 0e78b3a233d5..000000000000 --- a/graphics/mesa-demos/files/patch-src-glsl-Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# Prevent conflict with x11/bitmap -# ---- src/glsl/Makefile.am.orig 2014-03-22 12:59:24 UTC -+++ src/glsl/Makefile.am -@@ -38,7 +38,7 @@ if HAVE_GLUT - bin_PROGRAMS = \ - array \ - bezier \ -- bitmap \ -+ bitmap-demo \ - brick \ - bump \ - blinking-teapot \ -@@ -83,7 +83,7 @@ samplers_array_SOURCES = samplers.c - samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY - - array_LDADD = ../util/libutil.la --bitmap_LDADD = ../util/libutil.la -+bitmap_demo_LDADD = ../util/libutil.la - bezier_LDADD = ../util/libutil.la - brick_LDADD = ../util/libutil.la - bump_LDADD = ../util/libutil.la diff --git a/graphics/mesa-demos/files/patch-src-glsl-Makefile.in b/graphics/mesa-demos/files/patch-src-glsl-Makefile.in deleted file mode 100644 index f56b47d5e732..000000000000 --- a/graphics/mesa-demos/files/patch-src-glsl-Makefile.in +++ /dev/null @@ -1,48 +0,0 @@ -# Prevent conflict with x11/bitmap -# ---- src/glsl/Makefile.in.orig 2015-12-09 21:24:01 UTC -+++ src/glsl/Makefile.in -@@ -113,7 +113,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - @HAVE_GLUT_TRUE@bin_PROGRAMS = array$(EXEEXT) bezier$(EXEEXT) \ --@HAVE_GLUT_TRUE@ bitmap$(EXEEXT) brick$(EXEEXT) bump$(EXEEXT) \ -+@HAVE_GLUT_TRUE@ bitmap_demo$(EXEEXT) brick$(EXEEXT) bump$(EXEEXT) \ - @HAVE_GLUT_TRUE@ blinking-teapot$(EXEEXT) convolutions$(EXEEXT) \ - @HAVE_GLUT_TRUE@ deriv$(EXEEXT) fragcoord$(EXEEXT) \ - @HAVE_GLUT_TRUE@ fsraytrace$(EXEEXT) \ -@@ -158,9 +158,9 @@ am__v_lt_1 = - bezier_SOURCES = bezier.c - bezier_OBJECTS = bezier.$(OBJEXT) - bezier_DEPENDENCIES = ../util/libutil.la --bitmap_SOURCES = bitmap.c --bitmap_OBJECTS = bitmap.$(OBJEXT) --bitmap_DEPENDENCIES = ../util/libutil.la -+bitmap_demo_SOURCES = bitmap.c -+bitmap_demo_OBJECTS = bitmap.$(OBJEXT) -+bitmap_demo_DEPENDENCIES = ../util/libutil.la - blinking_teapot_SOURCES = blinking-teapot.c - blinking_teapot_OBJECTS = blinking-teapot.$(OBJEXT) - blinking_teapot_DEPENDENCIES = ../util/libutil.la -@@ -546,7 +546,7 @@ gsraytrace_SOURCES = gsraytrace.cpp - samplers_array_SOURCES = samplers.c - samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY - array_LDADD = ../util/libutil.la --bitmap_LDADD = ../util/libutil.la -+bitmap_demo_LDADD = ../util/libutil.la - bezier_LDADD = ../util/libutil.la - brick_LDADD = ../util/libutil.la - bump_LDADD = ../util/libutil.la -@@ -694,9 +694,9 @@ bezier$(EXEEXT): $(bezier_OBJECTS) $(bez - @rm -f bezier$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(bezier_OBJECTS) $(bezier_LDADD) $(LIBS) - --bitmap$(EXEEXT): $(bitmap_OBJECTS) $(bitmap_DEPENDENCIES) $(EXTRA_bitmap_DEPENDENCIES) -- @rm -f bitmap$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(bitmap_OBJECTS) $(bitmap_LDADD) $(LIBS) -+bitmap_demo$(EXEEXT): $(bitmap_demo_OBJECTS) $(bitmap_demo_DEPENDENCIES) $(EXTRA_bitmap_demo_DEPENDENCIES) -+ @rm -f bitmap_demo$(EXEEXT) -+ $(AM_V_CCLD)$(LINK) $(bitmap_demo_OBJECTS) $(bitmap_demo_LDADD) $(LIBS) - - blinking-teapot$(EXEEXT): $(blinking_teapot_OBJECTS) $(blinking_teapot_DEPENDENCIES) $(EXTRA_blinking_teapot_DEPENDENCIES) - @rm -f blinking-teapot$(EXEEXT)