View | Details | Raw Unified | Return to bug 260526 | Differences between
and this patch

Collapse All | Expand All

(-)b/x11-servers/xorg-server/Makefile (-1 / +1 lines)
Lines 1-7 Link Here
1
# Created by: Eric Anholt <anholt@FreeBSD.org>
1
# Created by: Eric Anholt <anholt@FreeBSD.org>
2
2
3
PORTNAME?=	xorg-server
3
PORTNAME?=	xorg-server
4
PORTVERSION?=	1.20.13
4
PORTVERSION?=	1.20.14
5
PORTREVISION?=	0
5
PORTREVISION?=	0
6
PORTEPOCH?=	1
6
PORTEPOCH?=	1
7
CATEGORIES=	x11-servers
7
CATEGORIES=	x11-servers
(-)b/x11-servers/xorg-server/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1634455742
1
TIMESTAMP = 1639835065
2
SHA256 (xorg/xserver/xorg-server-1.20.13.tar.xz) = 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
2
SHA256 (xorg/xserver/xorg-server-1.20.14.tar.xz) = 5cc5b70b9be89443e2594b93656c60bd5e82cd7f01deb4ce4faf81dcf546a16b
3
SIZE (xorg/xserver/xorg-server-1.20.13.tar.xz) = 5122260
3
SIZE (xorg/xserver/xorg-server-1.20.13.tar.xz) = 5178288
(-)b/x11-servers/xorg-server/files/patch-configure (-4 / +4 lines)
Lines 97-103 Link Here
97
 pkg_failed=no
97
 pkg_failed=no
98
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
98
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
99
@@ -25884,11 +25924,12 @@ else
99
@@ -25884,11 +25924,12 @@ else
100
 $as_echo "yes" >&6; }
100
 printf "%s\n" "yes" >&6; }
101
 	HAVE_LIBUDEV=yes
101
 	HAVE_LIBUDEV=yes
102
 fi
102
 fi
103
-if test "x$CONFIG_UDEV" = xauto; then
103
-if test "x$CONFIG_UDEV" = xauto; then
Lines 105-111 Link Here
105
+	if test "x$CONFIG_UDEV" = xauto; then
105
+	if test "x$CONFIG_UDEV" = xauto; then
106
+		CONFIG_UDEV="$HAVE_LIBUDEV"
106
+		CONFIG_UDEV="$HAVE_LIBUDEV"
107
 
107
 
108
 $as_echo "#define HAVE_LIBUDEV 1" >>confdefs.h
108
 printf "%s\n" "#define HAVE_LIBUDEV 1" >>confdefs.h
109
 
109
 
110
+	fi
110
+	fi
111
 fi
111
 fi
Lines 133-139 Link Here
133
 
133
 
134
-if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then
134
-if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then
135
+if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno && test "x$CONFIG_DEVD" = xno; then
135
+if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno && test "x$CONFIG_DEVD" = xno; then
136
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
136
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
137
-             ***********************************************
137
-             ***********************************************
138
-             Neither HAL nor udev backend will be enabled.
138
-             Neither HAL nor udev backend will be enabled.
139
+             *****************************************************
139
+             *****************************************************
Lines 141-147 Link Here
141
              Input device hotplugging will not be available!
141
              Input device hotplugging will not be available!
142
-             ***********************************************" >&5
142
-             ***********************************************" >&5
143
+             *****************************************************" >&5
143
+             *****************************************************" >&5
144
 $as_echo "$as_me: WARNING:
144
 printf "%s\n" "$as_me: WARNING:
145
-             ***********************************************
145
-             ***********************************************
146
-             Neither HAL nor udev backend will be enabled.
146
-             Neither HAL nor udev backend will be enabled.
147
+             *****************************************************
147
+             *****************************************************

Return to bug 260526