Merge from tizen_6.5 branch

Change-Id: I85a92ac95bc8de7d594aa14118906d12c54bf036
Signed-off-by: 이상욱/Process Sangwook96.lee Infra Lab(SR)/Staff Engineer/삼성전자 <sangwook96.lee@samsung.com>

diff --git a/rs_resource/EFL/ecore-rs.xml b/rs_resource/EFL/ecore-rs.xml
index 7439643..35c9c9e 100644 (file)
--- a/rs_resource/EFL/ecore-rs.xml
+++ b/rs_resource/EFL/ecore-rs.xml
@@ -23,6 +23,8 @@
     <rpm accept="ecore-input-evas-devel" arch="i686"/>
     <rpm accept="ecore-ipc" arch="i686"/>
     <rpm accept="ecore-ipc-devel" arch="i686"/>
+    <rpm accept="ecore-wl2" arch="i686"/>
+    <rpm accept="ecore-wl2-devel" arch="i686"/>
   </emulator>
   <target>
     <rpm accept="ecore" arch="armv7l"/>
@@ -47,6 +49,8 @@
     <rpm accept="ecore-input-evas-devel" arch="armv7l"/>
     <rpm accept="ecore-ipc" arch="armv7l"/>
     <rpm accept="ecore-ipc-devel" arch="armv7l"/>
+    <rpm accept="ecore-wl2" arch="armv7l"/>
+    <rpm accept="ecore-wl2-devel" arch="armv7l"/>
   </target>
   <necessary>
       <file>*</file>
@@ -61,6 +65,7 @@
   <include_path>/usr/include/ecore-input-1</include_path>
   <include_path>/usr/include/ecore-input-evas-1</include_path>
   <include_path>/usr/include/ecore-ipc-1</include_path>
+  <include_path>/usr/include/ecore-wl2-1</include_path>
   <library_path>/usr/lib</library_path>
   <library>libecore_buffer.so</library>
   <library>libecore_con.so</library>
@@ -71,5 +76,6 @@
   <library>libecore_input_evas.so</library>
   <library>libecore_input.so</library>
   <library>libecore_ipc.so</library>
+  <library>libecore_wl2.so</library>
   <library>libecore.so</library>
 </rootstrap>

diff --git a/rs_resource/EFL/etc/dbus-rs.xml b/rs_resource/EFL/etc/dbus-rs.xml
index 20f953e..918e233 100644 (file)
--- a/rs_resource/EFL/etc/dbus-rs.xml
+++ b/rs_resource/EFL/etc/dbus-rs.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0"?>
 <rootstrap name="dbus">
   <emulator>
+    <rpm accept="dbus-libs" arch="i686"/>
     <rpm accept="dbus-devel" arch="i686"/>
   </emulator>
   <target>
+    <rpm accept="dbus-libs" arch="armv7l"/>
     <rpm accept="dbus-devel" arch="armv7l"/>
   </target>
   <necessary>

diff --git a/rs_resource/EFL/etc/eo-rs.xml b/rs_resource/EFL/etc/eo-rs.xml
index c13890c..3c213f4 100644 (file)
--- a/rs_resource/EFL/etc/eo-rs.xml
+++ b/rs_resource/EFL/etc/eo-rs.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0"?>
 <rootstrap name="eo">
   <emulator>
+    <rpm accept="eo" arch="i686"/>
     <rpm accept="eo-devel" arch="i686"/>
   </emulator>
   <target>
+    <rpm accept="eo" arch="armv7l"/>
     <rpm accept="eo-devel" arch="armv7l"/>
   </target>
   <necessary>

diff --git a/rs_resource/NativeAPI/cairo-rs.xml b/rs_resource/NativeAPI/cairo-rs.xml
index c678d2c..34fd634 100644 (file)
--- a/rs_resource/NativeAPI/cairo-rs.xml
+++ b/rs_resource/NativeAPI/cairo-rs.xml
@@ -5,10 +5,14 @@
   <email>hk57.kim@samsung.com</email>
   <emulator>
     <rpm accept="libcairo" arch="i686"/>
+    <rpm accept="libcairo-gobject" arch="i686"/>
+    <rpm accept="libcairo-script-interpreter" arch="i686"/>
     <rpm accept="cairo-devel" arch="i686"/>
   </emulator>
   <target>
     <rpm accept="libcairo" arch="armv7l"/>
+    <rpm accept="libcairo-gobject" arch="armv7l"/>
+    <rpm accept="libcairo-script-interpreter" arch="armv7l"/>
     <rpm accept="cairo-devel" arch="armv7l"/>
   </target>
   <necessary>

diff --git a/rs_resource/NativeAPI/capi-machine-learning-inference-rs.xml b/rs_resource/NativeAPI/capi-machine-learning-inference-rs.xml
index 99a29d0..fc39ca1 100644 (file)
--- a/rs_resource/NativeAPI/capi-machine-learning-inference-rs.xml
+++ b/rs_resource/NativeAPI/capi-machine-learning-inference-rs.xml
@@ -4,14 +4,14 @@
   <email>jy1210.jung@samsung.com</email>
   <email>sangjung.woo@samsung.com</email>
   <emulator>
-    <rpm accept="capi-nnstreamer" arch="i686"/>
-    <rpm accept="capi-nnstreamer-devel" arch="i686"/>
-    <rpm accept="capi-ml-common-devel" arch="i686"/>
+    <rpm accept="capi-machine-learning-inference" arch="i686"/>
+    <rpm accept="capi-machine-learning-inference-devel" arch="i686"/>
+    <rpm accept="capi-machine-learning-common-devel" arch="i686"/>
   </emulator>
   <target>
-    <rpm accept="capi-nnstreamer" arch="armv7l"/>
-    <rpm accept="capi-nnstreamer-devel" arch="armv7l"/>
-    <rpm accept="capi-ml-common-devel" arch="armv7l"/>
+    <rpm accept="capi-machine-learning-inference" arch="armv7l"/>
+    <rpm accept="capi-machine-learning-inference-devel" arch="armv7l"/>
+    <rpm accept="capi-machine-learning-common-devel" arch="armv7l"/>
   </target>
   <necessary>
     <file>/usr/include/nnstreamer/nnstreamer-single.h</file>

diff --git a/rs_resource/NativeAPI/capi-media-vision-rs.xml b/rs_resource/NativeAPI/capi-media-vision-rs.xml
index 95c6586..3874b77 100644 (file)
--- a/rs_resource/NativeAPI/capi-media-vision-rs.xml
+++ b/rs_resource/NativeAPI/capi-media-vision-rs.xml
@@ -13,8 +13,8 @@
     <rpm accept="capi-media-vision-barcode-devel" arch="i686"/>
     <rpm accept="capi-media-vision-image" arch="i686"/>
     <rpm accept="capi-media-vision-image-devel" arch="i686"/>
-    <rpm accept="capi-media-vision-inference" arch="i686"/>
-    <rpm accept="capi-media-vision-inference-devel" arch="i686"/>
+    <rpm accept="capi-media-vision-machine_learning" arch="i686"/>
+    <rpm accept="capi-media-vision-machine_learning-devel" arch="i686"/>
     <rpm accept="capi-media-vision-face" arch="i686"/>
     <rpm accept="capi-media-vision-face-devel" arch="i686"/>
     <rpm accept="capi-media-vision-surveillance" arch="i686"/>
@@ -29,8 +29,8 @@
     <rpm accept="capi-media-vision-barcode-devel" arch="armv7l"/>
     <rpm accept="capi-media-vision-image" arch="armv7l"/>
     <rpm accept="capi-media-vision-image-devel" arch="armv7l"/>
-    <rpm accept="capi-media-vision-inference" arch="armv7l"/>
-    <rpm accept="capi-media-vision-inference-devel" arch="armv7l"/>
+    <rpm accept="capi-media-vision-machine_learning" arch="armv7l"/>
+    <rpm accept="capi-media-vision-machine_learning-devel" arch="armv7l"/>
     <rpm accept="capi-media-vision-face" arch="armv7l"/>
     <rpm accept="capi-media-vision-face-devel" arch="armv7l"/>
     <rpm accept="capi-media-vision-surveillance" arch="armv7l"/>

diff --git a/rs_resource/NativeAPI/capi-privacy-privilege-manager-rs.xml b/rs_resource/NativeAPI/capi-privacy-privilege-manager-rs.xml
index 9bcb099..4196542 100644 (file)
--- a/rs_resource/NativeAPI/capi-privacy-privilege-manager-rs.xml
+++ b/rs_resource/NativeAPI/capi-privacy-privilege-manager-rs.xml
@@ -5,11 +5,15 @@
     <email>p.sawicki2@partner.samsung.com</email>
     <emulator>
         <rpm accept="capi-privacy-privilege-manager" arch="i686"/>
-        <rpm accept="askuser-notification-devel" arch="i686"/>
+       <rpm accept="askuser-notification-devel" arch="i686"/>
+       <rpm accept="libaskuser-notification-common" arch="i686"/>
+       <rpm accept="askuser-notification-client" arch="i686"/>
     </emulator>
     <target>
         <rpm accept="capi-privacy-privilege-manager" arch="armv7l"/>
-        <rpm accept="askuser-notification-devel" arch="armv7l"/>
+       <rpm accept="askuser-notification-devel" arch="armv7l"/>
+       <rpm accept="libaskuser-notification-common" arch="armv7l"/>
+       <rpm accept="askuser-notification-client" arch="armv7l"/>
     </target>
     <necessary>
         <file>/usr/include/privacy-privilege-manager/privacy_privilege_manager.h</file>

diff --git a/rs_resource/NativeAPI/dali-adaptor-rs.xml b/rs_resource/NativeAPI/dali-adaptor-rs.xml
index a66d7fa..86c31e6 100644 (file)
--- a/rs_resource/NativeAPI/dali-adaptor-rs.xml
+++ b/rs_resource/NativeAPI/dali-adaptor-rs.xml
@@ -28,6 +28,7 @@
     <file>/usr/include/dali/public-api/adaptor-framework/widget.h</file>
     <file>/usr/include/dali/public-api/adaptor-framework/widget-impl.h</file>
     <file>/usr/include/dali/public-api/adaptor-framework/widget-application.h</file>
+    <file>/usr/include/dali/public-api/capture/capture.h</file>
     <file>/usr/lib/libdali-adaptor.so</file>
     <file>/usr/lib/libdali-adaptor-cxx11.so*</file>
   </necessary>

diff --git a/rs_resource/NativeAPI/dali-toolkit-rs.xml b/rs_resource/NativeAPI/dali-toolkit-rs.xml
index 6af409a..ec80e11 100644 (file)
--- a/rs_resource/NativeAPI/dali-toolkit-rs.xml
+++ b/rs_resource/NativeAPI/dali-toolkit-rs.xml
@@ -64,6 +64,7 @@
 
     <file>/usr/include/dali-toolkit/public-api/controls/video-view/video-view.h</file>
 
+    <file>/usr/include/dali-toolkit/public-api/image-loader/image.h</file>
     <file>/usr/include/dali-toolkit/public-api/image-loader/async-image-loader.h</file>
     <file>/usr/include/dali-toolkit/public-api/image-loader/sync-image-loader.h</file>