summaryrefslogtreecommitdiff
path: root/graphics/mesa-demos/files/patch-src-glsl-Makefile.am
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2024-04-26 09:15:48 +0200
committerEmmanuel Vadot <manu@FreeBSD.org>2024-04-30 08:11:33 +0200
commitc0e16d7d00d6525d9df7ee59c976d97b86b38015 (patch)
treefb79dd1e3d88acf1109de415e481135420e1144e /graphics/mesa-demos/files/patch-src-glsl-Makefile.am
parentx11/libxkbcommon: Update 1.7.0 (diff)
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
Diffstat (limited to '')
-rw-r--r--graphics/mesa-demos/files/patch-src-glsl-Makefile.am22
1 files changed, 0 insertions, 22 deletions
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