pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server Fix basic NetBSD SPARC support...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e8827f24e071
branches: trunk
changeset: 532360:e8827f24e071
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Aug 16 20:10:15 2007 +0000
description:
Fix basic NetBSD SPARC support. This currently disables Sbus until
someone more involved in the platform take a look or I find the time to
merge the xsrc changes.
diffstat:
x11/modular-xorg-server/distinfo | 13 +++-
x11/modular-xorg-server/patches/patch-ab | 82 ++++++++++++-------------------
x11/modular-xorg-server/patches/patch-ai | 20 -------
x11/modular-xorg-server/patches/patch-aj | 45 +++++++++++++++++
x11/modular-xorg-server/patches/patch-dd | 15 +++++-
x11/modular-xorg-server/patches/patch-sa | 13 +++++
x11/modular-xorg-server/patches/patch-sb | 15 +++++
x11/modular-xorg-server/patches/patch-sc | 15 +++++
x11/modular-xorg-server/patches/patch-sd | 24 +++++++++
x11/modular-xorg-server/patches/patch-se | 13 +++++
10 files changed, 179 insertions(+), 76 deletions(-)
diffs (truncated from 322 to 300 lines):
diff -r 83c44c56296d -r e8827f24e071 x11/modular-xorg-server/distinfo
--- a/x11/modular-xorg-server/distinfo Thu Aug 16 18:11:44 2007 +0000
+++ b/x11/modular-xorg-server/distinfo Thu Aug 16 20:10:15 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2007/08/15 14:51:55 joerg Exp $
+$NetBSD: distinfo,v 1.14 2007/08/16 20:10:15 joerg Exp $
SHA1 (MesaLib-6.5.2.tar.bz2) = ba860bb6ee57c02202342dfd5927464a068ea18f
RMD160 (MesaLib-6.5.2.tar.bz2) = 9a92d69110c066ae6734bcaafb78f222ac2df6d3
@@ -7,14 +7,19 @@
RMD160 (xorg-server-1.3.0.0.tar.bz2) = 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1
Size (xorg-server-1.3.0.0.tar.bz2) = 5968263 bytes
SHA1 (patch-aa) = f72780165c9ecd3e9ab31d03c1b2d777290d09e2
-SHA1 (patch-ab) = 115905eba320f294c68783bb704359d824460469
+SHA1 (patch-ab) = 0ccf8e6051ca9350b2a06b5f75e962a55dd11865
SHA1 (patch-ad) = 752235269f10daade0bf60665cccde39d1583064
SHA1 (patch-af) = 6c58872798a30b31154dd7b167c84bf20ac417be
SHA1 (patch-ag) = 222427db3e1bdbf977e992aa91aae5f16992345a
SHA1 (patch-ah) = 23767542ea672d590050e258317c0352bb321810
-SHA1 (patch-ai) = 862ba20c1d2e36576ae2046a6e2e3f414ea6b5c9
+SHA1 (patch-aj) = 7a538538a04ff466595527b7a65a196fc06a625e
SHA1 (patch-da) = 73faacda1088304025c5e05f3d58edaf9ae1145f
SHA1 (patch-db) = 28913a094c8499536a71c8d4d7ca57a5efb25b39
SHA1 (patch-dc) = 75df6f37b1cbc9574adb5ee66cb84d0f5ebac853
-SHA1 (patch-dd) = 4d0fd341ccfe1f1240faa8912beea3f15dc39207
+SHA1 (patch-dd) = cfb7c9d470098b0fcfcddbe9a1363a14f762fe19
SHA1 (patch-de) = f887f3fd09406006b6165779b74be780b7fddd18
+SHA1 (patch-sa) = 5586e998e2239b6851291b5f79b2e6009c78b174
+SHA1 (patch-sb) = b769780b446e4f10bc99ccd3373d666daf44f863
+SHA1 (patch-sc) = 33c4d4731e3732032f84946fc17e28d0cba389a6
+SHA1 (patch-sd) = ac8f5bc3bca8c21e91d7206a5b2cb400c54f7414
+SHA1 (patch-se) = 22b20c734b7fcf59d75227aeb1fa703465582568
diff -r 83c44c56296d -r e8827f24e071 x11/modular-xorg-server/patches/patch-ab
--- a/x11/modular-xorg-server/patches/patch-ab Thu Aug 16 18:11:44 2007 +0000
+++ b/x11/modular-xorg-server/patches/patch-ab Thu Aug 16 20:10:15 2007 +0000
@@ -1,54 +1,36 @@
-$NetBSD: patch-ab,v 1.2 2007/02/05 23:08:36 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2007/08/16 20:10:15 joerg Exp $
---- configure.orig 2007-01-23 05:40:03.000000000 +0000
+--- configure.orig 2007-08-16 16:48:09.000000000 +0200
+++ configure
-@@ -24300,6 +24300,10 @@ _ACEOF
- #define USE_DEV_IO 1
- _ACEOF
- ;;
-+ *dragonfly*) cat >>confdefs.h <<\_ACEOF
-+#define USE_DEV_IO 1
-+_ACEOF
-+ ;;
- *netbsd*) cat >>confdefs.h <<\_ACEOF
- #define USE_I386_IOPL 1
- _ACEOF
-@@ -24406,7 +24410,7 @@ fi
- DRI=no
- KDRIVE_HW=no
- case $host_os in
-- *freebsd*)
-+ *freebsd* | *dragonfly*)
- case $host_os in
- kfreebsd*-gnu) ;;
- *)
-@@ -24445,6 +24449,11 @@ _ACEOF
-
-
- cat >>confdefs.h <<\_ACEOF
-+#define PCVT_SUPPORT 1
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<\_ACEOF
- #define WSCONS_SUPPORT 1
- _ACEOF
-
-@@ -27892,7 +27901,7 @@ _ACEOF
-
+@@ -26426,15 +26426,7 @@ echo $ECHO_N "checking for $prefix/share
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- test "$cross_compiling" = yes &&
+- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+- { (exit 1); exit 1; }; }
+-if test -r "$prefix/share/X11/sgml/defs.ent"; then
+ eval "$as_ac_File=yes"
+-else
+- eval "$as_ac_File=no"
+-fi
fi
-
--VENDOR_RELEASE="((($VERSION_MAJOR) * 10000000) + (($VERSION_MINOR) * 100000) + (($VERSION_PATCH) * 1000) + $VERSION_SNAP)"
-+VENDOR_RELEASE=`expr \( $VERSION_MAJOR \* 10000000 \) + \( $VERSION_MINOR \* 100000 \) + \( $VERSION_PATCH \* 1000 \) + $VERSION_SNAP`
-
- if test $VERSION_SNAP = "0"; then
- if test $VERSION_PATCH = "0"; then
-@@ -30642,7 +30651,7 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
-
+ ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+@@ -31155,7 +31147,14 @@ echo "$as_me: error: Your OS is unknown.
;;
-- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
- XORG_OS="freebsd"
- XORG_OS_SUBDIR="bsd"
- XORG_OS_KBD="BSD"
+ sparc*)
+ xorg_bus_sparcpci="yes"
+- xorg_bus_sparc="yes"
++ case $host_os in
++ netbsd*)
++ xorg_bus_sparc="no"
++ ;;
++ *)
++ xorg_bus_sparc="yes"
++ ;;
++ esac
+ ;;
+ x86_64*|amd64*)
+ case $host_os in
diff -r 83c44c56296d -r e8827f24e071 x11/modular-xorg-server/patches/patch-ai
--- a/x11/modular-xorg-server/patches/patch-ai Thu Aug 16 18:11:44 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2007/08/15 14:51:56 joerg Exp $
-
---- configure.orig 2007-08-15 16:02:41.000000000 +0200
-+++ configure
-@@ -26426,15 +26426,7 @@ echo $ECHO_N "checking for $prefix/share
- if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- test "$cross_compiling" = yes &&
-- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-- { (exit 1); exit 1; }; }
--if test -r "$prefix/share/X11/sgml/defs.ent"; then
- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
- fi
- ac_res=`eval echo '${'$as_ac_File'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
diff -r 83c44c56296d -r e8827f24e071 x11/modular-xorg-server/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/modular-xorg-server/patches/patch-aj Thu Aug 16 20:10:15 2007 +0000
@@ -0,0 +1,45 @@
+$NetBSD: patch-aj,v 1.1 2007/08/16 20:10:16 joerg Exp $
+
+--- configure.ac.orig 2007-08-16 17:12:23.000000000 +0200
++++ configure.ac
+@@ -217,6 +217,7 @@ case $host_cpu in
+ case $host_os in
+ *linux*) DEFAULT_INT10=vm86 ;;
+ *freebsd*) AC_DEFINE(USE_DEV_IO) ;;
++ *dragonfly*) AC_DEFINE(USE_DEV_IO) ;;
+ *netbsd*) AC_DEFINE(USE_I386_IOPL)
+ SYS_LIBS=-li386
+ ;;
+@@ -275,6 +276,7 @@ case $host_os in
+ *netbsd*)
+ AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
+ AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
++ AC_DEFINE(PCVT_SUPPORT, 1, [System has PC console])
+ AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
+ DRI=yes
+ ;;
+@@ -1147,7 +1149,7 @@ int main () {
+ AC_DEFINE_UNQUOTED(LNX_KBD_PERIOD_NAME, [$period_field],
+ [Name of the period field in struct kbd_repeat])
+ ;;
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly)
+ XORG_OS="freebsd"
+ XORG_OS_SUBDIR="bsd"
+ XORG_OS_KBD="BSD"
+@@ -1260,7 +1262,14 @@ int main () {
+ ;;
+ sparc*)
+ xorg_bus_sparcpci="yes"
+- xorg_bus_sparc="yes"
++ case $host_os in
++ netbsd*)
++ xorg_bus_sparc="no"
++ ;;
++ *)
++ xorg_bus_sparc="yes"
++ ;;
++ esac
+ ;;
+ x86_64*|amd64*)
+ case $host_os in
diff -r 83c44c56296d -r e8827f24e071 x11/modular-xorg-server/patches/patch-dd
--- a/x11/modular-xorg-server/patches/patch-dd Thu Aug 16 18:11:44 2007 +0000
+++ b/x11/modular-xorg-server/patches/patch-dd Thu Aug 16 20:10:15 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-dd,v 1.1 2007/02/05 23:08:36 joerg Exp $
+$NetBSD: patch-dd,v 1.2 2007/08/16 20:10:16 joerg Exp $
---- hw/xfree86/os-support/bus/Pci.h.orig 2007-02-05 21:08:10.000000000 +0000
+--- hw/xfree86/os-support/bus/Pci.h.orig 2006-11-16 18:39:04.000000000 +0100
+++ hw/xfree86/os-support/bus/Pci.h
@@ -235,7 +235,7 @@
# if defined(linux)
@@ -11,3 +11,14 @@
# define ARCH_PCI_INIT freebsdPciInit
# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
+@@ -322,6 +322,10 @@
+ # elif defined(sun)
+ # define ARCH_PCI_INIT sparcPciInit
+ # define INCLUDE_XF86_MAP_PCI_MEM
++# elif defined(__NetBSD__)
++# define ARCH_PCI_INIT netbsdPciInit
++# define INCLUDE_XF86_MAP_PCI_MEM
++# define INCLUDE_XF86_NO_DOMAIN
+ # elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc64__)
+ # define ARCH_PCI_INIT freebsdPciInit
+ # define INCLUDE_XF86_MAP_PCI_MEM
diff -r 83c44c56296d -r e8827f24e071 x11/modular-xorg-server/patches/patch-sa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/modular-xorg-server/patches/patch-sa Thu Aug 16 20:10:15 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-sa,v 1.1 2007/08/16 20:10:16 joerg Exp $
+
+--- hw/xfree86/common/compiler.h.orig 2007-08-16 17:02:40.000000000 +0200
++++ hw/xfree86/common/compiler.h
+@@ -566,7 +566,7 @@ inl(unsigned short port)
+ return ret;
+ }
+
+-# elif (defined(linux) || defined(Lynx) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__)
++# elif (defined(linux) || defined(Lynx) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)) && defined(__sparc__)
+
+ # if !defined(Lynx)
+ # ifndef ASI_PL
diff -r 83c44c56296d -r e8827f24e071 x11/modular-xorg-server/patches/patch-sb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/modular-xorg-server/patches/patch-sb Thu Aug 16 20:10:15 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-sb,v 1.1 2007/08/16 20:10:16 joerg Exp $
+
+Temporary disable Sbus suport.
+
+--- hw/xfree86/common/xf86Configure.c.orig 2007-08-16 20:03:27.000000000 +0200
++++ hw/xfree86/common/xf86Configure.c
+@@ -213,7 +213,7 @@ xf86AddBusDeviceToConfigure(const char *
+ NewDevice.GDev.identifier = "ISA Adapter";
+ NewDevice.GDev.busID = "ISA";
+ break;
+-#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
++#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ case BUS_SBUS: {
+ char *promPath = NULL;
+ NewDevice.sVideo = (sbusDevicePtr) busData;
diff -r 83c44c56296d -r e8827f24e071 x11/modular-xorg-server/patches/patch-sc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/modular-xorg-server/patches/patch-sc Thu Aug 16 20:10:15 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-sc,v 1.1 2007/08/16 20:10:16 joerg Exp $
+
+Temporary disable Sbus suport.
+
+--- hw/xfree86/loader/xf86sym.c.orig 2007-08-16 20:07:02.000000000 +0200
++++ hw/xfree86/loader/xf86sym.c
+@@ -510,7 +510,7 @@ _X_HIDDEN void *xfree86LookupTab[] = {
+ SYMFUNC(xf86AddModuleInfo)
+ SYMFUNC(xf86DeleteModuleInfo)
+
+-#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
++#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ /* xf86sbusBus.c */
+ SYMFUNC(xf86MatchSbusInstances)
+ SYMFUNC(xf86GetSbusInfoForEntity)
diff -r 83c44c56296d -r e8827f24e071 x11/modular-xorg-server/patches/patch-sd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/modular-xorg-server/patches/patch-sd Thu Aug 16 20:10:15 2007 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-sd,v 1.1 2007/08/16 20:10:17 joerg Exp $
+
+Temporary disable Sbus suport.
+
+--- hw/xfree86/common/xf86Bus.c.orig 2007-08-16 20:10:40.000000000 +0200
++++ hw/xfree86/common/xf86Bus.c
+@@ -113,7 +113,7 @@ void
+ xf86BusProbe(void)
+ {
+ xf86PciProbe();
+-#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
++#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ xf86SbusProbe();
+ #endif
+ }
+@@ -2373,7 +2373,7 @@ xf86PostProbe(void)
+
+ if (fbSlotClaimed) {
+ if (pciSlotClaimed || isaSlotClaimed
Home |
Main Index |
Thread Index |
Old Index