From 0d77754b56c401853af10ed03ae05f8492e97385 Mon Sep 17 00:00:00 2001 From: gichan2-jang Date: Mon, 26 Jun 2023 15:34:40 +0900 Subject: [PATCH] Revert "Filter/Meson: Move 'filter-snpe-list' to the build directory" This reverts commit 2d6bc59653dab21bf1706d61a06c205c10583a92. Signed-off-by: gichan2-jang --- ext/nnstreamer/tensor_filter/meson.build | 4 ++-- packaging/nnstreamer.spec | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ext/nnstreamer/tensor_filter/meson.build b/ext/nnstreamer/tensor_filter/meson.build index dd54094..624770d 100644 --- a/ext/nnstreamer/tensor_filter/meson.build +++ b/ext/nnstreamer/tensor_filter/meson.build @@ -641,8 +641,8 @@ if get_option('enable-mediapipe') ) endif +run_command('sh', '-c', 'touch filter_snpe_list', check : true) if snpe_support_is_available - run_command('sh', '-c', 'touch $MESON_BUILD_ROOT/$MESON_SUBDIR/filter_snpe_list', check : true) filter_sub_snpe_sources = ['tensor_filter_snpe.cc'] snpe_cpp_args = [] @@ -665,7 +665,7 @@ if snpe_support_is_available install: true, install_dir: nnstreamer_libdir ) - run_command('sh', '-c', 'echo "%{_prefix}/lib/nnstreamer/filters/libnnstreamer_filter_snpe.so" >> $MESON_BUILD_ROOT/$MESON_SUBDIR/filter_snpe_list', check : true) + run_command('sh', '-c', 'echo "%{_prefix}/lib/nnstreamer/filters/libnnstreamer_filter_snpe.so" >> filter_snpe_list', check : true) endif if tensorrt_support_is_available diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec index 35377d3..1e1fbbb 100644 --- a/packaging/nnstreamer.spec +++ b/packaging/nnstreamer.spec @@ -871,8 +871,6 @@ export NNSTREAMER_DECODERS=${NNSTREAMER_BUILD_ROOT_PATH}/ext/nnstreamer/tensor_d export NNSTREAMER_CONVERTERS=${NNSTREAMER_BUILD_ROOT_PATH}/ext/nnstreamer/tensor_converter export NNSTREAMER_TRAINERS=${NNSTREAMER_BUILD_ROOT_PATH}/ext/nnstreamer/tensor_trainer -%define files_opetion_for_snpe_subpackage %( if [ -f %{builddir}/ext/nnstreamer/tensor_filter/filter_snpe_list ] ; then \ - echo "-f %{builddir}/ext/nnstreamer/tensor_filter/filter_snpe_list" ; else echo ""; fi ) %define test_script $(pwd)/packaging/run_unittests_binaries.sh # if it's tizen && non-TV, run unittest even if "unit_test"==0 for build-time sanity checks. @@ -1107,7 +1105,7 @@ cp -r result %{buildroot}%{_datadir}/nnstreamer/unittest/ %if 0%{?snpe_support} # Workaround: Conditionally enable nnstreamer-snpe rpm package # when existing actual snpe library (snpe.pc) -%files snpe %{files_opetion_for_snpe_subpackage} +%files snpe -f ext/nnstreamer/tensor_filter/filter_snpe_list %manifest nnstreamer.manifest %defattr(-,root,root,-) %endif -- 2.7.4