Change install path for HAL image

- The path is changed from /usr/lib to /hal/lib.
- Minor change
 : Remove unnecessary devel package.

[Version] 0.0.2-5
[Issue Type] HAL path

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

diff --git a/Makefile.am b/Makefile.am
index 90e25c3..92d75b5 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = exynos openmax
 
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = exynos openmax
 

-pcfiles = omxil-e9110-v4l2.pc \
-          srp.pc
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcfiles)
-EXTRA_DIST = $(pcfiles)
+#pcfiles = omxil-e9110-v4l2.pc \
+#          srp.pc
+#pkgconfigdir = $(libdir)/pkgconfig
+#pkgconfig_DATA = $(pcfiles)
+#EXTRA_DIST = $(pcfiles)

diff --git a/openmax/component/video/dec/h264/Makefile.am b/openmax/component/video/dec/h264/Makefile.am
index 81e6951..83e2126 100755 (executable)
--- a/openmax/component/video/dec/h264/Makefile.am
+++ b/openmax/component/video/dec/h264/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.AVC.Decoder.la
 lib_LTLIBRARIES = libOMX.Exynos.AVC.Decoder.la

-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx

 
 libOMX_Exynos_AVC_Decoder_la_SOURCES = Exynos_OMX_H264dec.c \
                                        library_register.c
 
 libOMX_Exynos_AVC_Decoder_la_SOURCES = Exynos_OMX_H264dec.c \
                                        library_register.c

diff --git a/openmax/component/video/dec/hevc/Makefile.am b/openmax/component/video/dec/hevc/Makefile.am
index 3e17b31..8ccb873 100755 (executable)
--- a/openmax/component/video/dec/hevc/Makefile.am
+++ b/openmax/component/video/dec/hevc/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.HEVC.Decoder.la
 lib_LTLIBRARIES = libOMX.Exynos.HEVC.Decoder.la

-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx

 
 libOMX_Exynos_HEVC_Decoder_la_SOURCES = Exynos_OMX_HEVCdec.c \
                                         library_register.c
 
 libOMX_Exynos_HEVC_Decoder_la_SOURCES = Exynos_OMX_HEVCdec.c \
                                         library_register.c

diff --git a/openmax/component/video/dec/mpeg2/Makefile.am b/openmax/component/video/dec/mpeg2/Makefile.am
index bdf0111..3f33c2b 100755 (executable)
--- a/openmax/component/video/dec/mpeg2/Makefile.am
+++ b/openmax/component/video/dec/mpeg2/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.MPEG2.Decoder.la
 lib_LTLIBRARIES = libOMX.Exynos.MPEG2.Decoder.la

-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx

 
 libOMX_Exynos_MPEG2_Decoder_la_SOURCES = Exynos_OMX_Mpeg2dec.c \
                                          library_register.c
 
 libOMX_Exynos_MPEG2_Decoder_la_SOURCES = Exynos_OMX_Mpeg2dec.c \
                                          library_register.c

diff --git a/openmax/component/video/dec/mpeg4/Makefile.am b/openmax/component/video/dec/mpeg4/Makefile.am
index 8370caa..d500eae 100755 (executable)
--- a/openmax/component/video/dec/mpeg4/Makefile.am
+++ b/openmax/component/video/dec/mpeg4/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.MPEG4.Decoder.la
 lib_LTLIBRARIES = libOMX.Exynos.MPEG4.Decoder.la

-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx

 
 libOMX_Exynos_MPEG4_Decoder_la_SOURCES = Exynos_OMX_Mpeg4dec.c \
                                          library_register.c
 
 libOMX_Exynos_MPEG4_Decoder_la_SOURCES = Exynos_OMX_Mpeg4dec.c \
                                          library_register.c

diff --git a/openmax/component/video/dec/vc1/Makefile.am b/openmax/component/video/dec/vc1/Makefile.am
index d0683a0..275785d 100755 (executable)
--- a/openmax/component/video/dec/vc1/Makefile.am
+++ b/openmax/component/video/dec/vc1/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.WMV.Decoder.la
 lib_LTLIBRARIES = libOMX.Exynos.WMV.Decoder.la

-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx

 
 libOMX_Exynos_WMV_Decoder_la_SOURCES = Exynos_OMX_Wmvdec.c \
                                        library_register.c
 
 libOMX_Exynos_WMV_Decoder_la_SOURCES = Exynos_OMX_Wmvdec.c \
                                        library_register.c

diff --git a/openmax/component/video/dec/vp8/Makefile.am b/openmax/component/video/dec/vp8/Makefile.am
index 14d7884..68350be 100755 (executable)
--- a/openmax/component/video/dec/vp8/Makefile.am
+++ b/openmax/component/video/dec/vp8/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.VP8.Decoder.la
 lib_LTLIBRARIES = libOMX.Exynos.VP8.Decoder.la

-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx

 
 libOMX_Exynos_VP8_Decoder_la_SOURCES = Exynos_OMX_Vp8dec.c \
                                        library_register.c
 
 libOMX_Exynos_VP8_Decoder_la_SOURCES = Exynos_OMX_Vp8dec.c \
                                        library_register.c

diff --git a/openmax/component/video/dec/vp9/Makefile.am b/openmax/component/video/dec/vp9/Makefile.am
index e4530a8..406c3a5 100755 (executable)
--- a/openmax/component/video/dec/vp9/Makefile.am
+++ b/openmax/component/video/dec/vp9/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.VP9.Decoder.la
 lib_LTLIBRARIES = libOMX.Exynos.VP9.Decoder.la

-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx

 
 libOMX_Exynos_VP9_Decoder_la_SOURCES = Exynos_OMX_Vp9dec.c \
                                        library_register.c
 
 libOMX_Exynos_VP9_Decoder_la_SOURCES = Exynos_OMX_Vp9dec.c \
                                        library_register.c

diff --git a/openmax/component/video/enc/h264/Makefile.am b/openmax/component/video/enc/h264/Makefile.am
index 66a113b..33f0daf 100755 (executable)
--- a/openmax/component/video/enc/h264/Makefile.am
+++ b/openmax/component/video/enc/h264/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.AVC.Encoder.la
 lib_LTLIBRARIES = libOMX.Exynos.AVC.Encoder.la

-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx

 
 libOMX_Exynos_AVC_Encoder_la_SOURCES = Exynos_OMX_H264enc.c \
                                        library_register.c
 
 libOMX_Exynos_AVC_Encoder_la_SOURCES = Exynos_OMX_H264enc.c \
                                        library_register.c

diff --git a/openmax/component/video/enc/hevc/Makefile.am b/openmax/component/video/enc/hevc/Makefile.am
index 5804788..a5fe0ec 100755 (executable)
--- a/openmax/component/video/enc/hevc/Makefile.am
+++ b/openmax/component/video/enc/hevc/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.HEVC.Encoder.la
 lib_LTLIBRARIES = libOMX.Exynos.HEVC.Encoder.la

-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx

 
 libOMX_Exynos_HEVC_Encoder_la_SOURCES = Exynos_OMX_HEVCenc.c \
                                         library_register.c
 
 libOMX_Exynos_HEVC_Encoder_la_SOURCES = Exynos_OMX_HEVCenc.c \
                                         library_register.c

diff --git a/openmax/component/video/enc/mpeg4/Makefile.am b/openmax/component/video/enc/mpeg4/Makefile.am
index 45bc624..1458257 100755 (executable)
--- a/openmax/component/video/enc/mpeg4/Makefile.am
+++ b/openmax/component/video/enc/mpeg4/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.MPEG4.Encoder.la
 lib_LTLIBRARIES = libOMX.Exynos.MPEG4.Encoder.la

-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx

 
 libOMX_Exynos_MPEG4_Encoder_la_SOURCES = Exynos_OMX_Mpeg4enc.c \
                                          library_register.c
 
 libOMX_Exynos_MPEG4_Encoder_la_SOURCES = Exynos_OMX_Mpeg4enc.c \
                                          library_register.c

diff --git a/openmax/component/video/enc/vp8/Makefile.am b/openmax/component/video/enc/vp8/Makefile.am
index 9fdd3c5..27cae47 100755 (executable)
--- a/openmax/component/video/enc/vp8/Makefile.am
+++ b/openmax/component/video/enc/vp8/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.VP8.Encoder.la
 lib_LTLIBRARIES = libOMX.Exynos.VP8.Encoder.la

-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx

 
 libOMX_Exynos_VP8_Encoder_la_SOURCES = Exynos_OMX_Vp8enc.c \
                                        library_register.c
 
 libOMX_Exynos_VP8_Encoder_la_SOURCES = Exynos_OMX_Vp8enc.c \
                                        library_register.c

diff --git a/openmax/component/video/enc/vp9/Makefile.am b/openmax/component/video/enc/vp9/Makefile.am
index 2706097..3834484 100755 (executable)
--- a/openmax/component/video/enc/vp9/Makefile.am
+++ b/openmax/component/video/enc/vp9/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.VP9.Encoder.la
 lib_LTLIBRARIES = libOMX.Exynos.VP9.Encoder.la

-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx

 
 libOMX_Exynos_VP9_Encoder_la_SOURCES = Exynos_OMX_Vp9enc.c \
                                        library_register.c
 
 libOMX_Exynos_VP9_Encoder_la_SOURCES = Exynos_OMX_Vp9enc.c \
                                        library_register.c

diff --git a/openmax/osal/Exynos_OSAL_Library.c b/openmax/osal/Exynos_OSAL_Library.c
index 87fef61..f9fc614 100755 (executable)
--- a/openmax/osal/Exynos_OSAL_Library.c
+++ b/openmax/osal/Exynos_OSAL_Library.c
@@ -65,8 +65,13 @@ const char *Exynos_OSAL_GetLibPath(void)
     const char *LIB_INSTALL_PATH    = "/vendor/lib/omx/";
     const char *LIB64_INSTALL_PATH  = "/vendor/lib64/omx/";
 #else
     const char *LIB_INSTALL_PATH    = "/vendor/lib/omx/";
     const char *LIB64_INSTALL_PATH  = "/vendor/lib64/omx/";
 #else

+#ifdef TIZEN_FEATURE_NEW_HAL_PATH
+    const char *LIB_INSTALL_PATH     = HAL_LIBDIR"/omx/";
+    const char *LIB64_INSTALL_PATH   = HAL_LIBDIR"/omx/";
+#else /* TIZEN_FEATURE_NEW_HAL_PATH */

     const char *LIB_INSTALL_PATH     = "/usr/lib/omx/";
     const char *LIB64_INSTALL_PATH   = "/usr/lib/omx/";
     const char *LIB_INSTALL_PATH     = "/usr/lib/omx/";
     const char *LIB64_INSTALL_PATH   = "/usr/lib/omx/";

+#endif /* TIZEN_FEATURE_NEW_HAL_PATH */

 #endif
 
     return (IS_64BIT_OS)? LIB64_INSTALL_PATH:LIB_INSTALL_PATH;
 #endif
 
     return (IS_64BIT_OS)? LIB64_INSTALL_PATH:LIB_INSTALL_PATH;

diff --git a/packaging/libomxil-e9110-v4l2.spec b/packaging/libomxil-e9110-v4l2.spec
index cb4c6e3..85343c2 100755 (executable)
--- a/packaging/libomxil-e9110-v4l2.spec
+++ b/packaging/libomxil-e9110-v4l2.spec
@@ -3,7 +3,7 @@ Summary: OpenMAX IL for e9110-v4l2
 Version: 0.0.2
 License: Apache-2.0
 Group: Development/Libraries
 Version: 0.0.2
 License: Apache-2.0
 Group: Development/Libraries

-Release: 4
+Release: 5

 ExclusiveArch: %arm
 Source: %{name}-%{version}.tar.gz
 Requires(post): /sbin/ldconfig
 ExclusiveArch: %arm
 Source: %{name}-%{version}.tar.gz
 Requires(post): /sbin/ldconfig


@@ -17,14 +17,6 @@ BuildRequires:  pkgconfig(libtbm)
 %description
 implementation of OpenMAX IL for e9110-v4l2 for TW3
 
 %description
 implementation of OpenMAX IL for e9110-v4l2 for TW3
 

-%package devel
-Summary: OpenMAX IL for e9110-v4l2 (Developement)
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-development package for libomxil-e9110-v4l2
-

 %prep
 %setup -q
 
 %prep
 %setup -q
 


@@ -34,10 +26,12 @@ development package for libomxil-e9110-v4l2
 export CFLAGS+=" -mfpu=neon\
  -DUSE_DLOG\
  -DTIZEN_OMXIL_COMMERCIAL_FEATURE\
 export CFLAGS+=" -mfpu=neon\
  -DUSE_DLOG\
  -DTIZEN_OMXIL_COMMERCIAL_FEATURE\

+ -DTIZEN_FEATURE_NEW_HAL_PATH\
+ -DHAL_LIBDIR=\\\"%{_hal_libdir}\\\"\

  -DGST_EXT_TIME_ANALYSIS"
 
 LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--hash-style=both -Wl,--as-needed"; export LDFLAGS
  -DGST_EXT_TIME_ANALYSIS"
 
 LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--hash-style=both -Wl,--as-needed"; export LDFLAGS

-%configure --prefix=%{_prefix} --disable-static --enable-dlog --enable-exynos9110 --enable-tizen-allocator
+%configure --prefix=%{_prefix} --disable-static --enable-dlog --enable-exynos9110 --enable-tizen-allocator --libdir=%{_hal_libdir}

 
 #make %{?jobs:-j%jobs}
 make
 
 #make %{?jobs:-j%jobs}
 make


@@ -45,7 +39,8 @@ make
 
 %install
 rm -rf %{buildroot}
 
 %install
 rm -rf %{buildroot}

-mkdir -p %{buildroot}/usr/share/license
+mkdir -p %{buildroot}%{_hal_licensedir}/%{name}
+cp COPYING %{buildroot}%{_hal_licensedir}/%{name}

 %make_install
 
 
 %make_install
 
 


@@ -56,20 +51,17 @@ mkdir -p %{buildroot}/usr/share/license
 
 %files
 %manifest libomxil-e9110-v4l2.manifest
 
 %files
 %manifest libomxil-e9110-v4l2.manifest

-/usr/lib/*.so*
-/usr/lib/omx/libOMX.Exynos.AVC.Decoder.so
-/usr/lib/omx/libOMX.Exynos.AVC.Encoder.so
-/usr/lib/omx/libOMX.Exynos.MPEG4.Decoder.so
-/usr/lib/omx/libOMX.Exynos.MPEG4.Encoder.so
-/usr/lib/omx/libOMX.Exynos.MPEG2.Decoder.so
-/usr/lib/omx/libOMX.Exynos.WMV.Decoder.so
-/usr/lib/omx/libOMX.Exynos.HEVC.Decoder.so
-/usr/lib/omx/libOMX.Exynos.HEVC.Encoder.so
-/usr/lib/omx/libOMX.Exynos.VP8.Decoder.so
-/usr/lib/omx/libOMX.Exynos.VP8.Encoder.so
-%license COPYING
-
-%files devel
-/usr/include/*
-/usr/lib/pkgconfig/*
+%{_hal_libdir}/*.so*
+%{_hal_libdir}/omx/libOMX.Exynos.AVC.Decoder.so
+%{_hal_libdir}/omx/libOMX.Exynos.AVC.Encoder.so
+%{_hal_libdir}/omx/libOMX.Exynos.MPEG4.Decoder.so
+%{_hal_libdir}/omx/libOMX.Exynos.MPEG4.Encoder.so
+%{_hal_libdir}/omx/libOMX.Exynos.MPEG2.Decoder.so
+%{_hal_libdir}/omx/libOMX.Exynos.WMV.Decoder.so
+%{_hal_libdir}/omx/libOMX.Exynos.HEVC.Decoder.so
+%{_hal_libdir}/omx/libOMX.Exynos.HEVC.Encoder.so
+%{_hal_libdir}/omx/libOMX.Exynos.VP8.Decoder.so
+%{_hal_libdir}/omx/libOMX.Exynos.VP8.Encoder.so
+%{_hal_licensedir}/%{name}/*
+%exclude %{_includedir}/*