Fix build errors in GStreamer 1.24.10

- could not find G_LIKELY()
- Add GLIB_CFLAGS, GLIB_LIBS
- remove unused value

[Version] 0.4.4
[Issue Type] Fix bugs

Change-Id: I41117121830127cfc1c9b6145af4d36444567ff6

diff --git a/packaging/libmm-wfd.spec b/packaging/libmm-wfd.spec
index c35ea869f2dd11a20a598036cb2856865c2c3a64..cc71a08dcda343c4e44301bdd4b25d49541a0671 100644 (file)
--- a/packaging/libmm-wfd.spec
+++ b/packaging/libmm-wfd.spec
@@ -1,6 +1,6 @@
 Name:       libmm-wfd
 Summary:    Multimedia Framework Wifi-Display Library
-Version:    0.4.3
+Version:    0.4.4
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -8,6 +8,7 @@ Source0:    %{name}-%{version}.tar.gz
 Requires(post):  /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 BuildRequires: pkgconfig(mm-common)
+BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(gstreamer-1.0)
 BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires: pkgconfig(gstreamer-video-1.0)

diff --git a/src/Makefile.am b/src/Makefile.am
index 90fcaccabbc3f8dc13f54f30b01c8f01b4fbe873..9d0a40c4983df45638b2332fd4955d122ed6293d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,6 +34,7 @@ libmmfwfdsink_la_CFLAGS = -I$(srcdir)/include \
                        $(CAPI_SYSTEM_INFO_CFLAGS) \
                        $(RM_CFLAGS) \
                        $(RC_CFLAGS) \
+                       $(GLIB_CFLAGS) \
                        $(MM_DISPLAY_INTERFACE_CFLAGS)
 
 libmmfwfdsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
@@ -54,6 +55,7 @@ libmmfwfdsink_la_LIBADD = $(GST_LIBS) \
                        $(GST_VIDEO_LIBS) \
                        $(RM_LIBS) \
                        $(RC_LIBS) \
+                       $(GLIB_LIBS) \
                        $(MM_DISPLAY_INTERFACE_LIBS)
 
 libmmfwfdsink_la_CFLAGS += $(MMLOG_CFLAGS) -DMMF_LOG_OWNER=0x02000000 -DMMF_DEBUG_PREFIX=\"MMF-WFD-SINK\"

diff --git a/src/mm_wfd_sink_config.c b/src/mm_wfd_sink_config.c
index 1fecc518e4395dd2d0c777ceb4524d04fc98346a..ecaebe9f30766db35281a0f46e59fdd52b43ee36 100644 (file)
--- a/src/mm_wfd_sink_config.c
+++ b/src/mm_wfd_sink_config.c
@@ -20,6 +20,7 @@
 #define _GNU_SOURCE
 #include <stdlib.h>
 #include <system_info.h>
+#include <glib.h>
 #include "mm_wfd_sink_config.h"
 #include "mm_wfd_sink_dlog.h"
 

diff --git a/src/mm_wfd_sink_priv.c b/src/mm_wfd_sink_priv.c
index e3fb8f0b54ea9f58b4f1247b8ef25e09c7d6c3ff..8a618b3552e9677d9255729d979881d5e52c1577 100644 (file)
--- a/src/mm_wfd_sink_priv.c
+++ b/src/mm_wfd_sink_priv.c
@@ -4798,7 +4798,6 @@ int _mm_wfd_sink_set_display_overlay(mm_wfd_sink_t *wfd_sink, void *display_obje
        Evas_Object *obj = NULL;
        void *object = display_object;
        const char *object_type = NULL;
-       int ret = 0;
        pid_t pid = getpid();
        pid_t tid = syscall(SYS_gettid);