Build with hal-rootstrap

Change-Id: Ie8656c924419da23fa8e4bbbdac56347caae8798

diff --git a/configure.ac b/configure.ac
index 59839c5c1f112e1a1da8bb4213ee14557e839bbc..0019a2ebbfedc80b8df4962856b9b2343a302587 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(HAL_API_COMMON, hal-api-common)
-PKG_CHECK_MODULES(HAL_API_TBM, hal-api-tbm)
-PKG_CHECK_MODULES(DLOG, dlog)
-PKG_CHECK_MODULES(LIBUDEV, libudev)
+PKG_CHECK_MODULES(LIBHAL_BACKEND_TBM_DUMB, hal-rootstrap)
+
+AC_SUBST(LIBHAL_BACKEND_TBM_DUMB_CFLAGS)
+AC_SUBST(LIBHAL_BACKEND_TBM_DUMB_LIBS)
 
 # set the data dir for the tbm config
 DEFAULT_HAL_LIBDIR="/hal/lib"
@@ -64,12 +63,6 @@ if test "x${have_dma_buf}" = "xyes" ; then
        AC_DEFINE(HAVE_DMA_BUF, 1, [Enable dma buf sync])
 fi
 
-LIBHAL_BACKEND_TBM_DUMB_CFLAGS="$HAL_API_COMMON_CFLAGS $HAL_API_TBM_CFLAGS $LIBDRM_CFLAGS $DLOG_CFLAGS $LIBUDEV_CFLAGS "
-LIBHAL_BACKEND_TBM_DUMB_LIBS="$HAL_API_COMMON_LIBS $HAL_API_TBM_LIBS $LIBDRM_LIBS $DLOG_LIBS $LIBUDEV_LIBS "
-
-AC_SUBST(LIBHAL_BACKEND_TBM_DUMB_CFLAGS)
-AC_SUBST(LIBHAL_BACKEND_TBM_DUMB_LIBS)
-
 AC_OUTPUT([
        Makefile
        src/Makefile])

diff --git a/packaging/hal-backend-tbm-dumb.spec b/packaging/hal-backend-tbm-dumb.spec
index fd0448bcea9f5b1eb59eb1c6a378f043611e539b..359233c235f759bd58c404dd847e018a0c47b11a 100644 (file)
--- a/packaging/hal-backend-tbm-dumb.spec
+++ b/packaging/hal-backend-tbm-dumb.spec
@@ -8,12 +8,7 @@ ExcludeArch:    i586
 Source0:        %{name}-%{version}.tar.gz
 Source1001:     %{name}.manifest
 
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(libtbm)
-BuildRequires:  pkgconfig(hal-api-common)
-BuildRequires:  pkgconfig(hal-api-tbm)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(hal-rootstrap)
 
 %description
 description: hal tbm backend module for drm dumb

diff --git a/src/tbm_backend_dumb.c b/src/tbm_backend_dumb.c
index 8e71b5bed742ceac22325a3e817e1d1adcb58efc..f36162e06c64b77c6699496f7e2a6bdfa5eb4915 100644 (file)
--- a/src/tbm_backend_dumb.c
+++ b/src/tbm_backend_dumb.c
@@ -48,7 +48,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include <pthread.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"

diff --git a/src/tbm_backend_log.c b/src/tbm_backend_log.c
index f7c16efb384e07529439cc9940817b77efe07667..ef91bf4ce0f50ee18cb3cbe390d3b7f518d40931 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