Peter M. Groen / dali-demo

Commit 0c2b88df5a4cb57d479e32389eb89e735f4ea2aa

Authored by Yan Wang
Committed by Adeel Kazmi
1 parent e70a4590

Add Wayland support. 

Change-Id: I31c5b8549bb296f4fc68c2d3f8ade58fec726e7b
Inline Side-by-side
Showing 2 changed files with 10 additions and 11 deletions
com.samsung.dali-demo.manifest
  View file @0c2b88d
1 <manifest> 1 <manifest>
2 - <define>  
3 - <domain name="com.samsung.dali-demo" />  
4 - <request>  
5 - <smack request="dali" type="rwxat" />  
6 - </request>  
7 - </define>  
8 - <assign>  
9 - <filesystem path="/usr/share/icons/com.samsung.dali-demo.png" label="_" />  
10 - </assign>  
11 <request> 2 <request>
12 - <domain name="com.samsung.dali-demo" /> 3 + <domain name="_" />
13 </request> 4 </request>
14 </manifest> 5 </manifest>
packaging/com.samsung.dali-demo.spec
  View file @0c2b88d
  1 +%bcond_with wayland
  2 +
1 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
2 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
3 Version: 1.0.0 5 Version: 1.0.0
@@ -20,7 +22,9 @@ BuildRequires: pkgconfig(aul) @@ -20,7 +22,9 @@ BuildRequires: pkgconfig(aul)
20 BuildRequires: dali-toolkit-devel 22 BuildRequires: dali-toolkit-devel
21 BuildRequires: dali-adaptor-devel 23 BuildRequires: dali-adaptor-devel
22 BuildRequires: pkgconfig(dlog) 24 BuildRequires: pkgconfig(dlog)
23 - 25 +%if %{with wayland}
  26 +BuildRequires: pkgconfig(egl)
  27 +%endif
24 28
25 %description 29 %description
26 The OpenGLES Canvas Core Demo is a collection of examples and demonstrations 30 The OpenGLES Canvas Core Demo is a collection of examples and demonstrations
@@ -79,8 +83,10 @@ cp -f %{_builddir}/%{name}-%{version}/%{name}.xml %{buildroot}%{dali_xml_file_di @@ -79,8 +83,10 @@ cp -f %{_builddir}/%{name}-%{version}/%{name}.xml %{buildroot}%{dali_xml_file_di
79 mkdir -p %{buildroot}%{dali_icon_dir} 83 mkdir -p %{buildroot}%{dali_icon_dir}
80 mv %{buildroot}/%{dali_app_ro_dir}/images/%{name}.png %{buildroot}%{dali_icon_dir} 84 mv %{buildroot}/%{dali_app_ro_dir}/images/%{name}.png %{buildroot}%{dali_icon_dir}
81 85
  86 +%if !%{with wayland}
82 mkdir -p %{buildroot}%{smack_rule_dir} 87 mkdir -p %{buildroot}%{smack_rule_dir}
83 cp -f %{_builddir}/%{name}-%{version}/%{name}.rule %{buildroot}%{smack_rule_dir} 88 cp -f %{_builddir}/%{name}-%{version}/%{name}.rule %{buildroot}%{smack_rule_dir}
  89 +%endif
84 90
85 # LICENSE 91 # LICENSE
86 mkdir -p %{buildroot}/usr/share/license 92 mkdir -p %{buildroot}/usr/share/license
@@ -113,5 +119,7 @@ exit 0 @@ -113,5 +119,7 @@ exit 0
113 %{dali_app_ro_dir}/models/* 119 %{dali_app_ro_dir}/models/*
114 %{dali_xml_file_dir}/%{name}.xml 120 %{dali_xml_file_dir}/%{name}.xml
115 %{dali_icon_dir}/* 121 %{dali_icon_dir}/*
  122 +%if !%{with wayland}
116 %config %{smack_rule_dir}/%{name}.rule 123 %config %{smack_rule_dir}/%{name}.rule
  124 +%endif
117 %{_datadir}/license/%{name} 125 %{_datadir}/license/%{name}