diff options
author | tv <tv> | 2005-11-08 16:41:30 +0000 |
---|---|---|
committer | tv <tv> | 2005-11-08 16:41:30 +0000 |
commit | beef87eba2c18a3cf82aa85897beadc58f908ec7 (patch) | |
tree | 30784e90ebecea4319689a16c12ec773c0de42e6 /graphics/MesaLib/patches | |
parent | ba1a03acfb294b2c5f45a802c1da42ca49f90d86 (diff) | |
download | pkgsrc-beef87eba2c18a3cf82aa85897beadc58f908ec7.tar.gz |
Create template config file for Interix 3.x.
As part of this, do something special for xmesaP.h: Because XShm.h does
exist on the Interix platform, and Mesa binaries were already buildable,
preserve the ABI by including XShm.h there and keeping the XShmSegmentInfo
field (with -DUSE_XSHM_HDRONLY) -- thus avoiding both flag day and revbump
sweep. However, all XShm-using code remains turned off (no -DUSE_XSHM)
so that libGL will work.
Bump PKGREVISION of MesaLib only.
Diffstat (limited to 'graphics/MesaLib/patches')
-rw-r--r-- | graphics/MesaLib/patches/patch-ac | 14 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ai | 15 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-aj | 22 |
3 files changed, 48 insertions, 3 deletions
diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac index 45d033b3fe4..eaf93d61ad8 100644 --- a/graphics/MesaLib/patches/patch-ac +++ b/graphics/MesaLib/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.7 2005/01/04 15:49:24 adam Exp $ +$NetBSD: patch-ac,v 1.8 2005/11/08 16:41:30 tv Exp $ ---- Makefile.orig 2004-12-05 18:25:19.000000000 +0000 +--- Makefile.orig 2004-12-05 13:25:19.000000000 -0500 +++ Makefile @@ -2,7 +2,7 @@ @@ -11,7 +11,15 @@ $NetBSD: patch-ac,v 1.7 2005/01/04 15:49:24 adam Exp $ default: $(TOP)/configs/current -@@ -100,6 +100,7 @@ linux-x86-64-static \ +@@ -64,6 +64,7 @@ hpux11-64 \ + hpux11-64-static \ + hpux9 \ + hpux9-gcc \ ++interix3 \ + irix6-64 \ + irix6-64-static \ + irix6-n32 \ +@@ -100,6 +101,7 @@ linux-x86-64-static \ linux-x86-glide \ linux-x86-static \ netbsd \ diff --git a/graphics/MesaLib/patches/patch-ai b/graphics/MesaLib/patches/patch-ai new file mode 100644 index 00000000000..13ad56f4dc5 --- /dev/null +++ b/graphics/MesaLib/patches/patch-ai @@ -0,0 +1,15 @@ +$NetBSD: patch-ai,v 1.1 2005/11/08 16:41:30 tv Exp $ + +--- /dev/null 2004-10-25 16:57:21.000000000 +0000 ++++ configs/interix3 +@@ -0,0 +1,9 @@ ++# Configuration for Interix 3.x ++ ++include $(TOP)/configs/default ++ ++CONFIG_NAME = pkgsrc ++ ++# Compiler and flags ++CFLAGS+= -DUSE_XSHM_HDRONLY -DPTHREADS ++APP_LIB_DEPS = -L$(LIB_DIR) -L${PREFIX}/lib -L${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm ++ diff --git a/graphics/MesaLib/patches/patch-aj b/graphics/MesaLib/patches/patch-aj new file mode 100644 index 00000000000..b1b22d1f229 --- /dev/null +++ b/graphics/MesaLib/patches/patch-aj @@ -0,0 +1,22 @@ +$NetBSD: patch-aj,v 1.1 2005/11/08 16:41:30 tv Exp $ + +--- src/mesa/drivers/x11/xmesaP.h.orig 2004-03-04 11:22:01.000000000 -0500 ++++ src/mesa/drivers/x11/xmesaP.h +@@ -30,7 +30,7 @@ + #ifdef XFree86Server + # include "GL/xf86glx.h" + # include "xf86glx_util.h" +-#elif defined(USE_XSHM) ++#elif defined(USE_XSHM) || defined(USE_XSHM_HDRONLY) + # include <X11/extensions/XShm.h> + #endif + #include "GL/xmesa.h" +@@ -185,7 +185,7 @@ struct xmesa_buffer { + /* 0 = not available */ + /* 1 = XImage support available */ + /* 2 = Pixmap support available too */ +-#ifdef USE_XSHM ++#if defined(USE_XSHM) || defined(USE_XSHM_HDRONLY) + XShmSegmentInfo shminfo; + #endif + #endif |