Build with hal-rootstrap

Change-Id: I506bd4aaa22ab4c9293ffc5ee3e34ec714b9d0ee

diff --git a/configure.ac b/configure.ac
index 11087257938d98b28a366179f5f1f25ed97d795b..d53e34ecf0a8ffb4aea1bff30f946d5dc4fd89d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -36,11 +36,10 @@ AC_FUNC_ALLOCA
 # Enable quiet compiles on automake 1.11.
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-PKG_CHECK_MODULES(LIBDRM, libdrm)
-PKG_CHECK_MODULES(LIBDRM_VIGS, libdrm_vigs)
-PKG_CHECK_MODULES(HAL_API_COMMON, hal-api-common)
-PKG_CHECK_MODULES(HAL_API_TBM, hal-api-tbm)
-PKG_CHECK_MODULES(DLOG, dlog)
+PKG_CHECK_MODULES(LIBHAL_BACKEND_TBM_VIGS, hal-rootstrap)
+
+AC_SUBST(LIBHAL_BACKEND_TBM_VIGS_CFLAGS)
+AC_SUBST(LIBHAL_BACKEND_TBM_VIGS_LIBS)
 
 # set the data dir for the tdm config
 DEFAULT_HAL_LIBDIR="/hal/lib"
@@ -50,12 +49,6 @@ AC_ARG_WITH(hal-libdir, AS_HELP_STRING([--with-hal-libdir=PATH], [hal backend li
 AC_DEFINE_UNQUOTED(HAL_LIBDIR, "${HAL_LIBDIR}", [Directory for hal backend library path])
 AC_SUBST(HAL_LIBDIR)
 
-LIBHAL_BACKEND_TBM_VIGS_CFLAGS="$HAL_API_COMMON_CFLAGS $HAL_API_TBM_CFLAGS $LIBDRM_CFLAGS $LIBDRM_VIGS_CFLAGS $CAPI_CFLAGS $DLOG_CFLAGS "
-LIBHAL_BACKEND_TBM_VIGS_LIBS="$HAL_API_COMMON_LIBS $HAL_API_TBM_LIBS $LIBDRM_LIBS $LIBDRM_VIGS_LIBS $CAPI_LIBS $DLOG_LIBS "
-
-AC_SUBST(LIBHAL_BACKEND_TBM_VIGS_CFLAGS)
-AC_SUBST(LIBHAL_BACKEND_TBM_VIGS_LIBS)
-
 AC_OUTPUT([
        Makefile
        src/Makefile

diff --git a/packaging/hal-backend-tbm-vigs.spec b/packaging/hal-backend-tbm-vigs.spec
index 5be0694b1c4cb5b9cc6ff52dcf3163cdb5c29712..197ff4d9f2067acb0108e7629494e656c24333fd 100644 (file)
--- a/packaging/hal-backend-tbm-vigs.spec
+++ b/packaging/hal-backend-tbm-vigs.spec
@@ -7,10 +7,7 @@ Group:          System/Libraries
 Source0:        %{name}-%{version}.tar.gz
 Source1001:     %{name}.manifest
 
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(hal-api-common)
-BuildRequires:  pkgconfig(hal-api-tbm)
-BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(hal-rootstrap)
 
 %description
 description: hal tbm backend module for vigs

diff --git a/src/tbm_backend_log.c b/src/tbm_backend_log.c
index 6516221ca75f496ec1d31083208ac83b5c0ed826..969e46326ed0954198dc4cc8ef2a028f6f142ab1 100644 (file)
--- a/src/tbm_backend_log.c
+++ b/src/tbm_backend_log.c
@@ -56,7 +56,7 @@ _tbm_backend_log_dlog_print(int level, const char *fmt, va_list arg)
        default:
                return;
        }
-       __dlog_vprint(LOG_ID_SYSTEM, dlog_prio, LOG_TAG, fmt, arg);
+       dlog_vprint(dlog_prio, LOG_TAG, fmt, arg);
 }
 
 void

diff --git a/src/tbm_backend_vigs.c b/src/tbm_backend_vigs.c
index 490b081fb0f7aace8c13ca82d235153458404dd8..0e8e0da68c211ab7b00d80d31183084ac035ea82 100644 (file)
--- a/src/tbm_backend_vigs.c
+++ b/src/tbm_backend_vigs.c
@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <xf86drm.h>
-#include <hal-common.h>
+#include <hal-common-interface.h>
 #include <hal-tbm-types.h>
 #include <hal-tbm-interface.h>
 #include "tbm_backend_log.h"