aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2007-07-03 00:54:02 +0800
committerjkim <jkim@FreeBSD.org>2007-07-03 00:54:02 +0800
commit8ffc4d4c4f7ed471c85a6d98abd8e6d1c336d133 (patch)
treea2ddb7a2c699d02307cfd5526256ec77027a55e0
parentd5ae0149c4eddb39b522f994f22800f1119f7286 (diff)
downloadfreebsd-ports-graphics-8ffc4d4c4f7ed471c85a6d98abd8e6d1c336d133.tar.gz
freebsd-ports-graphics-8ffc4d4c4f7ed471c85a6d98abd8e6d1c336d133.tar.zst
freebsd-ports-graphics-8ffc4d4c4f7ed471c85a6d98abd8e6d1c336d133.zip
- Update to 7.0.
- Patch data file paths in progs/xdemos, not just progs/demos as yuvrect_client demo needs it. - Add a patch for glthreads.c to fix a warning on amd64. Approved by: araujo (maintainer)
-rw-r--r--graphics/mesa-demos/Makefile5
-rw-r--r--graphics/mesa-demos/distinfo12
-rw-r--r--graphics/mesa-demos/files/patch-progs-xdemos-glthreads.c11
3 files changed, 19 insertions, 9 deletions
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index d92364f3cc3..42d3d8590d0 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= demos
-PORTVERSION= 6.5.3
-PORTREVISION= 2
+PORTVERSION= 7.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mesa3d/
@@ -69,7 +68,7 @@ post-extract:
-e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \
-e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \
-e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \
- ${WRKSRC}/progs/demos/*.c
+ ${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c
do-install:
@for prog in ${DEMO_PROGS}; do \
diff --git a/graphics/mesa-demos/distinfo b/graphics/mesa-demos/distinfo
index 2795e779a94..3abbad5c43c 100644
--- a/graphics/mesa-demos/distinfo
+++ b/graphics/mesa-demos/distinfo
@@ -1,6 +1,6 @@
-MD5 (MesaDemos-6.5.3.tar.bz2) = 8af91773ab2653fe537499676b05f2e8
-SHA256 (MesaDemos-6.5.3.tar.bz2) = 186169c1875367a76a5e45a269ba3f35dcba7f699cbc7bfc009b308bce7d5e79
-SIZE (MesaDemos-6.5.3.tar.bz2) = 1339115
-MD5 (MesaLib-6.5.3.tar.bz2) = 46359457147c469745f24b5074a186f0
-SHA256 (MesaLib-6.5.3.tar.bz2) = f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3
-SIZE (MesaLib-6.5.3.tar.bz2) = 3351899
+MD5 (MesaDemos-7.0.tar.bz2) = fada2bc1f29da513e015fda1e3abd0c0
+SHA256 (MesaDemos-7.0.tar.bz2) = d674154aad2cde9c1fd5bf6931196f5ff13832efc69313bd8931efcde3df8db7
+SIZE (MesaDemos-7.0.tar.bz2) = 1334310
+MD5 (MesaLib-7.0.tar.bz2) = 50c371455fa7532c04aa0a970f9bc51f
+SHA256 (MesaLib-7.0.tar.bz2) = dc4dcd24712c4bdafc430f281e7200b9b7d9a6de1995223275def1d1bf012c08
+SIZE (MesaLib-7.0.tar.bz2) = 3366124
diff --git a/graphics/mesa-demos/files/patch-progs-xdemos-glthreads.c b/graphics/mesa-demos/files/patch-progs-xdemos-glthreads.c
new file mode 100644
index 00000000000..8bea8396ada
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-progs-xdemos-glthreads.c
@@ -0,0 +1,11 @@
+--- progs/xdemos/glthreads.c.orig Fri May 18 20:28:57 2007
++++ progs/xdemos/glthreads.c Fri May 18 20:32:37 2007
+@@ -505,7 +505,7 @@
+ for (i = 0; i < numThreads; i++) {
+ pthread_create(&WinThreads[i].Thread, NULL, thread_function,
+ (void*) &WinThreads[i]);
+- printf("glthreads: Created thread %u\n", (unsigned int) WinThreads[i].Thread);
++ printf("glthreads: Created thread %lu\n", (unsigned long) WinThreads[i].Thread);
+ }
+
+ if (MultiDisplays)