Remove build warnings

Change-Id: Icb6d5af3c42e1361afebcfe9e504df46d9697ff1

diff --git a/exynos/libion/kernel-headers/linux/ion.h b/exynos/libion/kernel-headers/linux/ion.h
index bb145d183a1221892d9b802cfec97990c15eca97..fa0fe9f0028eb9787e33ebe3b32ed370a42de042 100755 (executable)
--- a/exynos/libion/kernel-headers/linux/ion.h
+++ b/exynos/libion/kernel-headers/linux/ion.h
@@ -102,5 +102,21 @@ struct ion_preload_data {
 #define ION_IOC_PRELOAD_ALLOC _IOW(ION_IOC_MAGIC, 8, struct ion_preload_data)
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, struct ion_custom_data)
+
+struct ion_handle;
+
+int ion_open();
+int ion_close(int fd);
+int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask,
+              unsigned int flags, ion_user_handle_t *handle);
+int ion_alloc_fd(int fd, size_t len, size_t align, unsigned int heap_mask,
+              unsigned int flags, int *handle_fd);
+int ion_sync_fd(int fd, int handle_fd);
+int ion_sync_fd_partial(int fd, int handle_fd, off_t offset, size_t len);
+int ion_free(int fd, ion_user_handle_t handle);
+int ion_map(int fd, ion_user_handle_t handle, size_t length, int prot,
+            int flags, off_t offset, unsigned char **ptr, int *map_fd);
+int ion_share(int fd, ion_user_handle_t handle, int *share_fd);
+int ion_import(int fd, int share_fd, ion_user_handle_t *handle);
 #endif
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

diff --git a/exynos/libvideocodec/Makefile.am b/exynos/libvideocodec/Makefile.am
index 41c658b4d08e8e5b45a58dc1cff5f6dfd530ed91..8dc3d6f54bd867f5fa78b6016698ec6536e2ffd6 100755 (executable)
--- a/exynos/libvideocodec/Makefile.am
+++ b/exynos/libvideocodec/Makefile.am
@@ -12,6 +12,7 @@ libExynosVideoApi_la_CFLAGS = -I$(CURDIR)/include \
                               -I$(CURDIR)/mfc_headers \
                               -I$(top_srcdir)/openmax/include/khronos \
                               -I$(top_srcdir)/openmax/osal \
+                              -I$(top_srcdir)/exynos/libion/kernel-headers/linux \
                               $(EXYNOSCOMMON_CFLAGS)
 
 libExynosVideoApi_la_CFLAGS += -DCID_SUPPORT -DUSE_DEFINE_H264_SEI_TYPE -DUSE_MFC_MEDIA -DUSE_ORIGINAL_HEADER \

diff --git a/exynos/libvideocodec/dec/ExynosVideoDecoder.c b/exynos/libvideocodec/dec/ExynosVideoDecoder.c
index 55a22ad32a1a1c1f10de27a1b1bb862746b2ef1b..d7931fa0c6c449129ab22fd41f02fa30b154b22f 100755 (executable)
--- a/exynos/libvideocodec/dec/ExynosVideoDecoder.c
+++ b/exynos/libvideocodec/dec/ExynosVideoDecoder.c
@@ -45,6 +45,7 @@
 #include "ExynosVideoDec.h"
 #include "ExynosVideo_OSAL_Dec.h"
 #include "OMX_Core.h"
+#include "ion.h"
 
 /* #define LOG_NDEBUG 0 */
 #ifdef LOG_TAG

diff --git a/exynos/libvideocodec/enc/ExynosVideoEncoder.c b/exynos/libvideocodec/enc/ExynosVideoEncoder.c
index 63d1a89588e6b2274d201a121d20fb08a440f00c..9d73ffee6cbcdbdbc49eaf5ae30d9f1e530885c4 100755 (executable)
--- a/exynos/libvideocodec/enc/ExynosVideoEncoder.c
+++ b/exynos/libvideocodec/enc/ExynosVideoEncoder.c
@@ -45,6 +45,7 @@
 #include "ExynosVideoEnc.h"
 #include "ExynosVideo_OSAL_Enc.h"
 #include "OMX_Core.h"
+#include "ion.h"
 
 /* #define LOG_NDEBUG 0 */
 #ifdef LOG_TAG

diff --git a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/openmax/component/video/dec/h264/library_register.c b/openmax/component/video/dec/h264/library_register.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/openmax/osal/Exynos_OSAL_Log.c b/openmax/osal/Exynos_OSAL_Log.c
index 04fc7a10fd9d8a0c3ddab2eaedd57e886ab88deb..24ef4e113b67edae2cb5628a6e001d6fd791af42 100755 (executable)
--- a/openmax/osal/Exynos_OSAL_Log.c
+++ b/openmax/osal/Exynos_OSAL_Log.c
@@ -33,6 +33,7 @@
 
 #include "Exynos_OSAL_Log.h"
 #include "Exynos_OSAL_ETC.h"
+#include "Exynos_OSAL_Memory.h"
 
 #ifdef USE_DLOG
 #include <dlog.h>

diff --git a/openmax/osal/Exynos_OSAL_SharedMemory.c b/openmax/osal/Exynos_OSAL_SharedMemory.c
index 21e83e16c2813ddad9568aaa9a5ed89d868996ce..a7b766e5ad143d2c76c64408ccf7e623022f24de 100755 (executable)
--- a/openmax/osal/Exynos_OSAL_SharedMemory.c
+++ b/openmax/osal/Exynos_OSAL_SharedMemory.c
@@ -38,7 +38,7 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#include <../libion/kernel-headers/linux/ion.h>
+#include "ion.h"
 #include "exynos_ion.h"
 
 #include "Exynos_OSAL_Mutex.h"

diff --git a/openmax/osal/Makefile.am b/openmax/osal/Makefile.am
index 47aac5b42d8231ee0781aa06b5a485687f71caaf..2dcd154c981d76692318cf75406d65a3fab75a1b 100755 (executable)
--- a/openmax/osal/Makefile.am
+++ b/openmax/osal/Makefile.am
@@ -19,6 +19,7 @@ libExynosOMX_OSAL_la_CFLAGS = -I$(top_srcdir)/openmax/include/khronos \
                               -I$(top_srcdir)/openmax/core \
                               -I$(top_srcdir)/openmax/osal \
                               -I$(top_srcdir)/openmax/component/common \
+                              -I$(top_srcdir)/exynos/libion/kernel-headers/linux \
                               -I$(top_srcdir)/exynos/libvideocodec/include
 libExynosOMX_OSAL_la_CFLAGS += -DUSE_KHRONOS_OMX_HEADER -DUSE_DMA_BUF -DUSE_METADATABUFFERTYPE -DUSE_STOREMETADATA
 libExynosOMX_OSAL_la_CFLAGS += -Wno-unused-label

diff --git a/packaging/libomxil-e7270-v4l2.spec b/packaging/libomxil-e7270-v4l2.spec
index b0a2bb4ce6b1f638e035e35f45140168ff472998..e513bed0f4871cdd80314df49ceec597415be49c 100755 (executable)
--- a/packaging/libomxil-e7270-v4l2.spec
+++ b/packaging/libomxil-e7270-v4l2.spec
@@ -3,7 +3,7 @@ Summary: OpenMAX IL for e7270-v4l2
 Version: 0.0.1
 License: Apache-2.0
 Group: Development/Libraries
-Release: 0
+Release: 1
 ExclusiveArch: %arm
 Source: %{name}-%{version}.tar.gz
 Requires(post): /sbin/ldconfig