[1] Move the recently committed patch-common_x86.c to XFree86-4-libraries

    so it covers libOSMesa, too.
[2] Reduce stack usage in libX11 (helps JDK 1.4)

PR:		[1] ports/46037
Submitted by:	[2] phantom
Approved by:	portmgr

4 files changed, 2 insertions, 66 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 66cca0215674..551c7035aba6 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -31,7 +31,7 @@ DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 .for pf in patch-text-mode.c patch-xf86Configure.c patch-xf86config.c \
-	patch-mga_driver.c patch-common_x86.c patch-alp_xaam.c
+	patch-mga_driver.c patch-alp_xaam.c
 EXTRA_PATCHES+=		${.CURDIR}/files/${pf}
 .endfor
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-common_x86.c b/x11-servers/XFree86-4-Server-snap/files/patch-common_x86.c
deleted file mode 100644
index 9e584c20ac75..000000000000
--- a/x11-servers/XFree86-4-Server-snap/files/patch-common_x86.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- extras/Mesa/src/X86/common_x86.c.orig	Fri Aug 17 11:40:11 2001
-+++ extras/Mesa/src/X86/common_x86.c	Tue Dec  3 21:51:31 2002
-@@ -38,6 +38,10 @@
- #if defined(USE_KATMAI_ASM) && defined(__linux__)
- #include <signal.h>
- #endif
-+#if defined(USE_KATMAI_ASM) && defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif
- 
- #include "context.h"
- #include "common_x86_asm.h"
-@@ -213,8 +217,17 @@
-    message( "Cannot test OS support for SSE, disabling to be safe.\n" );
-    gl_x86_cpu_features &= ~(X86_FEATURE_XMM);
- #endif /* _POSIX_SOURCE && X86_FXSR_MAGIC */
-+#elif defined(__FreeBSD__)
-+   {
-+      int ret, enabled;
-+      size_t len;
-+      len = sizeof(enabled);
-+      ret = sysctlbyname("hw.instruction_sse", &enabled, &len, NULL, 0);
-+      if (ret || !enabled)
-+         gl_x86_cpu_features &= ~(X86_FEATURE_XMM);
-+   }
- #else
--   /* Do nothing on non-Linux platforms for now.
-+   /* Do nothing on other platforms for now.
-     */
-    message( "Not testing OS support for SSE, leaving enabled.\n" );
- #endif /* __linux__ */
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 66cca0215674..551c7035aba6 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -31,7 +31,7 @@ DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 .for pf in patch-text-mode.c patch-xf86Configure.c patch-xf86config.c \
-	patch-mga_driver.c patch-common_x86.c patch-alp_xaam.c
+	patch-mga_driver.c patch-alp_xaam.c
 EXTRA_PATCHES+=		${.CURDIR}/files/${pf}
 .endfor
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
diff --git a/x11-servers/XFree86-4-Server/files/patch-common_x86.c b/x11-servers/XFree86-4-Server/files/patch-common_x86.c
deleted file mode 100644
index 9e584c20ac75..000000000000
--- a/x11-servers/XFree86-4-Server/files/patch-common_x86.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- extras/Mesa/src/X86/common_x86.c.orig	Fri Aug 17 11:40:11 2001
-+++ extras/Mesa/src/X86/common_x86.c	Tue Dec  3 21:51:31 2002
-@@ -38,6 +38,10 @@
- #if defined(USE_KATMAI_ASM) && defined(__linux__)
- #include <signal.h>
- #endif
-+#if defined(USE_KATMAI_ASM) && defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif
- 
- #include "context.h"
- #include "common_x86_asm.h"
-@@ -213,8 +217,17 @@
-    message( "Cannot test OS support for SSE, disabling to be safe.\n" );
-    gl_x86_cpu_features &= ~(X86_FEATURE_XMM);
- #endif /* _POSIX_SOURCE && X86_FXSR_MAGIC */
-+#elif defined(__FreeBSD__)
-+   {
-+      int ret, enabled;
-+      size_t len;
-+      len = sizeof(enabled);
-+      ret = sysctlbyname("hw.instruction_sse", &enabled, &len, NULL, 0);
-+      if (ret || !enabled)
-+         gl_x86_cpu_features &= ~(X86_FEATURE_XMM);
-+   }
- #else
--   /* Do nothing on non-Linux platforms for now.
-+   /* Do nothing on other platforms for now.
-     */
-    message( "Not testing OS support for SSE, leaving enabled.\n" );
- #endif /* __linux__ */