use xdbg plist

Change-Id: I00b8f5d4f110ab5bf9a2c5770ccec7537d3a942b

diff --git a/configure.ac b/configure.ac
index 8bebed3..6b63778 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -75,9 +75,10 @@ EMULFB_LIBS=""
 PKG_CHECK_MODULES(DLOG, dlog)
 PKG_CHECK_MODULES(DRM, libdrm)
 PKG_CHECK_MODULES(PIXMAN, pixman-1)
+PKG_CHECK_MODULES(XDBG, xdbg)
 
-EMULFB_CFLAGS="$EMULFB_CFLAGS $DLOG_CFLAGS $PIXMAN_CFLAGS $DRM_CFLAGS "
-EMULFB_LIBS="$EMULFB_LIBS $DLOG_LIBS $PIXMAN_LIBS $DRM_LIBS "
+EMULFB_CFLAGS="$EMULFB_CFLAGS $DLOG_CFLAGS $PIXMAN_CFLAGS $DRM_CFLAGS $XDBG_CFLAGS "
+EMULFB_LIBS="$EMULFB_LIBS $DLOG_LIBS $PIXMAN_LIBS $DRM_LIBS $XDBG_LIBS "
 
 
 AM_CONDITIONAL(ENABLE_ARM, [test "x$ARM" = xyes])

diff --git a/packaging/xorg-x11-drv-emulfb.spec b/packaging/xorg-x11-drv-emulfb.spec
index 5677862..15cf4a5 100644 (file)
--- a/packaging/xorg-x11-drv-emulfb.spec
+++ b/packaging/xorg-x11-drv-emulfb.spec
@@ -3,7 +3,7 @@
 
 Name:       xorg-x11-drv-emulfb
 Summary:    X.Org X server driver for sdk emulation
-Version:    0.5.6
+Version:    0.5.7
 Release:    1
 #ExclusiveArch:  %arm
 Group:      System/X Hardware Support
@@ -22,6 +22,7 @@ BuildRequires:  pkgconfig(resourceproto)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(pixman-1)
+BuildRequires:  pkgconfig(xdbg)
 
 %description
 This package provides the driver for sdk emulation

diff --git a/src/fbdev.c b/src/fbdev.c
index 5225a01..45c1f19 100644 (file)
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -62,6 +62,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sys/ioctl.h>
 #include <linux/fb.h>
 
+#if USE_XDBG
+#include "xdbg.h"
+#endif
+
 /* prototypes */
 static const OptionInfoRec *   FBDevAvailableOptions(int chipid, int busid);
 static void    FBDevIdentify(int flags);
@@ -713,6 +717,10 @@ FBDevScreenInit(ScreenPtr pScreen, int argc, char **argv)
     /* register the event hook */
     fbdevTraceInstallHooks ();
 
+#if USE_XDBG
+    xDbgLogPListInit (pScreen);
+#endif
+
        return TRUE;
 }
 

diff --git a/src/fbdev.h b/src/fbdev.h
index c79d5be..9839e45 100644 (file)
--- a/src/fbdev.h
+++ b/src/fbdev.h
@@ -57,6 +57,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define ADAPTOR_NUM  2
 
+#define USE_XDBG 1
+
 /* FBDev driver private data structure to hold the driver's screen-specific data */
 typedef struct {
        unsigned char *fbstart; /* start memory point of framebuffer: (fbmem + fboff) */