[DIST] Install gst plugins to gst directory

The install path for gst plugins are not %{_libdir}.
It's %{_libdir}/gstreamer-1.0

We need to use gstreamer convention.

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13410a0..fc08670 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,11 @@ ELSE(LIB_INSTALL_DIR)
     SET(LIB_INSTALL_DIR "${PREFIX}/lib")
 ENDIF(LIB_INSTALL_DIR)
 
+IF(GST_INSTALL_DIR)
+ELSE(GST_INSTALL_DIR)
+    SET(GST_INSTALL_DIR "${PREFIX}/lib/gstreamer-1.0")
+ENDIF(GST_INSTALL_DIR)
+
 FIND_PACKAGE(PkgConfig REQUIRED)
 SET(PKG_MODULES
        gstreamer-1.0
@@ -117,6 +122,6 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/nnstreamer.pc
 # Custom plugins need to use common archive (static lib)
 INSTALL(TARGETS common
        RUNTIME DESTINATION ${EXEC_PREFIX}
-       LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+       LIBRARY DESTINATION ${GST_INSTALL_DIR}
        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
        )

diff --git a/debian/nnstreamer.install b/debian/nnstreamer.install
index 8451c89..45997c2 100644 (file)
--- a/debian/nnstreamer.install
+++ b/debian/nnstreamer.install
@@ -1 +1,2 @@
 /usr/lib/*.so
+/usr/lib/gstreamer-1.0/*.so

diff --git a/gst/tensor_converter/CMakeLists.txt b/gst/tensor_converter/CMakeLists.txt
index 5f6ecd9..6283fc5 100644 (file)
--- a/gst/tensor_converter/CMakeLists.txt
+++ b/gst/tensor_converter/CMakeLists.txt
@@ -12,6 +12,6 @@ TARGET_COMPILE_OPTIONS(tensor_converterStatic PUBLIC ${pkgs_CFLAGS_OTHER})
 
 INSTALL(TARGETS tensor_converter tensor_converterStatic
        RUNTIME DESTINATION ${EXEC_PREFIX}
-       LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+       LIBRARY DESTINATION ${GST_INSTALL_DIR}
        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
        )

diff --git a/gst/tensor_decoder/CMakeLists.txt b/gst/tensor_decoder/CMakeLists.txt
index 252f07b..12edeaf 100644 (file)
--- a/gst/tensor_decoder/CMakeLists.txt
+++ b/gst/tensor_decoder/CMakeLists.txt
@@ -12,6 +12,6 @@ TARGET_COMPILE_OPTIONS(tensordecStatic PUBLIC ${pkgs_CFLAGS_OTHER})
 
 INSTALL(TARGETS tensordec tensordecStatic
        RUNTIME DESTINATION ${EXEC_PREFIX}
-       LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+       LIBRARY DESTINATION ${GST_INSTALL_DIR}
        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
        )

diff --git a/gst/tensor_demux/CMakeLists.txt b/gst/tensor_demux/CMakeLists.txt
index 08d146d..b51165f 100644 (file)
--- a/gst/tensor_demux/CMakeLists.txt
+++ b/gst/tensor_demux/CMakeLists.txt
@@ -12,6 +12,6 @@ TARGET_COMPILE_OPTIONS(tensordemuxStatic PUBLIC ${pkgs_CFLAGS_OTHER})
 
 INSTALL(TARGETS tensordemux tensordemuxStatic
        RUNTIME DESTINATION ${EXEC_PREFIX}
-       LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+       LIBRARY DESTINATION ${GST_INSTALL_DIR}
        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
        )

diff --git a/gst/tensor_filter/CMakeLists.txt b/gst/tensor_filter/CMakeLists.txt
index 17c3c57..5ca3181 100644 (file)
--- a/gst/tensor_filter/CMakeLists.txt
+++ b/gst/tensor_filter/CMakeLists.txt
@@ -14,7 +14,7 @@ IF(DISABLE_TENSORFLOW_LITE) # NOT AVAILABE
 
        INSTALL(TARGETS tensor_filter
                RUNTIME DESTINATION ${EXEC_PREFIX}
-               LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+               LIBRARY DESTINATION ${GST_INSTALL_DIR}
                ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
                )
 ELSE(DISABLE_TENSORFLOW_LITE) # AVAILABE
@@ -37,7 +37,7 @@ ELSE(DISABLE_TENSORFLOW_LITE) # AVAILABE
 
        INSTALL(TARGETS tensor_filter tensor_filter_tflitecore
                RUNTIME DESTINATION ${EXEC_PREFIX}
-               LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+               LIBRARY DESTINATION ${GST_INSTALL_DIR}
                ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
                )
 ENDIF(DISABLE_TENSORFLOW_LITE)

diff --git a/gst/tensor_mux/CMakeLists.txt b/gst/tensor_mux/CMakeLists.txt
index 29cfda7..0219b55 100644 (file)
--- a/gst/tensor_mux/CMakeLists.txt
+++ b/gst/tensor_mux/CMakeLists.txt
@@ -12,6 +12,6 @@ TARGET_COMPILE_OPTIONS(tensormuxStatic PUBLIC ${pkgs_CFLAGS_OTHER})
 
 INSTALL(TARGETS tensormux tensormuxStatic
        RUNTIME DESTINATION ${EXEC_PREFIX}
-       LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+       LIBRARY DESTINATION ${GST_INSTALL_DIR}
        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
        )

diff --git a/gst/tensor_saveload/CMakeLists.txt b/gst/tensor_saveload/CMakeLists.txt
index 275bda0..28cab1b 100644 (file)
--- a/gst/tensor_saveload/CMakeLists.txt
+++ b/gst/tensor_saveload/CMakeLists.txt
@@ -12,7 +12,7 @@ TARGET_COMPILE_OPTIONS(tensor_loadStatic PUBLIC ${pkgs_CFLAGS_OTHER})
 
 INSTALL(TARGETS tensor_load tensor_loadStatic
        RUNTIME DESTINATION ${EXEC_PREFIX}
-       LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+       LIBRARY DESTINATION ${GST_INSTALL_DIR}
        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
        )
 

diff --git a/gst/tensor_sink/CMakeLists.txt b/gst/tensor_sink/CMakeLists.txt
index 321a5c3..58c3126 100644 (file)
--- a/gst/tensor_sink/CMakeLists.txt
+++ b/gst/tensor_sink/CMakeLists.txt
@@ -12,6 +12,6 @@ TARGET_COMPILE_OPTIONS(tensor_sinkStatic PUBLIC ${pkgs_CFLAGS_OTHER})
 
 INSTALL(TARGETS tensor_sink tensor_sinkStatic
        RUNTIME DESTINATION ${EXEC_PREFIX}
-       LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+       LIBRARY DESTINATION ${GST_INSTALL_DIR}
        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
        )

diff --git a/gst/tensor_transform/CMakeLists.txt b/gst/tensor_transform/CMakeLists.txt
index beed39f..a83f302 100644 (file)
--- a/gst/tensor_transform/CMakeLists.txt
+++ b/gst/tensor_transform/CMakeLists.txt
@@ -12,6 +12,6 @@ TARGET_COMPILE_OPTIONS(tensor_transformStatic PUBLIC ${pkgs_CFLAGS_OTHER})
 
 INSTALL(TARGETS tensor_transform tensor_transformStatic
        RUNTIME DESTINATION ${EXEC_PREFIX}
-       LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+       LIBRARY DESTINATION ${GST_INSTALL_DIR}
        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
        )

diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec
index d2d95df..6ec677a 100644 (file)
--- a/packaging/nnstreamer.spec
+++ b/packaging/nnstreamer.spec
@@ -1,4 +1,6 @@
 # Execute gbs with --define "testcoverage 1" in case that you must get unittest coverage statictics
+%define                gstpostfix      gstreamer-1.0
+%define                gstlibdir       %{_libdir}/%{gstpostfix}
 
 Name:          nnstreamer
 Summary:       gstremaer plugins for neural networks
@@ -53,6 +55,14 @@ Requires:    gstreamer-devel
 Development package for custom tensor operator developers (tensor_filter/custom).
 This contains corresponding header files and .pc pkgconfig file.
 
+%package example
+Summary:       NNStreamer example custom plugins and test plugins
+Requires:      nnstreamer = %{version}-%{release}
+%description example
+Example custom tensor_filter subplugins and
+plugins created for test purpose.
+
+
 %prep
 %setup -q
 cp %{SOURCE1001} .
@@ -65,7 +75,7 @@ CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
 
 mkdir -p build
 pushd build
-%cmake .. -DTIZEN=ON
+%cmake .. -DTIZEN=ON -DGST_INSTALL_DIR=%{gstlibdir}
 make %{?_smp_mflags}
 popd
 
@@ -82,7 +92,7 @@ pushd build
 popd
 
 pushd tests
-export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
+export LD_LIBRARY_PATH=%{buildroot}%{gstlibdir}
 ./testAll.sh
 popd
 
@@ -132,8 +142,7 @@ install build/libcommon.a %{buildroot}%{_libdir}/
 %defattr(-,root,root,-)
 # The libraries are in LGPLv2.1 (testcases and non GST-plugin components are APL2)
 %license LICENSE
-%{_libdir}/*.so
-%{_libdir}/*.so*
+%{gstlibdir}/*.so
 # TODO generate .so files with version info. Migrate symbolic-link .so to devel.
 
 %files devel
@@ -146,6 +155,13 @@ install build/libcommon.a %{buildroot}%{_libdir}/
 %{_datadir}/nnstreamer/unittest/*
 %endif
 
+%files example
+%manifest nnstreamer.manifest
+%defattr(-,root,root,-)
+%license LICENSE
+%{_libdir}/*.so
+
+
 %changelog
 * Fri May 25 2018 MyungJoo Ham <myungjoo.ham@samsung.com>
 - Packaged tensor_convert plugin.