Support rpi target build

- Build option for rpi
 : --define "target rpi"

[Version] 1.16.2-6
[Profile] Common
[Issue Type] Update

Change-Id: I3617fa449aed3f9cd441ddb319ed69aa9dd843fa
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/config/Makefile.am b/config/Makefile.am
index 008e823..bdd809e 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1 +1 @@
-SUBDIRS = bellagio rpi tizonia zynqultrascaleplus
+SUBDIRS = bellagio tizonia zynqultrascaleplus

diff --git a/configure.ac b/configure.ac
index 537b1ed..6919922 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -261,6 +261,11 @@ fi
 
 if test "x$ac_cv_omx_target" = "xrpi"; then
     PKG_CHECK_MODULES([BRCMEGL], [brcmegl])
+    AC_SUBST(BRCMEGL_CFLAGS)
+    AC_SUBST(BRCMEGL_LIBS)
+    PKG_CHECK_MODULES([BCM_HOST], [bcm_host])
+    AC_SUBST(BCM_HOST_CFLAGS)
+    AC_SUBST(BCM_HOST_LIBS)
 fi
 
 AC_ARG_WITH([omx-header-path],
@@ -268,6 +273,7 @@ AC_ARG_WITH([omx-header-path],
         [omx_header_path="$withval"], [omx_header_path="none"])
 
 if test x"$omx_header_path" != x"none"; then
+    CFLAGS="$CFLAGS -I$omx_header_path"
     CPPFLAGS="$CPPFLAGS -I$omx_header_path"
 fi
 dnl Check for external OpenMAX IL headers

diff --git a/omx/Makefile.am b/omx/Makefile.am
index 176c530..5cf084e 100755 (executable)
--- a/omx/Makefile.am
+++ b/omx/Makefile.am
@@ -114,6 +114,15 @@ libgstomx_la_LIBADD = \
        $(GMODULE_NO_EXPORT_LIBS)
 libgstomx_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
+if USE_OMX_TARGET_RPI
+libgstomx_la_CFLAGS += \
+       $(BRCMEGL_CFLAGS) \
+       $(BCM_HOST_CFLAGS)
+libgstomx_la_LIBADD += \
+       $(BRCMEGL_LIBS) \
+       $(BCM_HOST_LIBS)
+endif
+
 EXTRA_DIST = \
        openmax \
        gstomxvp8dec.c \

diff --git a/packaging/gst-omx.spec b/packaging/gst-omx.spec
index 787c204..f2959e3 100755 (executable)
--- a/packaging/gst-omx.spec
+++ b/packaging/gst-omx.spec
@@ -1,7 +1,7 @@
 Name:           gst-omx
 Summary:        GStreamer plug-in that allows communication with OpenMAX IL components
 Version:        1.16.2
-Release:        5
+Release:        6
 License:        LGPL-2.1+
 Group:          Multimedia/Framework
 Source0:        %{name}-%{version}.tar.gz
@@ -12,6 +12,10 @@ BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:  pkgconfig(libtbm)
 BuildRequires:  pkgconfig(mm-common)
+%if "%{target}" == "rpi"
+BuildRequires:  pkgconfig(bcm_host)
+BuildRequires:  pkgconfig(brcmegl)
+%endif
 ExclusiveArch: %arm aarch64
 
 %description
@@ -28,10 +32,14 @@ cp %{SOURCE1001} .
 
 export CFLAGS+=" -DTIZEN_FEATURE_OMX"
 
+%if "%{target}" == "rpi"
+%configure --disable-static --prefix=/usr --with-omx-target=rpi --with-omx-header-path=/opt/vc/include/interface/vmcs_host/khronos/IL
+%else
 %ifarch aarch64
 %configure --disable-static --prefix=/usr --with-omx-target=exynos64
 %else
-%configure --disable-static --prefix=/usr --with-omx-target=exynos --enable-vp8 --enable-hevc
+%configure --disable-static --prefix=/usr --with-omx-target=exynos --enable-vp9
+%endif
 %endif
 
 make %{?jobs:-j%jobs}