Date: Fri, 27 Jan 2006 19:10:08 GMT
From: Hajimu UMEMOTO <ume@freebsd.org>
To: freebsd-x11@FreeBSD.org
Subject: Re: ports/92137: x11-server/xorg-{server, nestserver, printserver, vfbserver}: make fails on 4.x
Message-ID: <200601271910.k0RJA85h034837@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/92137; it has been noted by GNATS.
From: Hajimu UMEMOTO <ume@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org, KIMURA Yasuhiro <yasu@utahime.org>
Cc: Hajimu UMEMOTO <ume@freebsd.org>
Subject: Re: ports/92137: x11-server/xorg-{server,nestserver,printserver,vfbserver}: make fails on 4.x
Date: Sat, 28 Jan 2006 04:05:50 +0900
Hi,
>>>>> On Sun, 22 Jan 2006 16:45:00 +0900 (JST)
>>>>> KIMURA Yasuhiro <yasu@utahime.org> said:
yasu> On 4.x, make of these ports fails at same source file and
yasu> with same error as following:
Please try attached patch. You should be able to build them with
stock gcc except graphics/dri. Unfortunately, graphics/dri seems
heavily depending on C99.
Index: graphics/dri/Makefile
diff -u graphics/dri/Makefile.orig graphics/dri/Makefile
--- graphics/dri/Makefile.orig Mon Jan 23 01:45:32 2006
+++ graphics/dri/Makefile Fri Jan 27 16:57:27 2006
@@ -24,6 +24,7 @@
WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}
USE_X_PREFIX= yes
USE_BZIP2= yes
+USE_GCC= 3.4+
USE_GMAKE= yes
MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}" \
FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" \
@@ -37,6 +38,12 @@
.if ${X_WINDOW_SYSTEM:L} != xorg
IGNORE= requires libGL from X.Org.
+.endif
+
+.if !exists(/usr/include/stdint.h)
+post-patch:
+ ${ECHO} "#include <sys/types.h>" \
+ > ${WRKSRC}/src/mesa/drivers/dri/mga/stdint.h
.endif
do-install:
Index: x11-servers/xorg-server/Makefile.inc
diff -u x11-servers/xorg-server/Makefile.inc.orig x11-servers/xorg-server/Makefile.inc
--- x11-servers/xorg-server/Makefile.inc.orig Mon Jan 23 01:56:54 2006
+++ x11-servers/xorg-server/Makefile.inc Fri Jan 27 19:30:36 2006
@@ -42,6 +42,8 @@
${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl
SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \
+ ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c \
+ ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c \
${PORTSDIR}/x11-servers/xorg-server/files/patch-servermd.h \
${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c
Index: x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c
diff -u -p /dev/null x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c
--- /dev/null Sat Jan 28 02:43:51 2006
+++ x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c Sat Jan 28 02:44:19 2006
@@ -0,0 +1,14 @@
+Index: programs/Xserver/Xext/xvmc.c
+diff -u -p programs/Xserver/Xext/xvmc.c.orig programs/Xserver/Xext/xvmc.c
+--- programs/Xserver/Xext/xvmc.c.orig Sun Jul 3 17:53:36 2005
++++ programs/Xserver/Xext/xvmc.c Thu Jan 26 14:22:20 2006
+@@ -24,8 +24,8 @@
+
+ #ifdef HAS_XVMCSHM
+ #ifndef Lynx
+-#include <sys/ipc.h>
+ #include <sys/types.h>
++#include <sys/ipc.h>
+ #include <sys/shm.h>
+ #else
+ #include <ipc.h>
Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
diff -u -p /dev/null x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
--- /dev/null Sat Jan 28 02:43:51 2006
+++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c Sat Jan 28 02:44:41 2006
@@ -0,0 +1,18 @@
+Index: programs/Xserver/hw/xfree86/common/xf86Config.c
+diff -u -p programs/Xserver/hw/xfree86/common/xf86Config.c.orig programs/Xserver/hw/xfree86/common/xf86Config.c
+--- programs/Xserver/hw/xfree86/common/xf86Config.c.orig Wed Dec 21 07:30:50 2005
++++ programs/Xserver/hw/xfree86/common/xf86Config.c Thu Jan 26 15:10:39 2006
+@@ -505,8 +505,12 @@ GenerateDriverlist(char * dirname, char
+ {
+ #ifdef XFree86LOADER
+ char **ret;
+- char *subdirs[] = { dirname, NULL };
++ char *subdirs[2];
+ static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};
++
++ subdirs[0] = dirname;
++ subdirs[1] = NULL;
++
+ ret = LoaderListDirs(subdirs, patlist);
+
+ /* fix up the probe order for video drivers */
Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
diff -u -p /dev/null x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
--- /dev/null Sat Jan 28 02:43:51 2006
+++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c Sat Jan 28 02:44:28 2006
@@ -0,0 +1,12 @@
+Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
+diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
+--- programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig Tue Oct 4 01:46:14 2005
++++ programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c Thu Jan 26 14:57:56 2006
+@@ -35,6 +35,7 @@
+ #include "xf86Priv.h"
+
+ #include <errno.h>
++#include <sys/types.h>
+ #include <sys/mman.h>
+
+ #ifdef HAS_MTRR_SUPPORT
Index: x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
diff -u -p /dev/null x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
--- /dev/null Sat Jan 28 02:43:51 2006
+++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c Sat Jan 28 02:44:04 2006
@@ -0,0 +1,13 @@
+Index: programs/Xserver/os/xprintf.c
+diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
+--- programs/Xserver/os/xprintf.c.orig Sun Jul 3 17:53:52 2005
++++ programs/Xserver/os/xprintf.c Thu Jan 26 12:47:37 2006
+@@ -39,7 +39,7 @@
+ # ifdef __va_copy
+ # define va_copy __va_copy
+ # else
+-# error "no working va_copy was found"
++# define va_copy(dest, src) ((dest) = (src))
+ # endif
+ #endif
+
Sincerely,
--
Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
ume@mahoroba.org ume@{,jp.}FreeBSD.org
http://www.imasy.org/~ume/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601271910.k0RJA85h034837>