cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Eric Anholt 2002-12-08 05:37:30 +00:00
parent d56c33afdf
commit 236b06cf9b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=71416
6 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11-servers/XFree86-4-Server-snap/Makefile
View File

@ -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} \

2
x11-servers/XFree86-4-Server/Makefile
View File

@ -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} \

32
x11-servers/XFree86-4-Server/files/patch-common_x86.c
View File

@ -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__ */

2
x11/XFree86-4-libraries/Makefile
View File

@ -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/}

0
x11-servers/XFree86-4-Server-snap/files/patch-common_x86.c → x11/XFree86-4-libraries/files/patch-common_x86.c
View File

18
x11/XFree86-4-libraries/files/patch-imLcPrs.c Normal file
View File

@ -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) {