From e12147e07f0af16a5849a3faca5d785a5bada4a1 Mon Sep 17 00:00:00 2001 From: "Sangjin, Sim" Date: Tue, 27 Jun 2017 13:55:52 +0900 Subject: [PATCH] Fix build error with TV profile Signed-off-by: Sangjin, Sim Change-Id: I4e1010d5577ceb50df55b09940eed2401ad14f53 Signed-off-by: Sangjin, Sim --- Makefile.am | 4 ++++ configure.ac | 11 +++++++++++ packaging/gst-plugins-base.spec | 2 ++ 3 files changed, 17 insertions(+) diff --git a/Makefile.am b/Makefile.am index 70e4499e0..3e22b050c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,11 @@ else SUBDIRS_EXT = endif +if HAVE_TV_PRODUCT +SUBDIRS_TOOLS = +else SUBDIRS_TOOLS = tools +endif SUBDIRS = \ pkgconfig \ diff --git a/configure.ac b/configure.ac index bd8292388..02c13ae8e 100644 --- a/configure.ac +++ b/configure.ac @@ -167,6 +167,17 @@ AC_ARG_ENABLE(tbmbuf, AC_HELP_STRING([--enable-use-tbmbuf], [use tbm buf]), [BOARD_USE_TBM_BUF=yes]) AM_CONDITIONAL([BOARD_USE_TBM_BUF], [test "x$BOARD_USE_TBM_BUF" = "xyes"]) +dnl Check for tv-product +AC_ARG_ENABLE(tv, AC_HELP_STRING([--enable-tv], [use tv]), + [ + case "${enableval}" in + yes) HAVE_TV_PRODUCT=yes ;; + no) HAVE_TV_PRODUCT=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-tv) ;; + esac + ],) +AM_CONDITIONAL([HAVE_TV_PRODUCT], [test "x$HAVE_TV_PRODUCT" = "xyes"]) + dnl check for gobject-introspection GOBJECT_INTROSPECTION_CHECK([1.31.1]) diff --git a/packaging/gst-plugins-base.spec b/packaging/gst-plugins-base.spec index aad3285c5..fa6667a96 100755 --- a/packaging/gst-plugins-base.spec +++ b/packaging/gst-plugins-base.spec @@ -17,7 +17,9 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: orc >= 0.4.16 BuildRequires: python +%if "%{TIZEN_PRODUCT_TV}" != "1" BuildRequires: update-desktop-files +%endif BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.31.1 BuildRequires: pkgconfig(alsa) >= 0.9.1 BuildRequires: pkgconfig(freetype2) >= 2.0.9 -- 2.34.1