Build with hal-rootstrap

Change-Id: I1bba14d04f328af53600643116f1610655516a98

diff --git a/configure.ac b/configure.ac
index 5a9cf35..e5a78d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -36,13 +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_EXYNOS, libdrm_exynos)
-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(SYSTEM_INFO, capi-system-info)
+PKG_CHECK_MODULES(LIBHAL_BACKEND_TBM_EXYNOS, hal-rootstrap)
+
+AC_SUBST(LIBHAL_BACKEND_TBM_EXYNOS_CFLAGS)
+AC_SUBST(LIBHAL_BACKEND_TBM_EXYNOS_LIBS)
 
 # set the data dir for the tdm config
 DEFAULT_HAL_LIBDIR="/hal/lib"
@@ -61,12 +58,6 @@ if test "x$BACKEND_CTRL" = xyes; then
     AC_DEFINE(ALWAYS_BACKEND_CTRL, 1, [Enable always backend ctrl])
 fi
 
-LIBHAL_BACKEND_TBM_EXYNOS_CFLAGS="$HAL_API_COMMON_CFLAGS $HAL_API_TBM_CFLAGS $LIBDRM_CFLAGS $LIBDRM_EXYNOS_CFLAGS $DLOG_CFLAGS $LIBUDEV_CFLAGS $SYSTEM_INFO_CFLAGS"
-LIBHAL_BACKEND_TBM_EXYNOS_LIBS="$HAL_API_COMMON_LIBS $HAL_API_TBM_LIBS $LIBDRM_LIBS $LIBDRM_EXYNOS_LIBS $DLOG_LIBS $LIBUDEV_LIBS $SYSTEM_INFO_LIBS"
-
-AC_SUBST(LIBHAL_BACKEND_TBM_EXYNOS_CFLAGS)
-AC_SUBST(LIBHAL_BACKEND_TBM_EXYNOS_LIBS)
-
 AC_OUTPUT([
        Makefile
        src/Makefile])

diff --git a/packaging/hal-backend-tbm-exynos.spec b/packaging/hal-backend-tbm-exynos.spec
index 596d930..b07b13e 100644 (file)
--- a/packaging/hal-backend-tbm-exynos.spec
+++ b/packaging/hal-backend-tbm-exynos.spec
@@ -7,13 +7,7 @@ Group:          System/Libraries
 Source0:        %{name}-%{version}.tar.gz
 Source1001:     %{name}.manifest
 
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(libdrm_exynos)
-BuildRequires:  pkgconfig(hal-api-common)
-BuildRequires:  pkgconfig(hal-api-tbm)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(capi-system-info)
+BuildRequires:  pkgconfig(hal-rootstrap)
 ExclusiveArch:  %{arm} aarch64
 
 %description

diff --git a/src/tbm_backend_exynos.c b/src/tbm_backend_exynos.c
index 5dcd2e9..ee356fd 100644 (file)
--- a/src/tbm_backend_exynos.c
+++ b/src/tbm_backend_exynos.c
@@ -48,7 +48,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <xf86drm.h>
 #include <exynos_drm.h>
 #include <pthread.h>
-#include <hal-common.h>
+#include <hal-common-interface.h>
 #include <hal-tbm-types.h>
 #include <hal-tbm-interface.h>
 #include <system_info.h>

diff --git a/src/tbm_backend_log.c b/src/tbm_backend_log.c
index 1e5e590..a4ea597 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