diff options
author | joerg <joerg@pkgsrc.org> | 2006-01-23 22:54:44 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-01-23 22:54:44 +0000 |
commit | 0227f4c84fc9fd3ba024cf5edddf4497284e9f0f (patch) | |
tree | 309a78d196b502340215447eb5a2bee6de78e9f6 | |
parent | 46c71f73d9fe79b9c1c64fdefc2f049a2827cf2c (diff) | |
download | pkgsrc-0227f4c84fc9fd3ba024cf5edddf4497284e9f0f.tar.gz |
Fix two more issues of FreeBSD leftovers/missing DF support in
xorg-server.
-rw-r--r-- | x11/xorg-libs/distinfo | 4 | ||||
-rw-r--r-- | x11/xorg-libs/patches/patch-bb | 85 | ||||
-rw-r--r-- | x11/xorg-libs/patches/patch-bd | 20 |
3 files changed, 108 insertions, 1 deletions
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index 79a2e355108..bab8a0de79c 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.30 2006/01/23 21:13:16 joerg Exp $ +$NetBSD: distinfo,v 1.31 2006/01/23 22:54:44 joerg Exp $ SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8 @@ -34,5 +34,7 @@ SHA1 (patch-aw) = 4289ec24e811efd6f74acca6c6842ee5f77cc5f7 SHA1 (patch-ay) = 4403bc18ab13f582e4a36d6f873bbd7aaaceacf5 SHA1 (patch-az) = a236a896e4e58f0d21d5745fb4b452300f2b77c6 SHA1 (patch-ba) = bf99c7ea9c07f048b8338f0a1f6b92e9f692879e +SHA1 (patch-bb) = dac048c885a080f3975728de2afbadf17c3bee9c SHA1 (patch-bc) = b735c3f0cfd5ac161eff941a9878c6840ee45788 +SHA1 (patch-bd) = 2ea3591101f5e9602cc6846ca259b63cdcb88b73 SHA1 (patch-bl) = ccfd290ebffc08b9cd03b7eb83a9671b0e16baec diff --git a/x11/xorg-libs/patches/patch-bb b/x11/xorg-libs/patches/patch-bb new file mode 100644 index 00000000000..a4ad3ab9ffc --- /dev/null +++ b/x11/xorg-libs/patches/patch-bb @@ -0,0 +1,85 @@ +$NetBSD: patch-bb,v 1.3 2006/01/23 22:54:44 joerg Exp $ + +--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c.orig 2006-01-23 22:44:12.000000000 +0000 ++++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c +@@ -72,7 +72,7 @@ + static void usbSigioReadInput (int fd, void *closure); + #endif + +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + /* These are for FreeBSD */ + #define DEFAULT_MOUSE_DEV "/dev/mouse" + #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse" +@@ -101,7 +101,7 @@ SupportedInterfaces(void) + { + #if defined(__NetBSD__) + return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO; +-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC; + #else + return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO; +@@ -124,7 +124,7 @@ static const char *internalNames[] = { + * main "mouse" driver. + */ + static const char *miscNames[] = { +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + "SysMouse", + #endif + NULL +@@ -153,7 +153,7 @@ CheckProtocol(const char *protocol) + static const char * + DefaultProtocol(void) + { +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + return "Auto"; + #elif defined(__OpenBSD__) && defined(WSCONS_SUPPORT) + return "WSMouse"; +@@ -162,7 +162,7 @@ DefaultProtocol(void) + #endif + } + +-#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(MOUSE_PROTO_SYSMOUSE) ++#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) + static struct { + int dproto; + const char *name; +@@ -231,7 +231,7 @@ SetSysMouseRes(InputInfoPtr pInfo, const + mode.rate = rate > 0 ? rate : -1; + mode.resolution = res > 0 ? res : -1; + mode.accelfactor = -1; +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + if (pMse->autoProbe || + (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) { + /* +@@ -249,7 +249,7 @@ SetSysMouseRes(InputInfoPtr pInfo, const + } + #endif + +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + + #define MOUSED_PID_FILE "/var/run/moused.pid" + +@@ -774,7 +774,7 @@ xf86OSMouseInit(int flags) + p->BuiltinNames = BuiltinNames; + p->DefaultProtocol = DefaultProtocol; + p->CheckProtocol = CheckProtocol; +-#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(MOUSE_PROTO_SYSMOUSE) ++#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) + p->SetupAuto = SetupAuto; + p->SetPS2Res = SetSysMouseRes; + p->SetBMRes = SetSysMouseRes; +@@ -784,7 +784,7 @@ xf86OSMouseInit(int flags) + p->SetupAuto = SetupAuto; + p->SetMiscRes = SetMouseRes; + #endif +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) + p->FindDevice = FindDevice; + #endif + p->PreInit = bsdMousePreInit; diff --git a/x11/xorg-libs/patches/patch-bd b/x11/xorg-libs/patches/patch-bd new file mode 100644 index 00000000000..1daef738486 --- /dev/null +++ b/x11/xorg-libs/patches/patch-bd @@ -0,0 +1,20 @@ +$NetBSD: patch-bd,v 1.3 2006/01/23 22:54:44 joerg Exp $ + +--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c.orig 2006-01-23 22:47:05.000000000 +0000 ++++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c +@@ -245,6 +245,7 @@ xf86OpenConsole() + * switching anymore. Here we check for FreeBSD 3.1 and up. + * Add cases for other *BSD that behave the same. + */ ++#if !defined(__DragonFly__) + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + uname (&uts); + i = atof(uts.release) * 100; +@@ -266,6 +267,7 @@ xf86OpenConsole() + } + sleep(1); + } ++#endif + + acquire_vt: + /* |