Date: Tue, 30 Apr 2024 06:11:57 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: c0e16d7d00d6 - main - graphics/mesa-demos: Drop patch to rename bitmap to bitmap_demo Message-ID: <202404300611.43U6BvWw069489@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=c0e16d7d00d6525d9df7ee59c976d97b86b38015 commit c0e16d7d00d6525d9df7ee59c976d97b86b38015 Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2024-04-26 07:15:48 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> 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 <bsd.port.mk> 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404300611.43U6BvWw069489>