Split off config/config.c into old/new patch so it applies for both

xorg-server versions.

Submitted by:	ak@


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1282 058c260c-8361-11dd-a0ac-aa2bafec7d09

4 files changed, 116 insertions, 60 deletions

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 7e66694..9198c4e 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -96,6 +96,11 @@ CONFIGURE_ARGS+=	--enable-config-hal=no
 
 .if ${PORT_OPTIONS:MDEVD}
 EXTRA_PATCHES+=		${FILESDIR}/extra-devd
+. if defined(WITH_NEW_XORG)
+EXTRA_PATCHES+=	${FILESDIR}/extra-new-config_devd
+. else
+EXTRA_PATCHES+=	${FILESDIR}/extra-old-config_devd
+. endif
 .endif
 
 .if ${PORT_OPTIONS:MAIGLX}
diff --git a/x11-servers/xorg-server/files/extra-devd b/x11-servers/xorg-server/files/extra-devd
index 6e23d03..1b63608 100644
--- a/x11-servers/xorg-server/files/extra-devd
+++ b/x11-servers/xorg-server/files/extra-devd
@@ -487,63 +487,3 @@ Index: config/devd.c
 +    RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
 +    close(sock_devd);
 +}
-Index: config/config.c
-@@ -55,6 +55,9 @@
- #elif defined(CONFIG_WSCONS)
-     if (!config_wscons_init())
-         ErrorF("[config] failed to initialise wscons\n");
-+#elif defined(CONFIG_DEVD)
-+     if (!config_devd_init())
-+         ErrorF("[config] failed to initialise devd\n");
- #endif
- }
- 
-@@ -73,6 +76,8 @@
-     config_dbus_core_fini();
- #elif defined(CONFIG_WSCONS)
-     config_wscons_fini();
-+#elif defined(CONFIG_DEVD)
-+     config_devd_fini();
- #endif
- }
- 
-Index: config/config-backends.h
-@@ -73,3 +73,8 @@
- int config_wscons_init(void);
- void config_wscons_fini(void);
- #endif
-+
-+#ifdef CONFIG_DEVD
-+int config_devd_init(void);
-+void config_devd_fini(void);
-+#endif
-Index: hw/xfree86/common/xf86Globals.c
-@@ -122,7 +122,8 @@
-     .log = LogNone,
-     .disableRandR = FALSE,
-     .randRFrom = X_DEFAULT,
--#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS)
-+#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) || \
-+	defined(CONFIG_DEVD)
-     .forceInputDevices = FALSE,
-     .autoAddDevices = TRUE,
-     .autoEnableDevices = TRUE
-Index: hw/xfree86/common/xf86Config.c
-@@ -1371,13 +1371,16 @@
-     }
- 
-     if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) {
--#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS)
-+#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) || \
-+		defined(CONFIG_DEVD)
-         const char *config_backend;
- 
- #if defined(CONFIG_HAL)
-         config_backend = "HAL";
- #elif defined(CONFIG_UDEV)
-         config_backend = "udev";
-+#elif defined(CONFIG_DEVD)
-+        config_backend = "devd";
- #else
-         config_backend = "wscons";
- #endif
diff --git a/x11-servers/xorg-server/files/extra-new-config_devd b/x11-servers/xorg-server/files/extra-new-config_devd
new file mode 100644
index 0000000..6825d5f
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-new-config_devd
@@ -0,0 +1,60 @@
+Index: config/config.c
+@@ -55,6 +55,9 @@
+ #elif defined(CONFIG_WSCONS)
+     if (!config_wscons_init())
+         ErrorF("[config] failed to initialise wscons\n");
++#elif defined(CONFIG_DEVD)
++     if (!config_devd_init())
++         ErrorF("[config] failed to initialise devd\n");
+ #endif
+ }
+ 
+@@ -73,6 +76,8 @@
+     config_dbus_core_fini();
+ #elif defined(CONFIG_WSCONS)
+     config_wscons_fini();
++#elif defined(CONFIG_DEVD)
++     config_devd_fini();
+ #endif
+ }
+ 
+Index: config/config-backends.h
+@@ -73,3 +73,8 @@
+ int config_wscons_init(void);
+ void config_wscons_fini(void);
+ #endif
++
++#ifdef CONFIG_DEVD
++int config_devd_init(void);
++void config_devd_fini(void);
++#endif
+Index: hw/xfree86/common/xf86Globals.c
+@@ -122,7 +122,8 @@
+     .log = LogNone,
+     .disableRandR = FALSE,
+     .randRFrom = X_DEFAULT,
+-#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS)
++#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) || \
++	defined(CONFIG_DEVD)
+     .forceInputDevices = FALSE,
+     .autoAddDevices = TRUE,
+     .autoEnableDevices = TRUE
+Index: hw/xfree86/common/xf86Config.c
+@@ -1371,13 +1371,16 @@
+     }
+ 
+     if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) {
+-#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS)
++#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) || \
++		defined(CONFIG_DEVD)
+         const char *config_backend;
+ 
+ #if defined(CONFIG_HAL)
+         config_backend = "HAL";
+ #elif defined(CONFIG_UDEV)
+         config_backend = "udev";
++#elif defined(CONFIG_DEVD)
++        config_backend = "devd";
+ #else
+         config_backend = "wscons";
+ #endif
diff --git a/x11-servers/xorg-server/files/extra-old-config_devd b/x11-servers/xorg-server/files/extra-old-config_devd
new file mode 100644
index 0000000..5b7be0a
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-old-config_devd
@@ -0,0 +1,51 @@
+Index: config/config.c
+@@ -48,6 +48,9 @@
+     else {
+ 	ErrorF("[config] failed to initialise D-Bus core\n");
+     }
++#elif defined(CONFIG_DEVD)
++     if (!config_devd_init())
++         ErrorF("[config] failed to initialise devd\n");
+ #endif
+ }
+ 
+@@ -62,5 +65,7 @@
+     config_dbus_fini();
+ # endif
+     config_dbus_core_fini();
++#elif defined(CONFIG_DEVD)
++     config_devd_fini();
+ #endif
+ }
+Index: config/config-backends.h
+@@ -57,3 +57,8 @@
+ int config_hal_init(void);
+ void config_hal_fini(void);
+ #endif
++
++#ifdef CONFIG_DEVD
++int config_devd_init(void);
++void config_devd_fini(void);
++#endif
+Index: hw/xfree86/common/xf86Globals.c
+@@ -132,7 +132,7 @@
+     .kbdCustomKeycodes          = FALSE,
+     .disableRandR               = FALSE,
+     .randRFrom                  = X_DEFAULT,
+-#ifdef CONFIG_HAL
++#if defined (CONFIG_HAL) || defined(CONFIG_DEVD)
+     .allowEmptyInput            = TRUE,
+     .autoAddDevices             = TRUE,
+     .autoEnableDevices          = TRUE
+Index: hw/xfree86/common/xf86Config.c
+@@ -1444,8 +1444,8 @@
+     }
+ 
+     if (xf86Info.allowEmptyInput && !(foundPointer && foundKeyboard)) {
+-#ifdef CONFIG_HAL
+-	xf86Msg(X_INFO, "The server relies on HAL to provide the list of "
++#if defined(CONFIG_HAL) || defined(CONFIG_DEVD)
++	xf86Msg(X_INFO, "The server relies on HAL/devd to provide the list of "
+ 	                "input devices.\n\tIf no devices become available, "
+ 	                "reconfigure HAL or disable AutoAddDevices.\n");
+ #else