[PATCH 18/54] Move RECORD from external module to built-in

[Daniel Stone]

From: Tomas Carnecky <tom at dbservice.com>

Rather than languishing in its own special module, move RECORD into the
core server.

Signed-off-by: Tomas Carnecky <tom at dbservice.com>
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
Reviewed-by: Jamey Sharp <jamey at minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 configure.ac                   |    2 +-
 hw/xfree86/common/xf86Config.c |    3 ---
 hw/xfree86/dixmods/Makefile.am |   11 +----------
 hw/xfree86/dixmods/recordmod.c |   42 ----------------------------------------
 hw/xfree86/loader/loadmod.c    |    1 +
 include/extinit.h              |    2 +-
 mi/miinitext.c                 |    3 +++
 7 files changed, 7 insertions(+), 57 deletions(-)
 delete mode 100644 hw/xfree86/dixmods/recordmod.c

diff --git a/configure.ac b/configure.ac
index 13628f5..fc5e2d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1605,7 +1605,7 @@ if test "x$XORG" = xyes; then
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
-	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $DBE_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB"
+	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB"
 
 	dnl ==================================================================
 	dnl symbol visibility
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index ce2c10a..7b68e35 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -113,9 +113,6 @@ static ModuleDefault ModuleDefaults[] = {
 #ifdef GLXEXT
     {.name = "glx",.toLoad = TRUE,.load_opt = NULL},
 #endif
-#ifdef XRECORD
-    {.name = "record",.toLoad = TRUE,.load_opt = NULL},
-#endif
 #ifdef XF86DRI
     {.name = "dri",.toLoad = TRUE,.load_opt = NULL},
 #endif
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index 827b952..3aa7d27 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -6,17 +6,12 @@ if GLX
 GLXMODS = libglx.la
 endif
 
-if RECORD
-RECORDMOD = librecord.la
-endif
-
 module_LTLIBRARIES = libfb.la \
                      libwfb.la \
                      libshadow.la
 
 extsmoduledir = $(moduledir)/extensions
-extsmodule_LTLIBRARIES = $(RECORDMOD) \
-                         $(GLXMODS)
+extsmodule_LTLIBRARIES = $(GLXMODS)
 
 AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
 INCLUDES = @XORG_INCS@ \
@@ -44,10 +39,6 @@ endif
 endif
 libglx_la_SOURCES = glxmodule.c
 
-librecord_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
-librecord_la_LIBADD = $(top_builddir)/record/librecord.la
-librecord_la_SOURCES = recordmod.c
-
 libshadow_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
 libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la
 if NO_UNDEFINED
diff --git a/hw/xfree86/dixmods/recordmod.c b/hw/xfree86/dixmods/recordmod.c
deleted file mode 100644
index 4f8eb97..0000000
--- a/hw/xfree86/dixmods/recordmod.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-#include "extinit.h"
-
-extern Bool noTestExtensions;
-
-static MODULESETUPPROTO(recordSetup);
-
-static ExtensionModule recordExt = {
-    RecordExtensionInit,
-    "RECORD",
-    &noTestExtensions,
-    NULL,
-    NULL
-};
-
-static XF86ModuleVersionInfo VersRec = {
-    "record",
-    MODULEVENDORSTRING,
-    MODINFOSTRING1,
-    MODINFOSTRING2,
-    XORG_VERSION_CURRENT,
-    1, 13, 0,
-    ABI_CLASS_EXTENSION,
-    ABI_EXTENSION_VERSION,
-    MOD_CLASS_EXTENSION,
-    {0, 0, 0, 0}
-};
-
-_X_EXPORT XF86ModuleData recordModuleData = { &VersRec, recordSetup, NULL };
-
-static pointer
-recordSetup(pointer module, pointer opts, int *errmaj, int *errmin)
-{
-    LoadExtension(&recordExt, FALSE);
-
-    /* Need a non-NULL return value to indicate success */
-    return (pointer) 1;
-}
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 99f06c2..9ce5813 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -834,6 +834,7 @@ static const char *compiled_in_modules[] = {
     "i2c",
     "ramdac",
     "dbe",
+    "record",
     NULL
 };
 
diff --git a/include/extinit.h b/include/extinit.h
index 539e28d..2755e30 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -97,7 +97,7 @@ extern Bool noRRExtension;
 extern void RRExtensionInit(void);
 #endif
 
-#if defined(XRECORD) && !defined(XorgLoader)
+#if defined(XRECORD)
 extern void RecordExtensionInit(void);
 #endif
 
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 09a815a..0d87294 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -400,6 +400,9 @@ static ExtensionModule staticExtensions[] = {
 #ifdef DBE
     {DbeExtensionInit, "DOUBLE-BUFFER", &noDbeExtension, NULL},
 #endif
+#ifdef XRECORD
+    {RecordExtensionInit, "RECORD", &noTestExtensions, NULL},
+#endif
 };
 
  /*ARGSUSED*/ void
-- 
1.7.10.4