Removing dependency of X11, dri2proto,libdri2, xfixes.

gbs build successful for wayland repository
Signed-off-by: Barun Kumar Singh <barun.singh@samsung.com>
Change-Id: I1c52142a6680db4e5649cf17e4a213950eae4db0

diff --git a/config/odroid/gstomx.conf b/config/odroid/gstomx.conf
index 5675d97..571e378 100755 (executable)
--- a/config/odroid/gstomx.conf
+++ b/config/odroid/gstomx.conf
@@ -62,7 +62,7 @@ in-port-index=0
 out-port-index=1
 hacks=no-component-role
 
-[omxih263enc]
+[omxh263enc]
 type-name=GstOMXH263Enc
 core-name=/usr/lib/libExynosOMX_Core.so
 component-name=OMX.Exynos.H263.Encoder

diff --git a/configure.ac b/configure.ac
index 8f33a99..fbf2769 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -329,33 +329,13 @@ AC_SUBST(GST_PLUGIN_LDFLAGS)
 
 dnl *** output files ***
 
-dnl use dri2proto
-PKG_CHECK_MODULES(DRI2PROTO, dri2proto)
-AC_SUBST(DRI2PROTO_CFLAGS)
-AC_SUBST(DRI2PROTO_LIBS)
 
 dnl drm buffer
-PKG_CHECK_MODULES(X11, x11)
-AC_SUBST(X11_LDFLAGS)
-AC_SUBST(X11_CFLAGS)
-AC_SUBST(X11_LIBS)
-PKG_CHECK_MODULES(DRI2, libdri2)
-AC_SUBST(DRI2_LDFLAGS)
-AC_SUBST(DRI2_CFLAGS)
-AC_SUBST(DRI2_LIBS)
-
-PKG_CHECK_MODULES(DRM, libdrm)
-AC_SUBST(DRM_CFLAGS)
-AC_SUBST(DRM_LIBS)
 
 PKG_CHECK_MODULES(TBM, libtbm)
 AC_SUBST(TBM_CFLAGS)
 AC_SUBST(TBM_LIBS)
 
-PKG_CHECK_MODULES(XFIXES, xfixes)
-AC_SUBST(XFIXES_LDFLAGS)
-AC_SUBST(XFIXES_CFLAGS)
-AC_SUBST(XFIXES_LIBS)
 AC_CONFIG_FILES(
 Makefile
 omx/Makefile

diff --git a/omx/Makefile.am b/omx/Makefile.am
index 9eb7103..3b7f541 100755 (executable)
--- a/omx/Makefile.am
+++ b/omx/Makefile.am
@@ -56,11 +56,8 @@ libgstomx_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS) \
-       $(TBM_CFLAGS) \
-       $(X11_CFLAGS) \
-       $(DRI2_CFLAGS) \
-       $(DRM_SLP_CFLAGS) \
-       $(XFIXES_CFLAGS)
+       $(TBM_CFLAGS)
+#      $(DRM_SLP_CFLAGS)
 libgstomx_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
        -lgstaudio-@GST_API_VERSION@ \
@@ -68,18 +65,12 @@ libgstomx_la_LIBADD = \
        -lgstvideo-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
-       $(TBM_LIBS) \
-       $(X11_LIBS) \
-       $(DRI2_LIBS) \
-       $(DRM_SLP_LIBS) \
-       $(XFIXES_LIBS)
+       $(TBM_LIBS)
+#      $(DRM_SLP_LIBS)
 libgstomx_la_LDFLAGS = \
        $(GST_PLUGIN_LDFLAGS) \
-       $(TBM_LDFLAGS) \
-       $(X11_LDFLAGS) \
-       $(DRI2_LDFLAGS) \
-       $(DRM_SLP_LDFLAGS) \
-       $(XFIXES_LDFLAGS)
+       $(TBM_LDFLAGS)
+#      $(DRM_SLP_LDFLAGS)
 
 
 EXTRA_DIST = \

diff --git a/omx/gstomx.h b/omx/gstomx.h
index 5508123..37918a0 100644 (file)
--- a/omx/gstomx.h
+++ b/omx/gstomx.h
@@ -203,9 +203,9 @@ struct _TBMOutputBuffer
     GList *buffers;
 };
 
-typedef struct EnableGemBuffersParams EnableGemBuffersParams;
+typedef struct _EnableGemBuffersParams EnableGemBuffersParams;
 
-struct EnableGemBuffersParams
+struct _EnableGemBuffersParams
 {
   OMX_U32 nSize;
   OMX_VERSIONTYPE nVersion;

diff --git a/packaging/gst-omx.spec b/packaging/gst-omx.spec
index ca83e6e..401cd9c 100644 (file)
--- a/packaging/gst-omx.spec
+++ b/packaging/gst-omx.spec
@@ -10,13 +10,7 @@ Source1001:     gst-omx.manifest
 BuildRequires:  which
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
-
-BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(dri2proto)
-BuildRequires: pkgconfig(libdri2)
-BuildRequires: pkgconfig(libdrm)
 BuildRequires: pkgconfig(libtbm)
-BuildRequires: pkgconfig(xfixes)
 
 %description
 gst-openmax is a GStreamer plug-in that allows communication with OpenMAX IL components.