Build with hal-rootstrap

Change-Id: I6d6edcc1ac9b95a609ca100d872d472613861697

diff --git a/configure.ac b/configure.ac
index b6c55a9524d1aa757495c783cccd89107c2b82b2..33901e2a8d4995492499b11ad0b2bcae90486fd4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,18 +23,8 @@ LT_INIT([disable-static])
 # Enable quiet compiles on automake 1.11.
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-PKG_CHECK_MODULES(UDEV, libudev, [udev=yes], [udev=no])
+PKG_CHECK_MODULES(LIBHAL_BACKEND_TDM_EXYNOS_DECONFB, hal-rootstrap)
 
-PKG_CHECK_MODULES(LIBHAL_BACKEND_TDM_EXYNOS_DECONFB, hal-api-common hal-api-tdm hal-api-tbm libtbm libdrm libdrm_exynos dlog pixman-1)
-
-if test x"$udev" = xyes; then
-  AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection])
-
-       LIBHAL_BACKEND_TDM_EXYNOS_DECONFB_CFLAGS="$LIBHAL_BACKEND_TDM_EXYNOS_DECONFB_CFLAGS $UDEV_CFLAGS"
-       LIBHAL_BACKEND_TDM_EXYNOS_DECONFB_LIBS="$LIBHAL_BACKEND_TDM_EXYNOS_DECONFB_LIBS $UDEV_LIBS"
-fi
-
-# for libhal-backend-tdm-exynos-deconfb
 AC_SUBST(LIBHAL_BACKEND_TDM_EXYNOS_DECONFB_CFLAGS)
 AC_SUBST(LIBHAL_BACKEND_TDM_EXYNOS_DECONFB_LIBS)
 

diff --git a/packaging/hal-backend-tdm-exynos-deconfb.spec b/packaging/hal-backend-tdm-exynos-deconfb.spec
index c17357faa744c480ae110fb188c85f20d5d6e182..ccbf2c4f95524f85e5fe763467cb7ab2f27f8200 100644 (file)
--- a/packaging/hal-backend-tdm-exynos-deconfb.spec
+++ b/packaging/hal-backend-tdm-exynos-deconfb.spec
@@ -7,15 +7,7 @@ License:        MIT
 Source0:        %{name}-%{version}.tar.gz
 Source1001:     %{name}.manifest
 
-BuildRequires: pkgconfig(libdrm)
-BuildRequires: pkgconfig(libdrm_exynos)
-BuildRequires: pkgconfig(libudev)
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(libtbm)
-BuildRequires: pkgconfig(hal-api-common)
-BuildRequires: pkgconfig(hal-api-tdm)
-BuildRequires: pkgconfig(hal-api-tbm)
-BuildRequires: pkgconfig(pixman-1)
+BuildRequires: pkgconfig(hal-rootstrap)
 ExclusiveArch: %{arm} aarch64
 
 %description

diff --git a/src/tdm_backend_exynos.c b/src/tdm_backend_exynos.c
index 3a64ce2d9dee8a0099a27f6e762a3583b578b550..c3e70e30e7d6a2da3d9e19511b9fbe2e2f0fa4f6 100644 (file)
--- a/src/tdm_backend_exynos.c
+++ b/src/tdm_backend_exynos.c
@@ -33,10 +33,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include "tdm_backend_exynos.h"
-
-#if HAVE_UDEV
 #include <libudev.h>
-#endif
 
 #define SET_DRM_IRQ
 
@@ -48,10 +45,6 @@ _tdm_exynos_open_drm(void)
        int fd = -1;
 
        fd = drmOpen(DRM_DRV_NAME, NULL);
-       if (fd < 0)
-               TDM_BACKEND_ERR("Cannot open '%s' drm", DRM_DRV_NAME);
-
-#ifdef HAVE_UDEV
        if (fd < 0) {
                struct udev *udev;
                struct udev_enumerate *e;
@@ -107,9 +100,8 @@ _tdm_exynos_open_drm(void)
                udev_enumerate_unref(e);
                udev_unref(udev);
        }
-close_l:
-#endif
 
+close_l:
 #ifdef SET_DRM_IRQ
        drmCtlInstHandler(fd, 78);
 #endif
@@ -376,11 +368,13 @@ hal_backend_tdm_exynos_init(void **data)
                backend_data->pp_funcs->pp_set_done_handler = exynos_pp_v4l2_set_done_handler;
        }
 
+#ifdef ENABLE_CAPTURE
        backend_data->capture_funcs->capture_destroy = exynos_capture_destroy;
        backend_data->capture_funcs->capture_set_info = exynos_capture_set_info;
        backend_data->capture_funcs->capture_attach = exynos_capture_attach;
        backend_data->capture_funcs->capture_commit = exynos_capture_commit;
        backend_data->capture_funcs->capture_set_done_handler = exynos_capture_set_done_handler;
+#endif
 
        TDM_BACKEND_INFO("init success!");
 

diff --git a/src/tdm_backend_exynos_types.h b/src/tdm_backend_exynos_types.h
index 03031409e341359a216eb59b77ed97cd2f33e862..a83a392aec898d57cfab6253bb12b953f6750176 100644 (file)
--- a/src/tdm_backend_exynos_types.h
+++ b/src/tdm_backend_exynos_types.h
@@ -54,10 +54,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tbm_surface_internal.h>
 #include <tbm_surface_queue.h>
 
-#include <hal-common.h>
+#include <hal-common-interface.h>
 #include <hal-tdm-types.h>
 #include <hal-tdm-interface.h>
-#include <pixman.h>
 
 #include "tdm_list.h"
 #include "tdm_exynos_format.h"

diff --git a/src/tdm_backend_log.c b/src/tdm_backend_log.c
index c15e18280c52fb746831294e7dff2fd70cf93790..1a2be81fb85ccb58df2283f49ad94803bc7d6125 100644 (file)
--- a/src/tdm_backend_log.c
+++ b/src/tdm_backend_log.c
@@ -56,7 +56,7 @@ _tdm_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/tdm_exynos_capture.c b/src/tdm_exynos_capture.c
index 196bece769ee4a602279fd6266fc762e14df9287..a10eb7b0e733888d81105ddaecaa94c38535bee6 100644 (file)
--- a/src/tdm_exynos_capture.c
+++ b/src/tdm_exynos_capture.c
@@ -34,6 +34,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "tdm_backend_exynos.h"
 
+#ifdef ENABLE_CAPTURE
 typedef struct _tdm_exynos_capture_buffer {
        int index;
        tbm_surface_h ui_buffer;
@@ -907,4 +908,4 @@ exynos_capture_set_done_handler(hal_tdm_capture *capture, hal_tdm_capture_done_h
 
        return HAL_TDM_ERROR_NONE;
 }
-
+#endif