[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Add Linux to DRI platforms. Add a pa...

[dsainty <dsainty%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/19219b3347ee
branches:  trunk
changeset: 543080:19219b3347ee
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Tue Jun 03 06:59:12 2008 +0000

description:
Add Linux to DRI platforms.  Add a patch to fix compilation under Linux.  Bump PKGREVISION.

diffstat:

 graphics/MesaLib/Makefile         |   3 ++-
 graphics/MesaLib/distinfo         |   3 ++-
 graphics/MesaLib/options.mk       |   8 ++++----
 graphics/MesaLib/patches/patch-av |  19 +++++++++++++++++++
 4 files changed, 27 insertions(+), 6 deletions(-)

diffs (79 lines):

diff -r b8e0fa072fea -r 19219b3347ee graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Tue Jun 03 06:10:58 2008 +0000
+++ b/graphics/MesaLib/Makefile Tue Jun 03 06:59:12 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2008/04/30 16:40:08 bjs Exp $
+# $NetBSD: Makefile,v 1.61 2008/06/03 06:59:12 dsainty Exp $
 
 PKGNAME=       MesaLib-${MESA_PKGVERSION}
+PKGREVISION=   1
 COMMENT=       Graphics library similar to SGI's OpenGL
 
 MESA_HEADERS=  gl.h gl_mangle.h glext.h glx.h glxext.h \
diff -r b8e0fa072fea -r 19219b3347ee graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Tue Jun 03 06:10:58 2008 +0000
+++ b/graphics/MesaLib/distinfo Tue Jun 03 06:59:12 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2008/05/21 04:11:37 bjs Exp $
+$NetBSD: distinfo,v 1.54 2008/06/03 06:59:12 dsainty Exp $
 
 SHA1 (Mesa-7.0.3/Mesa-7.0.3-001) = 32725fd4632d51495253b06786b3f0e743d11dbd
 RMD160 (Mesa-7.0.3/Mesa-7.0.3-001) = 92b1e1d3eb3932a419c6d1fb9e7b96ef5c32fd1a
@@ -37,4 +37,5 @@
 SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
 SHA1 (patch-at) = 4b3d95a116734ad8951816e042b497f638c4cf6b
 SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907
+SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7
 SHA1 (patch-cb) = 0eac61e6656c8a8d6452504dd06ed6969ddbeba2
diff -r b8e0fa072fea -r 19219b3347ee graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk       Tue Jun 03 06:10:58 2008 +0000
+++ b/graphics/MesaLib/options.mk       Tue Jun 03 06:59:12 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2008/05/31 20:43:29 tnn Exp $
+# $NetBSD: options.mk,v 1.8 2008/06/03 06:59:12 dsainty Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS= mesa-execmem-mmap
@@ -46,8 +46,8 @@
 .if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
      ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc" || \
      ${MACHINE_ARCH} == "sparc64") && \
-    (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \
-     ${OPSYS} == "DragonFly")
+    (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \
+     ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux")
 PKG_SUPPORTED_OPTIONS+=                dri
 .endif
 ###
@@ -55,7 +55,7 @@
 ###    I think this is a good way to see which bugs surface before the
 ###    next release branch.  Upgrading the X server to the 1.4 branch
 ###    is advised given that it's glx/glcore modules are built from
-###    Mesa 6.5.3 (a development release). 
+###    Mesa 6.5.3 (a development release).
 ###
 .if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*-*86*)
 PKG_SUGGESTED_OPTIONS+=                dri
diff -r b8e0fa072fea -r 19219b3347ee graphics/MesaLib/patches/patch-av
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib/patches/patch-av Tue Jun 03 06:59:12 2008 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-av,v 1.1 2008/06/03 06:59:13 dsainty Exp $
+
+'program_invocation_short_name' may be conditionally defined even if there is
+a declaration available.  Make sure it's always available by making the
+extern unconditional.
+
+--- src/mesa/drivers/dri/common/xmlconfig.c.orig       2007-06-22 10:10:54.000000000 +1200
++++ src/mesa/drivers/dri/common/xmlconfig.c    2008-04-27 21:31:28.660265951 +1200
+@@ -49,10 +49,8 @@
+ #undef GET_PROGRAM_NAME
+ 
+ #if (defined(__GNU_LIBRARY__) || defined(__GLIBC__)) && !defined(__UCLIBC__)
+-#    if !defined(__GLIBC__) || (__GLIBC__ < 2)
+ /* These aren't declared in any libc5 header */
+ extern char *program_invocation_name, *program_invocation_short_name;
+-#    endif
+ #    define GET_PROGRAM_NAME() program_invocation_short_name
+ #elif defined(__FreeBSD__) && (__FreeBSD__ >= 2)
+ #    include <osreldate.h>