From f33bf30ead4607562bb4270911654568a74f40f2 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Fri, 17 Apr 2020 14:22:26 +0900 Subject: [PATCH] [Spec/Deb] Update C++ devel env. 1. Do not separate C env and C++ env. Merge them. Both Ubuntu and Tizen supports C++ by default. 2. Move /nnstreamer/cpp/nnstreamer_cppplugin_api_filter.hh to /nnstreamer/nnstreamer_cppplugin_api_filter.hh Signed-off-by: MyungJoo Ham --- debian/nnstreamer-cpp-dev.install | 1 - debian/nnstreamer-cpp.install | 1 - debian/nnstreamer-dev.install | 2 ++ debian/nnstreamer.install | 1 + gst/nnstreamer/include/meson.build | 2 +- packaging/nnstreamer.spec | 30 ++++-------------------------- 6 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 debian/nnstreamer-cpp-dev.install delete mode 100644 debian/nnstreamer-cpp.install diff --git a/debian/nnstreamer-cpp-dev.install b/debian/nnstreamer-cpp-dev.install deleted file mode 100644 index bae190c..0000000 --- a/debian/nnstreamer-cpp-dev.install +++ /dev/null @@ -1 +0,0 @@ -/usr/include/nnstreamer/tensor_filter_cpp.hh diff --git a/debian/nnstreamer-cpp.install b/debian/nnstreamer-cpp.install deleted file mode 100644 index f8978a4..0000000 --- a/debian/nnstreamer-cpp.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/nnstreamer/filters/libnnstreamer_filter_cpp.so diff --git a/debian/nnstreamer-dev.install b/debian/nnstreamer-dev.install index a817e7d..1a3cf43 100644 --- a/debian/nnstreamer-dev.install +++ b/debian/nnstreamer-dev.install @@ -5,5 +5,7 @@ /usr/include/nnstreamer/tensor_filter_custom.h /usr/include/nnstreamer/tensor_filter_custom_easy.h /usr/include/nnstreamer/tensor_typedef.h +/usr/include/nnstreamer/tensor_filter_cpp.hh +/usr/include/nnstreamer/nnstreamer_cppplugin_api_filter.hh /usr/lib/*/pkgconfig/*.pc /usr/lib/*/*.a diff --git a/debian/nnstreamer.install b/debian/nnstreamer.install index fcffe1e..f2d0241 100644 --- a/debian/nnstreamer.install +++ b/debian/nnstreamer.install @@ -1,4 +1,5 @@ /usr/lib/nnstreamer/decoders/libnnstreamer_decoder_*.so +/usr/lib/nnstreamer/filters/libnnstreamer_filter_cpp.so /usr/lib/*/gstreamer-1.0/*.so /usr/lib/*/libcapi-*.so /etc/nnstreamer.ini diff --git a/gst/nnstreamer/include/meson.build b/gst/nnstreamer/include/meson.build index e1db85a..1d01584 100644 --- a/gst/nnstreamer/include/meson.build +++ b/gst/nnstreamer/include/meson.build @@ -20,6 +20,6 @@ install_headers(nnstreamer_headers, if get_option('enable-filter-cpp-class') install_headers(['nnstreamer_cppplugin_api_filter.hh'], - subdir: 'nnstreamer/cpp' + subdir: 'nnstreamer' ) endif diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec index 1aa59c1..d438003 100644 --- a/packaging/nnstreamer.spec +++ b/packaging/nnstreamer.spec @@ -227,22 +227,6 @@ Summary: NNStreamer UnitTest Coverage Analysis Result HTML pages of lcov results of NNStreamer generated during rpmbuild %endif -%package cpp -Summary: NNStreamer Custom Plugin Support for C++ Classes -Requires: nnstreamer = %{version}-%{release} -%description cpp -With this package, you may use C++ classes as yet another tensor-filter subplugins of nnstreamer pipelines. - -%post cpp -p /sbin/ldconfig -%postun cpp -p /sbin/ldconfig - -%package cpp-devel -Summary: NNStreamer Custom Plugin Development Support for C++ Classes -Requires: nnstreamer-cpp = %{version}-%{release} -%description cpp-devel -With this package, you may write C++ classes as yet another tensor-filter subplugins of nnstreamer pipelines. -Note that there is no .pc file for this package because nnstreamer.pc file may be used for developing this. - %%%% THIS IS FOR TIZEN ONLY! %%%% %if %{with tizen} %package -n capi-nnstreamer @@ -522,6 +506,7 @@ cp -r result %{buildroot}%{_datadir}/nnstreamer/unittest/ %defattr(-,root,root,-) %license LICENSE %{_prefix}/lib/nnstreamer/decoders/libnnstreamer_decoder_*.so +%{_prefix}/lib/nnstreamer/filters/libnnstreamer_filter_cpp.so %{gstlibdir}/libnnstreamer.so %{_libdir}/libnnstreamer.so %{_sysconfdir}/nnstreamer.ini @@ -558,9 +543,12 @@ cp -r result %{buildroot}%{_datadir}/nnstreamer/unittest/ %{_includedir}/nnstreamer/nnstreamer_plugin_api_decoder.h %{_includedir}/nnstreamer/nnstreamer_plugin_api_converter.h %{_includedir}/nnstreamer/nnstreamer_plugin_api.h +%{_includedir}/nnstreamer/tensor_filter_cpp.hh +%{_includedir}/nnstreamer/nnstreamer_cppplugin_api_filter.hh %{_libdir}/*.a %exclude %{_libdir}/libcapi*.a %{_libdir}/pkgconfig/nnstreamer.pc +%{_libdir}/pkgconfig/nnstreamer-cpp.pc %if 0%{?testcoverage} %files unittest-coverage @@ -617,16 +605,6 @@ cp -r result %{buildroot}%{_datadir}/nnstreamer/unittest/ %{gstlibdir}/libnnstreamer-tizen-sensor.so %endif # tizen_sensor_support -%files cpp -%manifest nnstreamer.manifest -%license LICENSE -%{_prefix}/lib/nnstreamer/filters/libnnstreamer_filter_cpp.so - -%files cpp-devel -%{_includedir}/nnstreamer/tensor_filter_cpp.hh -%{_includedir}/nnstreamer/nnstreamer_cppplugin_api_filter.hh -%{_libdir}/pkgconfig/nnstreamer-cpp.pc - %if 0%{?edgetpu_support} %files edgetpu %manifest nnstreamer.manifest -- 2.7.4