Revert "rlottie/gbs: move gbs build from cmake to meson" 97/214097/1
authorsubhransu mohanty <sub.mohanty@samsung.com>
Wed, 18 Sep 2019 04:41:35 +0000 (13:41 +0900)
committersubhransu mohanty <sub.mohanty@samsung.com>
Wed, 18 Sep 2019 04:43:43 +0000 (13:43 +0900)
This reverts commit 734dc7289e72d51b03e49099e358d863e040e5b0.

Change-Id: I40957152a0aff3f52df3665b1213874efa63a9e7

packaging/rlottie.spec

index 06aa9c16f9cf00ec57fdfa21d9eb5a6e07ce8d3b..b9e3cc0dc0bb5a2ddf026ac1c76197f087e5b097 100644 (file)
@@ -6,8 +6,7 @@ Group:      UI Framework/Services
 License:    LGPL-v2.1
 URL:        http://www.tizen.org/
 Source0:    %{name}-%{version}.tar.gz
-BuildRequires:  meson
-BuildRequires:  ninja
+BuildRequires:  cmake
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -30,24 +29,28 @@ rlottie library (devel)
 
 
 %build
+export CFLAGS+=" -fvisibility=hidden -fPIC -Wall -O2"
+export LDFLAGS+=" "
 
-export DESTDIR=%{buildroot}
+%ifarch %{arm}
+export CXXFLAGS+=" -D_ARCH_ARM_ -mfpu=neon"
+%endif
 
-export CXXFLAGS+=" -std=gnu++14"
 
-meson setup \
-                --prefix /usr \
-                --libdir %{_libdir} \
-                builddir 2>&1
-ninja \
-      -C builddir \
-      -j %(echo "`/usr/bin/getconf _NPROCESSORS_ONLN`")
+%ifarch %{arm}
+cmake . -DCMAKE_INSTALL_PREFIX=/usr \
+        -DLIB_INSTALL_DIR:PATH=%{_libdir} \
+        -DARCH="arm"
+%else
+cmake . -DCMAKE_INSTALL_PREFIX=/usr \
+        -DLIB_INSTALL_DIR:PATH=%{_libdir}
+%endif
 
-%install
 
-export DESTDIR=%{buildroot}
+make %{?jobs:-j%jobs}
 
-ninja -C builddir install
+%install
+%make_install
 
 %files
 %defattr(-,root,root,-)
@@ -62,4 +65,5 @@ ninja -C builddir install
 %{_libdir}/librlottie.so
 %{_libdir}/librlottie-image-loader.so
 
+%{_libdir}/cmake/rlottie/*.cmake
 %{_libdir}/pkgconfig/rlottie.pc