diff options
| author | anholt <anholt@FreeBSD.org> | 2002-12-08 13:37:30 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2002-12-08 13:37:30 +0800 |
| commit | ae19e3420ccd955823f52e9d8b054cb64c361636 (patch) | |
| tree | 241814cc458e2618056010eba5cc79ed758326fc /x11 | |
| parent | d182f063aa16d112071961084344308058d35ea7 (diff) | |
| download | freebsd-ports-gnome-ae19e3420ccd955823f52e9d8b054cb64c361636.tar.gz freebsd-ports-gnome-ae19e3420ccd955823f52e9d8b054cb64c361636.tar.zst freebsd-ports-gnome-ae19e3420ccd955823f52e9d8b054cb64c361636.zip | |
[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
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-4-libraries/Makefile | 2 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-common_x86.c | 32 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-imLcPrs.c | 18 |
3 files changed, 51 insertions, 1 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index cac97fb9f1c1..cec3c622040e 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -7,7 +7,7 @@ PORTNAME= libraries PORTVERSION= 4.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} diff --git a/x11/XFree86-4-libraries/files/patch-common_x86.c b/x11/XFree86-4-libraries/files/patch-common_x86.c new file mode 100644 index 000000000000..9e584c20ac75 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-common_x86.c @@ -0,0 +1,32 @@ +--- 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/XFree86-4-libraries/files/patch-imLcPrs.c b/x11/XFree86-4-libraries/files/patch-imLcPrs.c new file mode 100644 index 000000000000..f4e347f9d1bf --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-imLcPrs.c @@ -0,0 +1,18 @@ +--- lib/X11/imLcPrs.c.orig Wed Dec 4 00:16:59 2002 ++++ lib/X11/imLcPrs.c Wed Dec 4 00:17:44 2002 +@@ -518,13 +518,13 @@ + FILE *fp; + DefTree **ptop; + { +- char tb[65535]; ++ char tb[8192]; + char* tbp; + struct stat st; + + if (fstat (fileno (fp), &st) != -1) { + unsigned long size = (unsigned long) st.st_size; +- if (size < sizeof tb) tbp = tb; ++ if (size <= sizeof tb) tbp = tb; + else tbp = malloc (size); + + if (tbp != NULL) { |