From dd13303bba97901a696aefc9161ae45a5237049d Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Wed, 30 Jan 2019 19:14:15 +0900 Subject: [PATCH] [DIST] Install /etc/nnstreamer.ini Users can configure the locations of decoder/filter subplugins. Signed-off-by: MyungJoo Ham --- debian/nnstreamer.install | 1 + debian/rules | 2 +- meson.build | 4 ++++ nnstreamer.ini | 6 ++++++ packaging/nnstreamer.spec | 5 +++-- 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 nnstreamer.ini diff --git a/debian/nnstreamer.install b/debian/nnstreamer.install index 2bf3d0e..dc12a8c 100644 --- a/debian/nnstreamer.install +++ b/debian/nnstreamer.install @@ -1,3 +1,4 @@ /usr/lib/*/libtensor_filter_*.so /usr/lib/*/gstreamer-1.0/*.so /usr/lib/*/libnnstreamer_plugin_api.so +/etc/nnstreamer.ini diff --git a/debian/rules b/debian/rules index 40b01e3..cd56e54 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,7 @@ override_dh_auto_clean: override_dh_auto_configure: mkdir -p build - meson --buildtype=plain --werror --prefix=/usr --libdir=lib/$(DEB_HOST_MULTIARCH) --bindir=lib/nnstreamer/bin --includedir=include -Dinstall-example=true -Denable-tensorflow=$(enable_tf) build + meson --buildtype=plain --werror --prefix=/usr --sysconfdir=/etc --libdir=lib/$(DEB_HOST_MULTIARCH) --bindir=lib/nnstreamer/bin --includedir=include -Dinstall-example=true -Denable-tensorflow=$(enable_tf) build override_dh_auto_build: ninja -C build diff --git a/meson.build b/meson.build index f67b16c..2373e2a 100644 --- a/meson.build +++ b/meson.build @@ -28,6 +28,7 @@ nnstreamer_prefix = get_option('prefix') nnstreamer_libdir = join_paths(nnstreamer_prefix, get_option('libdir')) nnstreamer_bindir = join_paths(nnstreamer_prefix, get_option('bindir')) nnstreamer_includedir = join_paths(nnstreamer_prefix, get_option('includedir')) +nnstreamer_inidir = get_option('sysconfdir') libs_install_dir = nnstreamer_libdir plugins_install_dir = join_paths(nnstreamer_libdir, 'gstreamer-' + gst_api_verision) @@ -105,6 +106,9 @@ if get_option('enable-test') or get_option('install-example') subdir('nnstreamer_example') endif +# Install .ini +install_data('nnstreamer.ini', install_dir : nnstreamer_inidir) + # Build unittests if get_option('enable-test') subdir('tests') diff --git a/nnstreamer.ini b/nnstreamer.ini new file mode 100644 index 0000000..e34ef34 --- /dev/null +++ b/nnstreamer.ini @@ -0,0 +1,6 @@ +[filter] +filters=/usr/lib/nnstreamer/filters/ +customfilters=/usr/lib/nnstreamer/customfilters/ + +[decoder] +decoders=/usr/lib/nnstreamer/decoders/ diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec index dffb258..9ffdec8 100644 --- a/packaging/nnstreamer.spec +++ b/packaging/nnstreamer.spec @@ -93,9 +93,9 @@ CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage" mkdir -p build %ifarch x86_64 aarch64 - meson --buildtype=plain --werror --prefix=%{_prefix} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -Dinstall-example=true build + meson --buildtype=plain --werror --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -Dinstall-example=true build %else - meson --buildtype=plain --werror --prefix=%{_prefix} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -Dinstall-example=true -Denable-tensorflow=false build + meson --buildtype=plain --werror --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -Dinstall-example=true -Denable-tensorflow=false build %endif ninja -C build %{?_smp_mflags} @@ -163,6 +163,7 @@ cp -r result %{buildroot}%{_datadir}/nnstreamer/unittest/ %{_libdir}/libtensor_filter_*.so %{gstlibdir}/*.so %{_libdir}/libnnstreamer_plugin_api.so +%{_sysconfdir}/nnstreamer.ini %files devel %{_includedir}/nnstreamer/* -- 2.7.4