From c55f8a6db48cda9d3a78048338b7f18c4cca62b8 Mon Sep 17 00:00:00 2001
From: Chunseok Lee <chunseok.lee@samsung.com>
Date: Wed, 28 Oct 2020 12:16:55 +0900
Subject: Imported Upstream version 1.10.0

---
 packaging/cpuinfo.tar.gz  | Bin 0 -> 3476406 bytes
 packaging/gemmlowp.tar.gz | Bin 830368 -> 830362 bytes
 packaging/gtest.tar.gz    | Bin 1287188 -> 1287207 bytes
 packaging/nnfw.spec       |  18 ++++++++++--------
 packaging/ruy.tar.gz      | Bin 220553 -> 235110 bytes
 5 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 packaging/cpuinfo.tar.gz

(limited to 'packaging')

diff --git a/packaging/cpuinfo.tar.gz b/packaging/cpuinfo.tar.gz
new file mode 100644
index 000000000..ced5debc3
Binary files /dev/null and b/packaging/cpuinfo.tar.gz differ
diff --git a/packaging/gemmlowp.tar.gz b/packaging/gemmlowp.tar.gz
index 68339cdb1..198dc1414 100644
Binary files a/packaging/gemmlowp.tar.gz and b/packaging/gemmlowp.tar.gz differ
diff --git a/packaging/gtest.tar.gz b/packaging/gtest.tar.gz
index 52cbbcdfe..b8c31918e 100644
Binary files a/packaging/gtest.tar.gz and b/packaging/gtest.tar.gz differ
diff --git a/packaging/nnfw.spec b/packaging/nnfw.spec
index 1b8c5fb31..ab77e7c3c 100644
--- a/packaging/nnfw.spec
+++ b/packaging/nnfw.spec
@@ -1,6 +1,6 @@
 Name:    nnfw
 Summary: nnfw
-Version: 1.9.0
+Version: 1.10.0
 Release: 1
 Group:   Development
 License: Apache-2.0 and MIT and BSD-2-Clause
@@ -12,6 +12,7 @@ Source1002: gtest.tar.gz
 Source1003: eigen.tar.gz
 Source1004: gemmlowp.tar.gz
 Source1005: ruy.tar.gz
+Source1006: cpuinfo.tar.gz
 Source2001: nnfw.pc.in
 Source2002: nnfw-plugin.pc.in
 
@@ -114,9 +115,10 @@ tar -xf %{SOURCE1002} -C ./externals
 tar -xf %{SOURCE1003} -C ./externals
 tar -xf %{SOURCE1004} -C ./externals
 tar -xf %{SOURCE1005} -C ./externals
+tar -xf %{SOURCE1006} -C ./externals
 
 %build
-%ifarch arm armv7l aarch64
+%ifarch arm armv7l aarch64 x86_64
 # runtime build
 %{build_env} ./nnfw configure %{build_options} %{extra_option}
 %{build_env} ./nnfw build -j4
@@ -137,7 +139,7 @@ tar -zcf test-suite.tar.gz infra/scripts
 %endif # arm armv7l aarch64
 
 %install
-%ifarch arm armv7l aarch64
+%ifarch arm armv7l aarch64 x86_64
 
 mkdir -p %{buildroot}%{_libdir}
 mkdir -p %{buildroot}%{_bindir}
@@ -181,14 +183,14 @@ install -m 0644 ./tests/scripts/build_path.txt %{buildroot}%{test_install_dir}/t
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%ifarch arm armv7l aarch64
+%ifarch arm armv7l aarch64 x86_64
 %{_libdir}/*.so
 %endif
 
 %files devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%ifarch arm armv7l aarch64
+%ifarch arm armv7l aarch64 x86_64
 %dir %{_includedir}/nnfw
 %{_includedir}/nnfw/*
 %{_libdir}/pkgconfig/nnfw.pc
@@ -197,13 +199,13 @@ install -m 0644 ./tests/scripts/build_path.txt %{buildroot}%{test_install_dir}/t
 %files plugin-devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%ifarch arm armv7l aarch64
+%ifarch arm armv7l aarch64 x86_64
 %dir %{_includedir}/onert
 %{_includedir}/onert/*
 %{_libdir}/pkgconfig/nnfw-plugin.pc
 %endif
 
-%ifarch arm armv7l aarch64
+%ifarch arm armv7l aarch64 x86_64
 %files minimal-app
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
@@ -214,7 +216,7 @@ install -m 0644 ./tests/scripts/build_path.txt %{buildroot}%{test_install_dir}/t
 %files test
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%ifarch arm armv7l aarch64
+%ifarch arm armv7l aarch64 x86_64
 %dir %{test_install_home}
 %{test_install_home}/*
 %endif # arm armv7l aarch64
diff --git a/packaging/ruy.tar.gz b/packaging/ruy.tar.gz
index 98d1a1e33..9ad14fe6c 100644
Binary files a/packaging/ruy.tar.gz and b/packaging/ruy.tar.gz differ
-- 
cgit v1.2.3