Build with hal-rootstrap

Change-Id: I3aabc254435ca8d8ed8cb51e5e1b735f6b2d3951

diff --git a/configure.ac b/configure.ac
index 001b8d0e6fb96ad6dd89da5845f77d4029f0e70d..dd24c568e42e8759970bf4c68e262d8db7edaf59 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_VC4, hal-rootstrap)
+
+AC_SUBST(LIBHAL_BACKEND_TBM_VC4_CFLAGS)
+AC_SUBST(LIBHAL_BACKEND_TBM_VC4_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_VC4_CFLAGS="$HAL_API_COMMON_CFLAGS $HAL_API_TBM_CFLAGS $LIBDRM_CFLAGS $DLOG_CFLAGS $LIBUDEV_CFLAGS"
-LIBHAL_BACKEND_TBM_VC4_LIBS="$HAL_API_COMMON_LIBS $HAL_API_TBM_LIBS $LIBDRM_LIBS $DLOG_LIBS $LIBUDEV_LIBS"
-
-AC_SUBST(LIBHAL_BACKEND_TBM_VC4_CFLAGS)
-AC_SUBST(LIBHAL_BACKEND_TBM_VC4_LIBS)
-
 AC_OUTPUT([
        Makefile
        src/Makefile])

diff --git a/packaging/hal-backend-tbm-vc4.spec b/packaging/hal-backend-tbm-vc4.spec
index 21a8be248f68b272724a60be3af437308d894025..a231b47d4d4f313a987608c7d20748c9b710e146 100644 (file)
--- a/packaging/hal-backend-tbm-vc4.spec
+++ b/packaging/hal-backend-tbm-vc4.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)
 ExclusiveArch:  %{arm} aarch64
 
 %description

diff --git a/src/tbm_backend_log.c b/src/tbm_backend_log.c
index 53322871c1d367be32ca489e8e1e6cf6ac004f02..94d1147694605385b1d006f5fbcd551c91e9019c 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_vc4.c b/src/tbm_backend_vc4.c
index f57260c30b88c075f0b7855816a51329c595da73..b9ba64898a14786829aca4f89b8ecc8758306f85 100644 (file)
--- a/src/tbm_backend_vc4.c
+++ b/src/tbm_backend_vc4.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 "tbm_bufmgr_tgl.h"