aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrnoland <rnoland@FreeBSD.org>2009-01-25 02:13:01 +0800
committerrnoland <rnoland@FreeBSD.org>2009-01-25 02:13:01 +0800
commitbf0c79efa5a1dd403ad352d22263fa0763f6b14e (patch)
treec76b3f3ff791303587dbb63bf72dcbed6a902931
parent79a47417faf26b9b925b69daa1b15ebda2c39168 (diff)
downloadfreebsd-ports-gnome-bf0c79efa5a1dd403ad352d22263fa0763f6b14e.tar.gz
freebsd-ports-gnome-bf0c79efa5a1dd403ad352d22263fa0763f6b14e.tar.zst
freebsd-ports-gnome-bf0c79efa5a1dd403ad352d22263fa0763f6b14e.zip
Update mesa related ports to 7.3
Approved by: garga (mentor, implicit)
-rw-r--r--graphics/dri/distinfo6
-rw-r--r--graphics/dri/files/patch-glheader.h22
-rw-r--r--graphics/dri/files/patch-mach64_context.h38
-rw-r--r--graphics/dri/pkg-plist1
-rw-r--r--graphics/libGL/bsd.mesalib.mk2
-rw-r--r--graphics/libGL/distinfo6
-rw-r--r--graphics/libGLU/distinfo6
-rw-r--r--graphics/libGLw/distinfo6
-rw-r--r--graphics/libglut/distinfo12
-rw-r--r--graphics/mesa-demos/distinfo12
-rw-r--r--graphics/mesa-demos/pkg-plist1
11 files changed, 40 insertions, 72 deletions
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
index da68c3af0e8a..266bbdbb0ec2 100644
--- a/graphics/dri/distinfo
+++ b/graphics/dri/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
-SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
-SIZE (MesaLib-7.2.tar.bz2) = 3341919
+MD5 (MesaLib-7.3.tar.bz2) = 781e7811a6ed5c97b2b8defefc8ffbc9
+SHA256 (MesaLib-7.3.tar.bz2) = 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
+SIZE (MesaLib-7.3.tar.bz2) = 3368281
diff --git a/graphics/dri/files/patch-glheader.h b/graphics/dri/files/patch-glheader.h
deleted file mode 100644
index 517e46012c02..000000000000
--- a/graphics/dri/files/patch-glheader.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/mesa/main/glheader.h.orig Thu Apr 13 01:52:32 2006
-+++ src/mesa/main/glheader.h Wed Dec 20 15:27:53 2006
-@@ -127,12 +127,15 @@
- * For now, only used by some DRI hardware drivers for color/texel packing.
- */
- #if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
--#if defined(__linux__)
-+#if defined(__FreeBSD__)
-+#include <sys/endian.h>
-+#define CPU_TO_LE32( x ) bswap32( x )
-+#elif defined(__linux__)
- #include <byteswap.h>
- #define CPU_TO_LE32( x ) bswap_32( x )
--#else /*__linux__*/
--#define CPU_TO_LE32( x ) ( x ) /* fix me for non-Linux big-endian! */
--#endif /*__linux__*/
-+#else
-+#error "Add CPU_TO_LE32 macro for this OS."
-+#endif
- #define MESA_BIG_ENDIAN 1
- #else
- #define CPU_TO_LE32( x ) ( x )
diff --git a/graphics/dri/files/patch-mach64_context.h b/graphics/dri/files/patch-mach64_context.h
index bc17aea756ac..90fe99b3f1c7 100644
--- a/graphics/dri/files/patch-mach64_context.h
+++ b/graphics/dri/files/patch-mach64_context.h
@@ -1,6 +1,6 @@
---- src/mesa/drivers/dri/mach64/mach64_context.h.orig Mon Nov 28 13:17:16 2005
-+++ src/mesa/drivers/dri/mach64/mach64_context.h Wed Dec 20 15:37:34 2006
-@@ -331,25 +331,28 @@
+--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2009-01-21 10:55:48.000000000 -0500
++++ src/mesa/drivers/dri/mach64/mach64_context.h 2009-01-22 13:48:00.000000000 -0500
+@@ -288,17 +288,20 @@
/* ================================================================
* Byte ordering
*/
@@ -11,27 +11,17 @@
#define LE32_OUT( x, y ) do { *(GLuint *)(x) = (y); } while (0)
#define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) = (y); } while (0)
#else
+-#ifndef __OpenBSD__
-#include <byteswap.h>
--#define LE32_IN( x ) bswap_32( *(GLuint *)(x) )
-+#define LE32_IN( x ) CPU_TO_LE32( *(GLuint *)(x) )
- #define LE32_IN_FLOAT( x ) \
- ({ \
-- GLuint __tmp = bswap_32( *(GLuint *)(x) ); \
-+ GLuint __tmp = CPU_TO_LE32( *(GLuint *)(x) ); \
- *(GLfloat *)&__tmp; \
- })
--#define LE32_OUT( x, y ) do { *(GLuint *)(x) = bswap_32( y ); } while (0)
-+#define LE32_OUT( x, y ) do { *(GLuint *)(x) = CPU_TO_LE32( y ); } while (0)
-+#define LE32_OUT( x, y ) \
-+do { \
-+ *(GLuint *)(x) = CPU_TO_LE32( y ); \
-+} while (0)
- #define LE32_OUT_FLOAT( x, y ) \
- do { \
- GLuint __tmp; \
- *(GLfloat *)&__tmp = (y); \
-- *(GLuint *)(x) = bswap_32( __tmp ); \
-+ *(GLuint *)(x) = CPU_TO_LE32( __tmp ); \
- } while (0)
+-#else
++#if defined(__OpenBSD__)
+ #include <machine/endian.h>
+ #define bswap_32 bswap32
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
++#define bswap_32 bswap32
++#else
++#include <byteswap.h>
#endif
+ #define LE32_IN( x ) bswap_32( *(GLuint *)(x) )
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index 5da5f31f5dad..7098c35c5c05 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -1,5 +1,4 @@
include/GL/internal/dri_interface.h
-include/GL/internal/dri_sarea.h
lib/dri/i810_dri.so
lib/dri/i915_dri.so
lib/dri/i965_dri.so
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index e4860d4e1766..d1549fd97761 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -17,7 +17,7 @@
# $FreeBSD$
#
-MESAVERSION= 7.2
+MESAVERSION= 7.3
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
MASTER_SITE_SUBDIR= mesa3d
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
index da68c3af0e8a..266bbdbb0ec2 100644
--- a/graphics/libGL/distinfo
+++ b/graphics/libGL/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
-SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
-SIZE (MesaLib-7.2.tar.bz2) = 3341919
+MD5 (MesaLib-7.3.tar.bz2) = 781e7811a6ed5c97b2b8defefc8ffbc9
+SHA256 (MesaLib-7.3.tar.bz2) = 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
+SIZE (MesaLib-7.3.tar.bz2) = 3368281
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
index da68c3af0e8a..266bbdbb0ec2 100644
--- a/graphics/libGLU/distinfo
+++ b/graphics/libGLU/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
-SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
-SIZE (MesaLib-7.2.tar.bz2) = 3341919
+MD5 (MesaLib-7.3.tar.bz2) = 781e7811a6ed5c97b2b8defefc8ffbc9
+SHA256 (MesaLib-7.3.tar.bz2) = 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
+SIZE (MesaLib-7.3.tar.bz2) = 3368281
diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo
index da68c3af0e8a..266bbdbb0ec2 100644
--- a/graphics/libGLw/distinfo
+++ b/graphics/libGLw/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
-SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
-SIZE (MesaLib-7.2.tar.bz2) = 3341919
+MD5 (MesaLib-7.3.tar.bz2) = 781e7811a6ed5c97b2b8defefc8ffbc9
+SHA256 (MesaLib-7.3.tar.bz2) = 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
+SIZE (MesaLib-7.3.tar.bz2) = 3368281
diff --git a/graphics/libglut/distinfo b/graphics/libglut/distinfo
index 799cf9fc2dbe..5f767751cce7 100644
--- a/graphics/libglut/distinfo
+++ b/graphics/libglut/distinfo
@@ -1,6 +1,6 @@
-MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
-SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
-SIZE (MesaLib-7.2.tar.bz2) = 3341919
-MD5 (MesaGLUT-7.2.tar.bz2) = f67daf93e12c4a459703bbf3e4004e31
-SHA256 (MesaGLUT-7.2.tar.bz2) = 33c51e5f0971c0da568c13b6a7f68d77ef3e0b0ec5c5758f8198ef37320daafe
-SIZE (MesaGLUT-7.2.tar.bz2) = 327717
+MD5 (MesaLib-7.3.tar.bz2) = 781e7811a6ed5c97b2b8defefc8ffbc9
+SHA256 (MesaLib-7.3.tar.bz2) = 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
+SIZE (MesaLib-7.3.tar.bz2) = 3368281
+MD5 (MesaGLUT-7.3.tar.bz2) = abe8036a724c1a483bdad6b5a55ddc1a
+SHA256 (MesaGLUT-7.3.tar.bz2) = 7e7aabb18bfb712191fb569d53c5d8b6a8cf9df995f231f2ba70e2f25c1822d8
+SIZE (MesaGLUT-7.3.tar.bz2) = 330107
diff --git a/graphics/mesa-demos/distinfo b/graphics/mesa-demos/distinfo
index f30869aa90e4..b501584300a0 100644
--- a/graphics/mesa-demos/distinfo
+++ b/graphics/mesa-demos/distinfo
@@ -1,6 +1,6 @@
-MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
-SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
-SIZE (MesaLib-7.2.tar.bz2) = 3341919
-MD5 (MesaDemos-7.2.tar.bz2) = 22e03dc4038cd63f32c21eb60994892b
-SHA256 (MesaDemos-7.2.tar.bz2) = 3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4
-SIZE (MesaDemos-7.2.tar.bz2) = 1360304
+MD5 (MesaLib-7.3.tar.bz2) = 781e7811a6ed5c97b2b8defefc8ffbc9
+SHA256 (MesaLib-7.3.tar.bz2) = 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
+SIZE (MesaLib-7.3.tar.bz2) = 3368281
+MD5 (MesaDemos-7.3.tar.bz2) = 3f0741394069bdf2329565a387396cda
+SHA256 (MesaDemos-7.3.tar.bz2) = f9f1d6d9e71e76eedf8f16b7150ccdd01d64f5e4a40cf1c2bba08cacf7eb6a60
+SIZE (MesaDemos-7.3.tar.bz2) = 1379457
diff --git a/graphics/mesa-demos/pkg-plist b/graphics/mesa-demos/pkg-plist
index ac2bb139d53d..b06bf58d42d2 100644
--- a/graphics/mesa-demos/pkg-plist
+++ b/graphics/mesa-demos/pkg-plist
@@ -20,6 +20,7 @@ bin/geartrain
bin/glinfo
bin/gloss
bin/glslnoise
+bin/glsync
bin/gltestperf
bin/glthreads
bin/glutfx