pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Fix NetBSD.cf for AMD64's server build as suggeste...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d408933dde00
branches: trunk
changeset: 512025:d408933dde00
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri Apr 28 21:52:19 2006 +0000
description:
Fix NetBSD.cf for AMD64's server build as suggested by Matthieu Herrb
via Blair Sadewitz. Fixes PR 33362. Bump revisions of -imake and
-server.
diffstat:
x11/xorg-imake/distinfo | 4 ++--
x11/xorg-imake/patches/patch-ac | 27 ++++++++++++++++++---------
x11/xorg-libs/distinfo | 4 ++--
x11/xorg-libs/patches/patch-ac | 31 +++++++++++++++++++++++--------
x11/xorg-server/Makefile | 4 ++--
5 files changed, 47 insertions(+), 23 deletions(-)
diffs (190 lines):
diff -r 3563f850403c -r d408933dde00 x11/xorg-imake/distinfo
--- a/x11/xorg-imake/distinfo Fri Apr 28 20:43:42 2006 +0000
+++ b/x11/xorg-imake/distinfo Fri Apr 28 21:52:19 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2006/01/19 00:30:55 joerg Exp $
+$NetBSD: distinfo,v 1.19 2006/04/28 21:52:19 joerg Exp $
SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -8,7 +8,7 @@
Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322
SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
-SHA1 (patch-ac) = 682191f790eddb94917c486ec63818756fee8e8e
+SHA1 (patch-ac) = edd7ae5601783d65bec21b5aaed3fd879bc0ed99
SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
SHA1 (patch-ae) = f6bff42193905fd3158b3de52bf925b5fb5f002a
SHA1 (patch-ag) = 79d826e9d8d4a05f250378814d47f0383ab2eafe
diff -r 3563f850403c -r d408933dde00 x11/xorg-imake/patches/patch-ac
--- a/x11/xorg-imake/patches/patch-ac Fri Apr 28 20:43:42 2006 +0000
+++ b/x11/xorg-imake/patches/patch-ac Fri Apr 28 21:52:19 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2006/01/18 23:53:06 xtraeme Exp $
+$NetBSD: patch-ac,v 1.7 2006/04/28 21:52:19 joerg Exp $
---- config/cf/NetBSD.cf.in.orig 2005-12-06 10:56:30.000000000 +0100
-+++ config/cf/NetBSD.cf.in 2005-12-06 11:01:02.000000000 +0100
-@@ -126,7 +126,7 @@
+--- config/cf/NetBSD.cf.in.orig 2005-11-30 06:20:06.000000000 +0100
++++ config/cf/NetBSD.cf.in
+@@ -126,7 +126,7 @@ XCOMM operating system: OSName (OSMajor
# if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
(OSMajorVersion == 2 && OSMinorVersion < 99) || \
(OSMajorVersion < 2))
@@ -11,7 +11,7 @@
# endif
# define SystemMTDefines -D_REENTRANT
# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
-@@ -150,7 +150,7 @@
+@@ -150,7 +150,7 @@ XCOMM operating system: OSName (OSMajor
#define MkdirHierCmd mkdir -p
#undef CcCmd
@@ -20,7 +20,7 @@
#ifndef DefaultCCOptions
#if defined(UseInstalled)
#define DefaultCCOptions /**/
-@@ -166,7 +166,7 @@
+@@ -166,7 +166,7 @@ XCOMM operating system: OSName (OSMajor
#endif
#endif
@@ -29,7 +29,7 @@
#define StandardCppOptions -traditional
#define StandardCppDefines /**/
#define PreProcessCmd CcCmd -E
-@@ -195,7 +195,7 @@
+@@ -195,7 +195,7 @@ XCOMM operating system: OSName (OSMajor
* Disabled for NetBSD/vax until I figure out the scheme. --CS
*/
#if ((OSMajorVersion > 0) && defined(i386Architecture)) || \
@@ -38,7 +38,16 @@
# ifndef DoLoadableServer
# define DoLoadableServer YES
# endif
-@@ -404,6 +404,10 @@
+@@ -284,6 +284,8 @@ XCOMM operating system: OSName (OSMajor
+ # ifndef XFree86ConsoleDefines
+ # define XFree86ConsoleDefines -DWSCONS_SUPPORT
+ # endif
++#elif defined(ia64Architecture) || defined(AMD64Architecture)
++#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+ #else
+ # define ServerExtraDefines GccGasOption
+ #endif
+@@ -404,6 +406,10 @@ XCOMM operating system: OSName (OSMajor
# endif /* MTRRBuiltin */
#endif /* i386Architecture */
@@ -49,7 +58,7 @@
/*
* agpgart support (NetBSD 1.5Y and up)
*/
-@@ -590,7 +594,7 @@
+@@ -590,7 +596,7 @@ InstallManPageAliasesBase(file,destdir,a
# define BuildXInputLib YES
#endif
diff -r 3563f850403c -r d408933dde00 x11/xorg-libs/distinfo
--- a/x11/xorg-libs/distinfo Fri Apr 28 20:43:42 2006 +0000
+++ b/x11/xorg-libs/distinfo Fri Apr 28 21:52:19 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2006/04/22 14:32:42 joerg Exp $
+$NetBSD: distinfo,v 1.42 2006/04/28 21:52:19 joerg Exp $
SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -11,7 +11,7 @@
Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
SHA1 (patch-ab) = 45f06a7d1ac2316621c5707bb202b7f6042699be
-SHA1 (patch-ac) = 3fee8b29343e40f81abfc3df7d4ff417efbcaacc
+SHA1 (patch-ac) = 841979893b72455ce59b951ac137ca0c236a39f3
SHA1 (patch-ad) = f6bff42193905fd3158b3de52bf925b5fb5f002a
SHA1 (patch-ae) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d
SHA1 (patch-af) = 62127e39c829cba6b01bd9f3aaaea682eec52c9e
diff -r 3563f850403c -r d408933dde00 x11/xorg-libs/patches/patch-ac
--- a/x11/xorg-libs/patches/patch-ac Fri Apr 28 20:43:42 2006 +0000
+++ b/x11/xorg-libs/patches/patch-ac Fri Apr 28 21:52:19 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.8 2006/02/27 22:58:57 joerg Exp $
+$NetBSD: patch-ac,v 1.9 2006/04/28 21:52:19 joerg Exp $
---- config/cf/NetBSD.cf.in.orig 2005-12-06 10:56:30.000000000 +0100
-+++ config/cf/NetBSD.cf.in 2005-12-06 11:01:02.000000000 +0100
+--- config/cf/NetBSD.cf.in.orig 2006-04-28 23:09:24.000000000 +0200
++++ config/cf/NetBSD.cf.in
@@ -126,7 +126,7 @@ XCOMM operating system: OSName (OSMajor
# if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
(OSMajorVersion == 2 && OSMinorVersion < 99) || \
@@ -38,7 +38,7 @@
# ifndef DoLoadableServer
# define DoLoadableServer YES
# endif
-@@ -240,16 +240,19 @@ XCOMM operating system: OSName (OSMajor
+@@ -240,17 +240,24 @@ XCOMM operating system: OSName (OSMajor
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# elif defined(PpcArchitecture)
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
@@ -56,11 +56,26 @@
# endif
#endif
-#ifdef i386Architecture
+-# define ServerExtraDefines GccGasOption XFree86ServerDefines
+#if defined(i386Architecture) || defined(AMD64Architecture)
- # define ServerExtraDefines GccGasOption XFree86ServerDefines
++# if defined(AMD64Architecture)
++# define ServerExtraDefines XFree86ServerDefines -D_XSERVER64
++# else
++# define ServerExtraDefines GccGasOption XFree86ServerDefines
++# endif
# ifndef XFree86ConsoleDefines
# if (OSMajorVersion == 1 && ((OSMinorVersion == 3 && OSTeenyVersion >= 6) \
-@@ -404,6 +407,10 @@ XCOMM operating system: OSName (OSMajor
+ || OSMinorVersion >= 4) \
+@@ -284,6 +291,8 @@ XCOMM operating system: OSName (OSMajor
+ # ifndef XFree86ConsoleDefines
+ # define XFree86ConsoleDefines -DWSCONS_SUPPORT
+ # endif
++#elif defined(ia64Architecture)
++# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+ #else
+ # define ServerExtraDefines GccGasOption
+ #endif
+@@ -404,6 +413,10 @@ XCOMM operating system: OSName (OSMajor
# endif /* MTRRBuiltin */
#endif /* i386Architecture */
@@ -71,7 +86,7 @@
/*
* agpgart support (NetBSD 1.5Y and up)
*/
-@@ -420,7 +427,7 @@ XCOMM operating system: OSName (OSMajor
+@@ -420,7 +433,7 @@ XCOMM operating system: OSName (OSMajor
* MMX, SSE and 3DNow will be autodetected. NetBSD 1.6 and up have the
* necessary kernel and toolchain support.
*/
@@ -80,7 +95,7 @@
((OSMajorVersion > 1) || (OSMajorVersion == 1 && OSMinorVersion > 5))
# define HasX86Support YES
# define HasMMXSupport YES
-@@ -590,7 +597,7 @@ InstallManPageAliasesBase(file,destdir,a
+@@ -590,7 +603,7 @@ InstallManPageAliasesBase(file,destdir,a
# define BuildXInputLib YES
#endif
diff -r 3563f850403c -r d408933dde00 x11/xorg-server/Makefile
--- a/x11/xorg-server/Makefile Fri Apr 28 20:43:42 2006 +0000
+++ b/x11/xorg-server/Makefile Fri Apr 28 21:52:19 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2006/04/22 14:32:42 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2006/04/28 21:52:19 joerg Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-server-${XORG_VER}
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG}
DISTFILES= X11R${XORG_VER}-src1.tar.gz \
Home |
Main Index |
Thread Index |
Old Index