Build with hal-rootstrap

Change-Id: I21c62b10194b15adfc8b9f3c78b660dd95fec940

diff --git a/configure.ac b/configure.ac
index 48bcc28b0417e6ad22a85556565dab9d89ef9c6d..f1672b72b01b44f4b3d17132d8cd146a70a3f205 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_MESON, hal-rootstrap)
+
+AC_SUBST(LIBHAL_BACKEND_TBM_MESON_CFLAGS)
+AC_SUBST(LIBHAL_BACKEND_TBM_MESON_LIBS)
 
 # set the data dir for the tdm config
 DEFAULT_HAL_LIBDIR="/hal/lib"
@@ -50,11 +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_MESON_CFLAGS="$HAL_API_COMMON_CFLAGS $HAL_API_TBM_CFLAGS $LIBDRM_CFLAGS $LIBDRM_MESON_CFLAGS $DLOG_CFLAGS $LIBUDEV_CFLAGS"
-LIBHAL_BACKEND_TBM_MESON_LIBS="$HAL_API_COMMON_LIBS $HAL_API_TBM_LIBS $LIBDRM_LIBS $LIBDRM_MESON_LIBS $DLOG_LIBS $LIBUDEV_LIBS"
-AC_SUBST(LIBHAL_BACKEND_TBM_MESON_CFLAGS)
-AC_SUBST(LIBHAL_BACKEND_TBM_MESON_LIBS)
-
 AC_OUTPUT([
        Makefile
        src/Makefile])

diff --git a/packaging/hal-backend-tbm-meson.spec b/packaging/hal-backend-tbm-meson.spec
index 26bb23932be63a281dc62c7266b23db0579b44af..3629dfb64576243d4b5c8b58bcb4622ed5670006 100644 (file)
--- a/packaging/hal-backend-tbm-meson.spec
+++ b/packaging/hal-backend-tbm-meson.spec
@@ -7,11 +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(libudev)
+BuildRequires:  pkgconfig(hal-rootstrap)
 BuildRequires:  kernel-headers-amlogic
 BuildConflicts: linux-glibc-devel
 ExclusiveArch:  %{arm} aarch64

diff --git a/src/tbm_backend_log.c b/src/tbm_backend_log.c
index 92b447927974b6a77a998fcf9bd06c600ea8c3b8..18e48fd199dce92eaeaa195bd92777f06328e263 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_meson.c b/src/tbm_backend_meson.c
index 410be03582d9f588c41587d4a6fa76aad5c65c12..a5f28842420f6776ffe0f37c9b0070d68fb7c47d 100644 (file)
--- a/src/tbm_backend_meson.c
+++ b/src/tbm_backend_meson.c
@@ -47,7 +47,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <errno.h>
 #include <xf86drm.h>
 #include <pthread.h>
-#include <hal-common.h>
+#include <hal-common-interface.h>
 #include <hal-tbm-types.h>
 #include <hal-tbm-interface.h>
 #include <drm/meson_drm.h>